commit b3f7344209832eea8ece447d871ea748767c444b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 11 12:22:17 2026 +1000

    autogenerated files for release

commit 77337b8a6d05324dc86a42f1cb0f60b04fc60529
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 11 12:21:59 2026 +1000

    depend

commit 772a5b728e404f5d992fe6e3c7994e44f7f1ace3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 11 12:21:12 2026 +1000

    update version

commit bd714fadddcafe44fd572b79656a591110cff048
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 10 23:28:15 2026 +0000

    upstream: add regress test for servers that hang durig banner write;
    
    from Thomas Yiu
    
    OpenBSD-Regress-ID: 86a25553c75bddc6fc239dc272aca97c61047d22

commit 7e5b75aacee593ade47ba030f4778c3b9bf78787
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 10 23:27:30 2026 +0000

    upstream: openssh-10.5
    
    OpenBSD-Commit-ID: 047bc46c0a58babdf702e01b8ffc7728d404cb9c

commit d535299b891962f72b875afa6878ccbffdd022a3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 10 23:27:04 2026 +0000

    upstream: remove ml-dsa/x25519 from the default algorithm list for
    
    release (it will be back soon)
    
    OpenBSD-Commit-ID: 2466825e05a2cae6b0cb5fa34f39792a0b5a46d3

commit 407a2b79d439b1272879a910db6c94d1165075a8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 10 23:24:03 2026 +0000

    upstream: make reading server banner non-blocking; prevents one
    
    stuck server from blocking a many-host keyscan; from Thomas Yiu
    
    ok dtucker@ markus@
    
    OpenBSD-Commit-ID: 4970af00975119ebf9c1e0e132e3317b72ac0c2e

commit 64ede7991d9e2021d84fb3eb89ed1dd1c2a1179e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Aug 8 21:14:57 2026 +1000

    Use clang-20 when building hardenedmalloc for tests.
    
    Some versions of clang-19 report:
    error: invalid feature combination:  +avx10.1-256; will be promoted to
    avx10.1-512 [-Werror,-Winvalid-feature-combination]

commit 05ec77c14b9143b4d49f05a8dcd1366a92b9024e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 8 07:27:54 2026 +0000

    upstream: remove mlkem768brainpoolp256r1-sha256; requested by
    
    markus
    
    OpenBSD-Commit-ID: 0fcb5943abe5476e42983dcfc4c400e39e5db6a7

commit 08d9155d6eefd8f7bccd07140af1d67b94e67bb8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 8 07:25:55 2026 +0000

    upstream: move comment to a better place; suggested by markus@
    
    OpenBSD-Commit-ID: 451ba42a5dc88723a0b8837d4583957f18edbf40

commit 72ed5241a8cf465d7a45035dedf1baa74ad6c3f7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 7 05:49:53 2026 +0000

    upstream: add some options to allow setting or clearing the
    
    touch-required and verify-required flags on FIDO private keys when resetting
    the passphrase.
    
    feedback/ok tb@
    
    OpenBSD-Commit-ID: 8895e62eae5778711fe7dd6c09f8679acb2e6674

commit 6a57081dc35acf3ee298108d4bc3580489608d5f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 7 05:18:05 2026 +0000

    upstream: Allow session-bind@openssh.com requests when the agent is
    
    locked, otherwise forwarding sessions established with an agent was locked
    will be treated as local, rather than remote.
    
    Reported by sn0x-sharma
    
    OpenBSD-Commit-ID: 524f210c6f2b3a06e0a2f6d0af5188a9a75fa2c7

commit 9910d5ef53124ce1157d57bc11e222658aa41299
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 7 05:03:56 2026 +0000

    upstream: avoid potential realloc use-after-free in the client if a
    
    remote forwarding is added via the local session multiplexing socket while a
    remote forwarding open request is pending with the server.
    
    Report and fix from Brian Mingus of Cognatory
    
    OpenBSD-Commit-ID: c7888d566576386d0e96859f9ec7310a1e2d3609

commit 388390148359da911f77e8d1d7377f46c412a9d8
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Tue Aug 4 22:47:07 2026 +0000

    upstream: fix up synopsis and tweak wording for -Z
    
    OpenBSD-Commit-ID: 7f0f8e7f610f6af6890cb10915bf316f23651505

commit e6ece1bc262c067416483502c45b9fd7366f347c
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Tue Aug 4 22:14:52 2026 +0000

    upstream: document existence of
    
    mlkem768{brainpoolp256r1,nistp256}-sha256 KEXes
    
    OpenBSD-Commit-ID: e9a9b01a19ed3ccdd82c7fc4c77395495b28faf9

commit 4c414d99f3a8c2b3d24ee8448b8a388446531ebb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Aug 6 23:30:30 2026 +1000

    Re-allow PAMServiceName inside a Match block.
    
    This is documented to be allowed, and was up until 10.4p1 when a
    transcription error in the config handling rework reverted it to
    global-only, ie not allowed inside Match.  bz#3987.

commit 5adaaa7781d86dde2f099b3944f08d57aa65107f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Aug 4 22:20:47 2026 +1000

    Rerun VM tests on regress Makefile change too

commit b1000abf541dd4c7378c2211b49e98ded968ef13
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Aug 4 14:23:59 2026 +1000

    Run tests on regress Makefile changes too.

commit b8b12ca0653df9130cd61fb3ff37e57d2d8c9f2d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 4 02:48:00 2026 +0000

    upstream: disable pubkey-priority test until I can fix it to not pick
    
    up the user's keys from ~/.ssh
    
    OpenBSD-Regress-ID: 5295a8cefe1d2def5c8b10f9d60d9bb7a350d316

commit d5dc50020f3a9c09a99915f7dd95373e4f9986a0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Aug 3 23:22:23 2026 +0000

    upstream: Fix expected output for implicit ordering test. ok djm@
    
    OpenBSD-Regress-ID: 3ba8907d381fb738578ba2090d4b2f22d35a555a

commit 265336a702d6a4a117889f2fe281e8f2bbb7e0ef
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 3 22:15:07 2026 +1000

    Don't enable Brainpool on AWS-LC or BoringSSL.
    
    These fail at runtime, so disable until we figure out why.

commit b5ad8c3b1f22831dc2a16bfac9e92916c8d0e4ec
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 3 22:06:26 2026 +1000

    Correct filename in comment.

commit 7d6170c00ec7bab059742370f92144b155bdb191
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 3 21:18:48 2026 +1000

    Fix OpenSSL ECC detection message.

commit e766b76b6112c9327f73b834af00e00da13ab981
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 3 18:19:58 2026 +1000

    Make EC_KEY_METHOD_new optional again.
    
    The change making ECC required also incorrectly made EC_KEY_METHOD_new
    required, causing builds with BoringSSL to fail.

commit e47a744c8b7051c56a9e46b487f68f1f803fe804
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 3 06:53:11 2026 +0000

    upstream: crank up MaxAuthTries to avoid failures here
    
    OpenBSD-Regress-ID: 052b0c4cc8bd6ea2679fbc9f96f4cb7f48c73035

commit 129f5ac61f8b90639dedb264947153d1c4b9acf5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 3 06:52:50 2026 +0000

    upstream: regression test for pubkey ordering in the client; ok
    
    dtucker
    
    OpenBSD-Regress-ID: e55fa977be300307e6e03a001716b3dce8faa1a1

commit 6fe6ab77daa4472d0243580e355e0674a95b8acb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 3 06:50:49 2026 +0000

    upstream: Tweak ordering of certificates tried during pubkey
    
    authentication to prefer FIDO keys that do not require user presence (touch)
    first, followed by ones that do and with FIDO keys that require user
    verification via PIN or biometrics last.
    
    This effectively tries low-friction authenticators before higher
    friction authenticators.
    
    ok dtucker@
    
    OpenBSD-Commit-ID: 067076c652dbb4f2aa89c6e82b19d8cbfec1d1be

commit 29f1b46e0f6fb4aba9ae34e4b46532b5748f395e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 3 06:47:24 2026 +0000

    upstream: Add a "ssh -Z user@host" mode that dumps the pubkeys that
    
    will be tried for authentication in the order that they will be used.
    
    feedback tb@ ok dtucker@
    
    OpenBSD-Commit-ID: 617a7f149d1410980eac551e4780280190a5f218

commit 2aee73ed90b3b47d0dd86875989003f0982ccf22
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 3 06:43:16 2026 +0000

    upstream: fix ML-KEM/ECDH interop problem (does not affect
    
    mlkem768x25519-sha256) from markus@
    
    OpenBSD-Commit-ID: 9c72e9c0407906bb7d5fb16648b38282676391e9

commit ec0485632885e0c533b35e5970e4b583781db83f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Aug 1 12:10:40 2026 +1000

    Require NISTP521 in libcrypto.
    
    Previously we supported building without NISTP521 in libcrypto since
    some vendors shipped without it, but this now seems uncommon. This
    removes that support, requiring a fully functional libcrypto.
    
    This removes another set of diffs vs upstream and should reduce the
    maintenance burden.  ok djm@

commit e416edf1b2b58b0195714bafbec614f85ebd7768
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 31 21:32:53 2026 +1000

    Remove support for libcrypto w/out ECC.
    
    Since 2010, we have supported building against an OpenSSL that did not
    have any ECC support, since at the time many systems still shipped with
    OpenSSL versions prior to ECC being added.  We no longer support OpenSSL
    versions that old, and while it's possible to build a modern libcrypto
    without ECC, doing so seems very uncommon.
    
    Having OPENSSL_HAS_ECC sprinkled throughout the code increases the
    cost of syncing changes and is a maintenance burden, so this has now
    outlived its usefulness and is being removed.  It is still possible to
    build --without-openssl on such systems if required.
    
    This includes a few whitespace and header order changes to bring
    Portable back into sync with OpenBSD in those places, and removes the
    corresponding test.
    
    ok djm@

commit 15d1832b5e1248da3577ea1a7c5e636cd16067e0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 30 22:15:46 2026 +1000

    Add includes.h for compat interfaces.

commit d8140f07061ad3460cd0d167c23781d79a961ccd
Author: brynet@openbsd.org <brynet@openbsd.org>
Date:   Thu Jul 30 07:40:48 2026 +0000

    upstream: Use ssh_mldsa44_ed25519_cleanup consistently to avoid
    
    calling freezero with the wrong size.
    
    With help from tb@
    
    ok tb, dtucker@
    
    OpenBSD-Commit-ID: 4de18532e448a62005e12c179786bec512b83fde

commit 18f5f351ed88c8c058f71c478794faf3eecfe2be
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jul 30 07:30:41 2026 +0000

    upstream: Fix $OpenBSD marker for easier syncing.
    
    OpenBSD-Commit-ID: 1f38203c268007964b0abdfa4e024d572c65a898

commit 128a4a5bf9d42e385adf7ca70a3d3ad772cb66f7
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Jul 28 09:55:44 2026 +0000

    upstream: ssh: update kex unit test
    
    OpenBSD-Regress-ID: db6f1a538803716ce225e2128046de0b6ab6d2aa

commit 52794802d93c4b06d81a5a9a192b78baed6f9efd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jul 30 07:29:09 2026 +0000

    upstream: Make mlkem768ecdh build with OPENSSL=no. ok djm@
    
    OpenBSD-Commit-ID: b23fc98b885d72b57d9a2b989f6c062751bff52b

commit 4b5860ed27f758c9d8156714cbd8a62562420907
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 30 03:39:39 2026 +0000

    upstream: pass back errors from ed25519 key generation, which
    
    theoretically can fail. From Dimitri John Ledkov via GHPR702.
    
    ok deraadt@ dtucker@
    
    OpenBSD-Commit-ID: 1ecdd981c3f89393092949ff5e96662946fc5040

commit 52154c2d232de1d5a161cb900bdb0792043ae142
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 30 03:37:39 2026 +0000

    upstream: Move check of public key type against allowed algorithms
    
    to before parsing of the key sent by the peer.
    
    This removes at least some key parsing and verification paths from
    the pre-auth attack surface.
    
    Suggested by Christopher Paul Rohlf of Anthropic, ok deraadt@
    
    OpenBSD-Commit-ID: 4560b53b5cd2fe9b875436e48995a1829c2a9dea

commit 05000bc5ea80485540bac655f83b65d7f868af11
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Thu Jul 30 03:13:34 2026 +0000

    upstream: Fix double frees (impossible to reach outside of a test
    
    harness), and also use freezero where possible from Christopher Paul Rohlf at
    Anthropic ok djm
    
    OpenBSD-Commit-ID: 50227bff4ffd4a93aad399f21fc20f1c3cbf2c69

commit ddbcd8ffdabeeb04955ea187739904a52f09c8c9
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 27 12:31:09 2026 +0000

    upstream: ssh: implement mlkem768brainpoolp256r1-sha256; ok djm@
    
    OpenBSD-Commit-ID: 99a304085f96d9a595b326c06694290c5612620c

commit 786cb6a14cede4c1bfcf7a1989b53c9a28c8bee4
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 27 12:28:52 2026 +0000

    upstream: ssh: implement mlkem768nistp256-sha256; ok djm@
    
    OpenBSD-Commit-ID: f5daafce2fcb44684606197873dab4cd189524a9

commit 1b23e24d21238f49d362b4304625dace6afbd4eb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 23 06:33:06 2026 +0000

    upstream: use sshpkt_fatal instead of plain fatal() for errors in
    
    the packet code as this provides context of the failing peer (address, port,
    user, etc). Based on patch from Dag-Erling Smørgrav
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: 2e50ab08ab697722230f5d7dbebc9ea3c4f2931b

commit 7e446d3f5917c2f2770981a89d0e54d5d064bf0c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jul 22 00:37:24 2026 +0000

    upstream: Automatically detect IPv6 support
    
    and test IPv6 parsing if found. This should always be enabled on OpenBSD,
    but allows us to use the same test in Portable without modifications
    that make syncs harder.
    
    OpenBSD-Regress-ID: 80dce2465e9414695d878a9af18a3d75711f7861

commit 5e44a8ce08974760b016862b02815430b3c634ed
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jul 21 23:43:15 2026 +0000

    upstream: Factor out all of the IPv6 addresses into variables.
    
    This lets us skip them in Portable on platforms that don't support IPv6
    all in one place, removing diffs from within the tests themselves and
    making syncs easier.
    
    OpenBSD-Regress-ID: be5d2d67c28f8134f84e8baab09f303be8ceb626

commit 9e35b3845c85e02aef487a56d965434097ac52fe
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 22 08:44:39 2026 +1000

    Sync missed case-insensitivity changes.

commit b6080d835f3181220d7ad2bde4bd5c4051d4df56
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 14 18:30:40 2026 +1000

    Add obsd79 target.

commit d3411094b3bf9e19a9e961e33e87cc89550028a5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 14 18:29:26 2026 +1000

    Wording.

commit fed6e6fea68ff30bc0234f3ab24c4777132fba98
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 21 06:18:23 2026 +0000

    upstream: verify that ChannelTimeout in a Match block is effective
    
    OpenBSD-Regress-ID: 30770cad71ca060aaaa05e4bdd0ea8941b768c6b

commit dd4556dc758ef0fe4c74325bf5fa045a7f44d72e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 21 06:18:09 2026 +0000

    upstream: verify that RekeyLimit in a Match block is effective
    
    OpenBSD-Regress-ID: 23084bcf86071a7fe0c121552ec6e0b208cc7e28

commit 3f44bece40902b0d1504c5885f0b87c1cabd4e26
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jul 16 09:07:18 2026 +0000

    upstream: Use -Ohashalg to restrict output to specfic hash instead
    
    of awk.
    
    OpenBSD-Regress-ID: aa5fac0e3ee8f518794d3361d537090c6e3f0bec

commit caa6d7d19dc5dde5c2807277189ed2178b097e42
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 21 06:17:42 2026 +0000

    upstream: fix ChannelTimeout and RekeyLimit not being applied in
    
    sshd_config Match blocks; reported by Alex Harrison
    
    OpenBSD-Commit-ID: 2d8866b841fc92e6e079e3f37590ba5948531b3d

commit 752b4e3bd958a05ec025d72504fc8938b2be37f9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 21 05:21:29 2026 +0000

    upstream: s/= - 1/= -1/; from serity---
    
    OpenBSD-Commit-ID: d003b300b0062d8e5951b84e8e09bd8d98cfe562

commit bf268c800949ecb379ba6c846cf73a0a97be9d85
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 16 04:12:50 2026 +0000

    upstream: move to a better place
    
    OpenBSD-Commit-ID: 0c70f26de19babb2557a7a95ae7057d996a2c3f8

commit 76357c4155cd521d19558c516a0ec7b5bd49929b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 14 04:43:13 2026 +0000

    upstream: use crypto_api.h #define constants for lengths; no
    
    binary change
    
    OpenBSD-Commit-ID: 6527baa1f07b7fdf42ca84531a13ae3ff2c0dbc8

commit d322f2ccf7da095ce94d1d99cb563246f61487b0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 14 01:05:05 2026 +0000

    upstream: make authorized_keys "restrict" keyword apply correctly
    
    to tunnel forwarding (which is administratively disabled by default).
    
    Reported by Erichen, Institute of Computing Technology,
    Chinese Academy of Sciences
    
    OpenBSD-Commit-ID: 5b3cc987a64749c94b20e12755db32a83f8f01e6

commit f6acdce6906b7847d4a71fa576b6ba4222d9948e
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sat Jul 11 11:16:47 2026 +0000

    upstream: in sshd config dump mode, write all directives in mixed
    
    case for consistency
    
    ok djm@
    
    OpenBSD-Commit-ID: 55647b13194d0aaa7095b89455d4c44ddeb53e7d

commit 1ae9eeb18d13650f26ccfd9648f46d3a3b6b2b81
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sat Jul 11 11:15:03 2026 +0000

    upstream: read ~/.ssh/id_mldsa44_ed25519 private key files by
    
    default
    
    ok djm@
    
    OpenBSD-Commit-ID: c45683d341d7dce6c126903bf9a37393f2b75839

commit 0e546c658bb3d9c7cf727e43efa4e29bbbafe5a3
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Fri Jul 10 17:21:19 2026 +0000

    upstream: document mldsa44-ed25519 host key and public key
    
    algorithm
    
    OpenBSD-Commit-ID: c519ba7408cfb2700d184c9441de4ff01ecda726

commit df67bcaf563726f215b1b126872978b88b7d012d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 9 02:22:10 2026 +0000

    upstream: when signing hostkey proofs for a client UpdateHostKeys
    
    request, allow each hostkey to perform at most one signature operation. ok
    dtucker@
    
    OpenBSD-Commit-ID: ad4149015634f8156ba723656035ec26140875e8

commit addd12a5e439f284854aaaa068b7c1947c24613a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 9 02:20:19 2026 +0000

    upstream: setproctitle(3) to identify sshd-session when its
    
    acting as a post- authentication monitor; ok dtucker@
    
    OpenBSD-Commit-ID: a3c36a005a61ccaeb974afd7b9290b826e1620ba

commit e3bdc2689516c46d5f1ce349a6ff7654d6008e01
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 9 01:16:37 2026 +0000

    upstream: delete list of ssh_config(5) options under
    
    documentation of -o and instead just direct readers to the actual
    ssh_config(5) manpage.
    
    ok deraadt@
    
    OpenBSD-Commit-ID: bed2058af847c2149e0e457202a8c4ee7000ad33

commit 2a13186b434f4481d0226a699d424cad1add8437
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 9 01:15:34 2026 +0000

    upstream: enable the ssh-mldsa44-ed25519@openssh.com signature
    
    scheme (and its corresponding certificate form) in the lowest-priority
    position.
    
    "what took you so long" deraadt@
    
    OpenBSD-Commit-ID: b7be74df494323a7021cf230f11eff824d2810d0

commit 1bf5871aead6d73177d727add15ab0f14c258fdf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 7 04:04:16 2026 +0000

    upstream: prefer fstat to stat when it's trivial to do so
    
    OpenBSD-Commit-ID: 3af5548ba2112045db392a14c959ca309605bdb9

commit cadefc724fe0126fe62eae2c82ba75355fa18d4a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jul 12 11:19:33 2026 +0000

    upstream: Add tests for ecdsa 256, 384 and 521 keys in DNS
    
    fingerprints. Dynamically generate the required zone file.
    
    OpenBSD-Regress-ID: 61acdf25efc8c5d3bb0156fd3a53bf8159d3e13a

commit 932212db4d704a1e55848f3fe3f9c743b44209fc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jul 12 08:40:00 2026 +0000

    upstream: check sshd_config output case insensitively
    
    OpenBSD-Regress-ID: dafa6c3e723cf39ca5e552304372bc085c348102

commit 9a48bf24080a0f9816a2ca9c007b21da698129b0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jul 12 06:10:32 2026 +0000

    upstream: Add SSHFP tests for ed25519 key type.
    
    OpenBSD-Regress-ID: a4bc60d0f398b148a29df3594d5f36de0e4e5ea2

commit 4079e457eaade0b450411d637dfc4b663a2d0a80
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jul 11 09:59:10 2026 +0000

    upstream: Restructure the SSHFP test in preparation for adding
    
    other key types:  - change the DNS names to be rsa.* for the existing RSA
    fingerprints.  - verify that all required SSHFP records exist in DNS.  - only
    run the RSA tests if the build supports RSA.
    
    OpenBSD-Regress-ID: 03e4087c3bd09ad8bede788f76f0ab59b732639e

commit 8e65f996e535d395968870b20478b4e167d10aca
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 8 11:07:01 2026 +1000

    remove README.tun
    
    it's badly out of date, has already been deleted upstream and is not
    well-adapted for portable.

commit b9e2a1f923e0f86104dbd25c07d4772457255ae6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 8 10:27:56 2026 +1000

    add some parentheses to clarify a && || condition
    
    Spotted by Harish Yadav

commit c10e04980300eab089f71aaada8b28fd878ee729
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 7 02:17:18 2026 +0000

    upstream: unused variables
    
    OpenBSD-Commit-ID: 03fc22fb427b7547ee7844907cf3257bce7fdc3c

commit c147093565634eae9f91e4df99e04a6b3513f9c6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 7 01:00:22 2026 +0000

    upstream: fix GSSAPI option names, that I somehow screwed up while
    
    refactoring servconf.c bz3974 patch from Colin Watson
    
    OpenBSD-Commit-ID: be39ad3dbe36d9ecdb86f3811da5dfbdc9bcb1e6

commit e39f9d87e339b40081d877ace7439d4166be7c2d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jul 6 21:14:53 2026 +1000

    Add 10.4 branch to status page.

commit 449d25b4f8b8d3bb55a865ebcbec17b39b37c208
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 6 17:56:53 2026 +1000

    depend

commit 0227fe4606ebf86b3f6f9b80af12e171eaa58416
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 6 17:56:10 2026 +1000

    crank version numbers

commit 0210c7cc942ee54bd6a647d5732df9786c4b08d0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 6 07:54:26 2026 +0000

    upstream: openssh-10.4
    
    OpenBSD-Commit-ID: ce7b0749e5139c70410ee92a13d368d7d34262b5

commit 5d04ca6af739b82fd30d84d2783ca802ebfa1192
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 6 07:53:30 2026 +0000

    upstream: Fix multiple RFC 4462 (GSSAPIAuthentication) compliance
    
    problems
    
    1) Remove an early failure return for GSSAPI authentication attempts
    made for invalid accounts that yielded different behaviour for
    valid vs invalid accounts.
    
    2) Fix a situation where some GSSAPI requestes were not correctly
    subjected to MaxAuthTries.
    
    3) Fix a moderate pre-authentication resource DoS related to #2.
    
    Add missing logging for error cases.
    
    Report and fixes from Manfred Kaiser, milCERT AT
    
    OpenBSD-Commit-ID: ca0acdd64eea435d6f89534538a9eb404a5629d3

commit e8bdfb151a356d0171fea4194dd205fbb252be23
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 6 07:49:58 2026 +0000

    upstream: fix ownership and lifetime of several bits of client
    
    state that need to persist for the life of the connection, especially the
    cached hostkey that was being incorrectly freed early on some paths, possibly
    allowing its use after free.
    
    Reported by Zhenpeng (Leo) Lin from depthfirst.com
    
    OpenBSD-Commit-ID: faaa6ad72e7d69d41fa8b197b606265b7d9bc73f

commit d43ba60c91cb323ca921049b7d43b1908c318454
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 6 07:44:48 2026 +0000

    upstream: Fix cases in GSSAPI and keyboard-interactive
    
    authentication where the minimum per-attempt delay was not being enforced.
    
    Reported by Orange Cyberdefense Vulnerability Team
    
    OpenBSD-Commit-ID: c40bd35cc2428fcaccad7a141703c28baa6da01e

commit cf67d46cba77d493152830a108b5f294ee9c5140
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jul 5 02:46:44 2026 +0000

    upstream: void functions should not return anything. Patch from Tim
    
    Rice.
    
    OpenBSD-Commit-ID: bb5021b2b45d9d3f54a012d569872805d107f59c

commit 93d6348ae44491b7542d78c0d55da7130e9db017
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jul 5 00:16:21 2026 +0000

    upstream: fix inverted test that broke ssh-add with keys on stdin. From
    
    Laurence Tratt
    
    OpenBSD-Commit-ID: bcef522cfa587c7cf035660bb347cff36b65bfbd

commit aab5620a66777afbe9e0939b4961e5751d6e7938
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 3 14:20:02 2026 +1000

    grammar fix; from Daniel O'Connor

commit c123ac1c579212c08c17d927cb8e379d45f9fccb
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 3 14:16:29 2026 +1000

    more config option details in README.privsep

commit 3912be7baa05819c382ce0e5d0ef847c9d80f230
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 3 14:10:16 2026 +1000

    more README.privsep polish

commit f80e6545ee9eb60b3fb8b0097fcc12aad47a54b4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 3 13:33:16 2026 +1000

    tweak; from dlg@

commit 01ed1c648a2c42e85e73cac3b7647f1cddc4abba
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 3 12:49:26 2026 +1000

    tweak previous

commit 85dcff277e7a5299ec13af12517aefb123b1aa95
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 3 12:31:27 2026 +1000

    revise README.privsep for multi-binary model
    
    This rewrites most of the privsep description to more accurately capture
    recent changes in how sshd managed privilege across its lifecycle,
    including describing the roles of the sshd-session and sshd-auth
    helper binaries.
    
    Also 100% more ASCII art

commit a5ecfdc21864b29ef9a939b9cfe7a2a8ffcdf439
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 2 10:05:43 2026 +1000

    Need clang >= 19 for constexpr in hardened_malloc.

commit c53864fc40045d0413c36a19ca784b1b2f985dd9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jun 25 18:43:48 2026 +1000

    Tabs -> spaces.

commit 0a75a95d582028c5ce91f524c20365df9f2515f2
Author: Zoltan Fridrich <zfridric@redhat.com>
Date:   Wed Apr 16 15:11:59 2025 +0200

    Provide better error for non-supported private keys
    
    Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>

commit 654e1a3e5b58029b05f1df0308e7e4d4407b37c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 1 01:14:39 2026 +0000

    upstream: more missing mldsa44-ed25519, based on GHPR696 from Loganaden
    
    Velvindron
    
    OpenBSD-Commit-ID: f32e17df54fa66b0e936f1aeb3963f949e4a9bb8

commit 088ca00b8f19a0257b2f869cb828ab75e99ab3a1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 1 01:08:51 2026 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: 730e54174b2182c7011cc87a0fdae595cd9bcc2d

commit 0cdead097bde10712cd0635b5d350c16e07ba52a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 1 01:06:54 2026 +0000

    upstream: simplify SIGINFO output: remove list of active channels (too
    
    verbose) and just display destination and connection duration; requested
    deraadt@
    
    OpenBSD-Commit-ID: cb36192cd53483f8e452ea91bc42be7bbb2fffa3

commit 55ffd11b88f073662cdf0c8c48fe0800b8a71fc4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 1 00:52:31 2026 +0000

    upstream: Tighten up the introduction a little:
    
    Mention Match as a conditional directive (previously it only
    mentioned Host)
    
    Try to use consistent language in the introduction to refer to
    configuration directives (previously it used "parameters" and
    "keywords" interchangeably).
    
    Mention that comments may appear at the end of the line too, and that
    whitespace at the beginning/end of lines is not significant.
    
    OpenBSD-Commit-ID: e08f34413eeced47478c14d5005726f9bdd5d80e

commit 8b05bbeb293c5f777915e37e9ed43a06fb8e7614
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jul 1 00:52:23 2026 +0000

    upstream: Move negative-FD checks to before first use. CID 909998,
    
    ok djm@
    
    OpenBSD-Commit-ID: f0208911d27fd5bd66cd608c7b6fb5a36002d6a5

commit 296393226e4849010516150f3e19dbfc68789503
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 1 00:04:46 2026 +0000

    upstream: ssh -o doesn't support Host or Include options, they are only
    
    valid in the config file. bz3968 from xspielinbox
    
    OpenBSD-Commit-ID: cbecf11f2eea63e3cf6752e9bbe59091ba60cd32

commit fe85df40aed36a49b9883186a123a1435c17f895
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 30 23:55:32 2026 +0000

    upstream: mention mldsa44-ed25519 in usage(); based on GHPR695 from
    
    Loganaden Velvindron
    
    OpenBSD-Commit-ID: 4af2400312b6ca232a68a758160ca5c64ca6a168

commit aabe6d25498d9dc69fa21fbb14352fd4b3d5e9fa
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Tue Jun 30 03:42:53 2026 +0000

    upstream: ssherr-libcrypto: avoid use of deprecated
    
    ERR_load_crypto_strings()
    
    Follow regress and use unchecked OPENSSL_init_crypto() because
    ERR_load_crypto_strings() has been deprecated in OpenSSL 1.1.0.
    This call can in principle fail, in which case there's a fallback
    to generic error strings.
    
    There is still use of OpenSSL 3.x-deprecated API in here. That's
    a problem for someone else to solve.
    
    ok djm
    
    OpenBSD-Commit-ID: 3e9dc94caa83b361775b83a92425e858f8680c05

commit dcba967d3f39f89d17634e550e1741b2b91f4c5c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 30 02:30:19 2026 +0000

    upstream: another ruser_name/ruser_group vs attrib_to_stat() ordering
    
    screwup. Coverity CID 910530 via dtucker@
    
    OpenBSD-Commit-ID: d8c4656119f09304e79fcf2ab32299ed68006a29

commit 710cd5abcea22aeddbd5d5d661c224eaa05e47b9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 30 00:10:48 2026 +0000

    upstream: set FD_CLOEXEC on the fds between sftp and its ssh
    
    process, avoids risk of subcommands that write on odd fds breaking the
    connection. GHPR693 from Manuel Einfalt; feedback deraadt@ ok dtucker@
    
    OpenBSD-Commit-ID: 91b12cd66580dab6b3bfe5e507a1a8310c8f9149

commit fa447bd5836f6d1c742c543207a3a6ec2909da75
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 30 00:09:01 2026 +0000

    upstream: check key and IV length received in privsep state
    
    transfer exactly match the expected sizes for the selected cipher; partially
    redundant to similar checks in cipher_init(), but nice to be more exact.
    
    GHPR from jmestwa-coder; ok dtucker@
    
    OpenBSD-Commit-ID: d4a9deef194cc44189e835ac59b7b800b9b5c281

commit 23a7c4d1284694f9973ebdae7884cd25d33e5cf8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 23:00:00 2026 +0000

    upstream: revert bits that weren't ready for commit yet
    
    OpenBSD-Commit-ID: ee8a219f02db32778444356ad2d93b983a38a704

commit b9d2162e4a919168bbd983fa68663f813b534034
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 22:56:44 2026 +0000

    upstream: Move user/group name lookup to correct place; coverity
    
    CID 910530 via dtucker@
    
    OpenBSD-Commit-ID: 03ba9f8c720eea38436e4fef4c40814eae1b1fe3

commit 0875a78bb7228986c2e89ef2f5fe041d2ab27ed7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 09:14:25 2026 +0000

    upstream: fix ineffective max file size check when loading
    
    blobs/keys from files and add another one on a patch that was not covered by
    the existing ones. From Tess Gauthier via bz3969 and bz3970
    
    OpenBSD-Commit-ID: c0dec6c587853349113df85b6dc528dc15079af0

commit 5d8e42933ab3f1a1c17608c32d680300f5524a99
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 08:59:31 2026 +0000

    upstream: check strdup() return to avoid NULL deref on failure.
    
    bz3948 from RuiHe-MO
    
    OpenBSD-Commit-ID: 2b1fbfb2e1f3359150feadfdf05acaa1c7d211e8

commit 0eaeddeefa4bd9b1241788b27ed2967ab596c759
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 08:57:06 2026 +0000

    upstream: s/calloc/xcalloc/ to reduce noise from AI bug detectors
    
    that don't understand context
    
    OpenBSD-Commit-ID: dcef5b1804620f2aed108267bbf5023a81230e14

commit a9cb2e30d3a50ba6a24047d87cd80e4b4a18b5ff
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 08:48:22 2026 +0000

    upstream: fix "ls -n", which was still displaying user/group names
    
    rather than numeric uids/gids. Based on patch from Tamilan in bz3953
    
    OpenBSD-Commit-ID: 65dd2ecb870b727e872cf9df544f8767426d2cc0

commit 3c3226f79cf4fa1c0436a91768760b92df87ffab
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 08:21:50 2026 +0000

    upstream: move documentation of the Include directive to near the
    
    start of the options list, alongside that for Match and Host which are
    similar insofar as they all affect configuration parsing rather than altering
    the configuration directly. from xspielinbox via bz3968
    
    OpenBSD-Commit-ID: 1cde8af8d40dbbe3ea49cf56c5d408946c875230

commit ce697f1eaf76a3d8d700894726c7a826af393ed5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 08:19:21 2026 +0000

    upstream: mention RefuseConnection, VersionAddendum and
    
    WarnWeakCrypto along with other options. from xspielinbox via bz3968
    
    OpenBSD-Commit-ID: 5d4ef72dc703a74e64175e4611961ea338379d66

commit 849748c6e5d79274020489b03d068361d98ff42f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 08:16:46 2026 +0000

    upstream: correct directive name (s/Host/Match) in error message
    
    from xspielinbox via bz3968
    
    OpenBSD-Commit-ID: 3aec5cc9d349bcef12abc951490474f1217b4aeb

commit c8716138281d3dac33c2c7e98615c52d2b606d85
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 07:56:19 2026 +0000

    upstream: report errors in fill_default_options() properly, based on
    
    GHPR649 by Zoltán Fridrich
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: 10137e31df74c3100e3abc7d008b1645ca5b45af

commit d9df26d7e93f76bc5b1c0cbd31cde0af00ccbbc0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 07:46:22 2026 +0000

    upstream: don't use deprecated ERR_load_crypto_strings()
    
    GHPR650 from Mike Frysinger
    
    OpenBSD-Regress-ID: bfe86d9be1db4569c091f3d763cba04ddbb86ec0

commit 365522938f7a44df993c38f8a51836bab3628211
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 29 17:21:01 2026 +1000

    don't leak rrset on fail; GHPR681 from metsw24-max
    
    ok dtucker

commit fceb78d14abc710f2bab31f28d321a9bb2476781
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 29 17:18:58 2026 +1000

    check sockaddr length; GHPR681 from metsw24-max
    
    ok dtucker

commit 9d5238f44dda8d9455c085f51f2fb00774f69d38
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 29 17:17:28 2026 +1000

    return result of raise(2); GHPR681 from metsw24-max
    
    ok dtucker

commit fa5416dec1232dc67d979d28942344cdc8086ae6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 29 17:16:55 2026 +1000

    use size_t for lengths; GHPR681 from metsw24-max
    
    ok dtucker

commit ef6bef31de60b077cb7da954b202d65156fd510e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 29 17:15:10 2026 +1000

    fix leak of error path; GHPR681 from metsw24-max
    
    ok dtucker

commit 84365594f44423b69392f295f82e9cbcdd8c2640
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 07:36:37 2026 +0000

    upstream: don't print an error message when trying to load a host
    
    private key when PKCS#11 keys are in use, as these don't need the private
    half on the filesystem. GHPR664 from Ingo Franzki
    
    OpenBSD-Commit-ID: c93352e218cb1b74af04e8dc3a42eddec1f312c0

commit d6a589d3c8530375c2d56bcfb914575a7fcd3715
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 02:13:05 2026 +0000

    upstream: make ssh-add open it's connection to the agent after it
    
    has finished getopt() processing and not before. This allows the -v flag to
    work properly.
    
    ok jca@
    
    OpenBSD-Commit-ID: b9ac820018875aeb5b43ae2119a70c16a5cd2aef

commit 1cfbed8a131de166d86fbf5ac3245d55046cfab3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 02:08:55 2026 +0000

    upstream: Fix bounds checking when signing messages of length
    
    greater than will fit in a size_t. In OpenSSH, messages sizes are bounded by
    SSHBUF_SIZE_MAX so this was unreachable. From Swival scanner.
    
    OpenBSD-Commit-ID: 31ab874abe21a528fa995d78023c5ad9444a31e1

commit c58b363e4f7c10134b583fc92556229bf6c2c16b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 01:58:29 2026 +0000

    upstream: fix ECDSA order check for curves with cofactor != 1. All
    
    supported EC curves have cofactor 1, so this is a nop. From Swival scanner
    
    OpenBSD-Commit-ID: 4ae44cc97714fcb6d19fa56714ede56c1ef521e1

commit c1cebbc7c69acfe5df07b4a95e4c32cebc3e105a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 01:53:21 2026 +0000

    upstream: avoid situation where sftp_download() could get stuck in
    
    a loop if a broken server repeatedly returned zero length while reading a
    file. Identified by Swival scanner
    
    OpenBSD-Commit-ID: 53f1de5065ff01952d2abb51747c2418ce21cd96

commit 1b39f39657d2e58f8ec57341581a39bbf0be645b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 01:47:21 2026 +0000

    upstream: avoid download to server-controlled path when performing
    
    download on the commandline. From Swival scanner
    
    OpenBSD-Commit-ID: d1b2c44305fdfe6d51eed9ecc727e59478bf311f

commit 36480181fa22f98e180b4f9e10203480c0346c78
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jun 28 23:47:16 2026 +0000

    upstream: resist that return ".." via remote glob during
    
    remote/remote copies, similar to fixes for bz3871 for remote/local copies.
    From Swival scanner
    
    OpenBSD-Commit-ID: c0c20a1b746db55c08e53658bf21ea9405b300a5

commit 8dec7df34b38ea510b5548a020f2664e59700d23
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jun 28 23:31:28 2026 +0000

    upstream: avoid possible NULL deref; from Swival scanner
    
    OpenBSD-Commit-ID: 62ea8e12b7cddee933596e72f8ab0f7364147c0f

commit 09c2eeb9c8a0f42716d67548c75a6f4870732caa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 26 06:17:13 2026 +0000

    upstream: mention that ssh-keyscan output is only as trustworthy as
    
    the network between it and the SSH server; ok markus@
    
    OpenBSD-Commit-ID: 067845df7e8eb776408de5f23a2e6e7019945834

commit 6f74eb3c56f8dc4886d2bc5b068c5bf82cb6db74
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jun 25 08:14:47 2026 +1000

    Dropbear master -> main here too.

commit b0894a23a6bcb4f008d119854cb520f0b44b0973
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jun 24 22:05:05 2026 +1000

    Dropbear's master is now main.

commit aa60cf3f41e89530448a720e08ec31a6d8ffd79e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jun 24 11:59:09 2026 +0000

    upstream: Avoid printf("%s", NULL) since it's not guaranteed to be safe
    
    and will segfault on some -portable platforms.
    
    OpenBSD-Commit-ID: b49d588f8becf6363305aac42d7d9660fc7fe3ba

commit 7c70c3d352f7e8f16ed799f03957ee87840da4e6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jun 24 19:22:36 2026 +1000

    Fix handling of rh-allow-sha1-signatures on Cygwin
    
    The format of openssl.cnf has changed, so append to it instead of trying
    to insert into it.  Test that openssl can sign RSA with SHA1 before
    proceeding.

commit a4c5d09657860cb8583e4cb176b2396fc8bdb523
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jun 24 19:05:12 2026 +1000

    Make -j2 for faster builds.

commit 110117accb95fc310a3923115e9316a9748ff6ae
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jun 24 19:04:48 2026 +1000

    Set CYGWIN at top-level.
    
    The ensures the symlinks created in any step (eg, logs) are native
    symlinks and can be understood by the log upload step.

commit 8058c5bdb507591b79ec926221fbe6fcc296d432
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 24 06:55:12 2026 +0000

    upstream: mention a caveat regarding GSSAPIStrictAcceptorCheck in
    
    some environments
    
    OpenBSD-Commit-ID: aa7158d8f22cb34063c1c2d3cbcf30a9489847c2

commit 87e21b16d033700819a1381b9a2bfa2f8b3a217d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 24 06:53:57 2026 +0000

    upstream: add some logging to make debugging interactive/bulk
    
    classification mistakes easier next time (though I think we've got them all
    now, really)
    
    OpenBSD-Commit-ID: 5fe3dd4e76ffba787a423e301095d55cf5b0f0dc

commit 162cb8721ca0fdb71aaf00688ac7d59a81fc8d5f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 24 06:53:11 2026 +0000

    upstream: add a missing channels type for bulk/interactive
    
    classification bz3972; ok dtucker@
    
    OpenBSD-Commit-ID: 9c9442ea14be74877e2c876b1fe9fa20d158dd97

commit 5dac5a9252074fb39da617ffc123830266614a4c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jun 24 12:19:53 2026 +1000

    Set build options in /etc/mk.conf once at startup.

commit 512bfedf61129788d680210081e89843858dde85
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jun 22 12:28:48 2026 +0000

    upstream: Check return values from malloc.
    
    OpenBSD-Regress-ID: 28c8ab94a4fa5d047cec9c865b10bbf3c9ccf6d1

commit e683097d90e4698893c86a6f61c8c994b68cbcc6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jun 22 12:08:33 2026 +0000

    upstream: Check return value of sscanf.
    
    OpenBSD-Regress-ID: e06a8c769541b1aa7d663cc8859ddabd93847e81

commit b88165a06c8e195f267909de002450245e60002e
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Sun Jun 21 19:23:56 2026 +0000

    upstream: annotate tm_wday = -1 with /* sentinel for error */ per
    
    timegm(3) manpage
    
    suggested by deraadt
    
    OpenBSD-Commit-ID: 2fa92f0b826f0ab9e5d1cb0b2243b8e2f80951b2

commit 0d08d384a6783d3f3bc5a01d10015f527e0792ba
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 19 05:26:04 2026 +0000

    upstream: remove cipher_set_keyiv() as nothing uses it from
    
    Loganaden Velvindron
    
    OpenBSD-Commit-ID: 2a6636388028e6f7aa6837d6484a369f3d9c0818

commit 10715f25c40f5f7c670c341fadc52fbe1935db08
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jun 22 21:28:58 2026 +1000

    Output Actions allowlist for uploading to Github.

commit 01404fa5da11ed08c6ebecd09aaa3ebfbd79f206
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jun 22 19:00:15 2026 +1000

    Add script to lookup and pin Actions to hashes.
    
    Update recently changed Cygwin Actions and pin remaining unpinned ones.

commit faa646a9bf6c8d0ec2d8a52dcd155979c8f7eb8e
Author: El Mehdi Abenhazou <mehdiananas007@gmail.com>
Date:   Wed Jun 3 02:02:31 2026 +0100

    ci: pin upstream.yml actions to full commit SHAs
    
    Signed-off-by: El Mehdi Abenhazou <mehdiananas007@gmail.com>

commit 983096a7b27eaf789b5ceb321867d4511ba779c3
Author: El Mehdi Abenhazou <mehdiananas007@gmail.com>
Date:   Wed Jun 3 02:02:30 2026 +0100

    ci: pin GitHub Actions to full commit SHAs
    
    Pinning actions/checkout, actions/upload-artifact, and
    cygwin/cygwin-install-action to their full commit SHA instead of
    mutable branch/tag references (main, master).
    
    Using mutable refs means a compromised or malicious update to the
    action repository could silently alter the workflow behavior.
    Pinning to SHA makes the exact version immutable and auditable.
    
    Signed-off-by: El Mehdi Abenhazou <mehdiananas007@gmail.com>

commit 0d156d385e1e9c31bd5fb3652cf620a1f51c9b19
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jun 16 22:27:10 2026 +0000

    upstream: Factor out hex2bin into a shared helper function.
    
    Replace sscanf %hhx (which is C99) with plain %x for better compatibility
    in -portable. ok djm@
    
    OpenBSD-Regress-ID: 4d30bb27ffdf2154f1a9f2317df18d256717b300

commit b9d134a0b16a1810e9bbfac5bc687f5dbc75e7fa
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jun 16 10:58:42 2026 +0000

    upstream: Use awk instead of cut to help -portable.
    
    Some platforms have size limits on cut.
    
    OpenBSD-Regress-ID: fe871e8ed43fd92efb0df76f61c5cc9c5429ea82

commit 60978ddb08701d409c8236765caab10d1acded1b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jun 16 09:00:47 2026 +0000

    upstream: Include stdarg.h for va_list (needed for xmalloc.h).
    
    OpenBSD-Regress-ID: 34a6d5db48eec77f92f868093dfa0bfc10ae4622

commit 3de49e0d281ac7efb766f06eb2942ae147f64bbb
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jun 16 08:15:35 2026 +0000

    upstream: Include stdlib.h for malloc/free and sort headers.
    
    OpenBSD-Regress-ID: 4f5f427b131f5d6b32ed107b9bef098153f768ce

commit 61ca39c119108e95f94e3d914aa6fd79d99e288d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jun 16 18:16:32 2026 +1000

    Remove check for OpenSSL w/out AES192/256.
    
    This was the case for some old Solaris versions, but the support for it
    has long been removed from our compat layer so there's no point checking
    for it.

commit f433c09931665b1139dc9ef0951d3540242e4a38
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 15 06:36:52 2026 +0000

    upstream: use different strategy to check whether keys are present or
    
    absent in the agent; helps some -portable tests on platforms that have stupid
    grep(1)
    
    OpenBSD-Regress-ID: 0cee7ecc437eee7471dc6ccc3b3a0c2b60c1ad2d

commit 860ed04158f2c6dc870ea7c98c23dcafc7772dd4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 15 06:24:20 2026 +0000

    upstream: avoid use of paste(1); helps portable
    
    OpenBSD-Regress-ID: ce3ad41b34af9fc16af83e4711a62231ee52a95c

commit f5f02aafe89971d838d7fbc6b0cf240cee4d48bc
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 15 12:53:53 2026 +1000

    another place mldsa-ed25519 keys need deactivation

commit 1d6064d25fed17b184ead85ef6fddec1a2132c53
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 15 01:55:44 2026 +0000

    upstream: fix multiple problems with testing hostkey types that are not
    
    enabled by default.
    
    1) Add all hostkey types in the "multiple hostkeys" subtest.
      Previously known_hosts was accidentally clobbered, causing
      only the last added hostkey type to be used.
    2) Explicitly enable the hostkey types under test via
      HostKeyAlgorithms
    
    OpenBSD-Regress-ID: 8f12d18b79b5cc8a748e187a0e95529cd85a9dcc

commit ebdaacf4907033af1cbf1fef593436081dcd67a7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 15 11:43:52 2026 +1000

    bring back mlkem768x25519-sha256 stubs
    
    should fix C89 compile

commit b35a6a153f4164a56174e4795d4384867349e9aa
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 14 20:32:12 2026 +1000

    don't build ML-KEM/ML-DSA code with <C99 compilers

commit 1c46384db91a724a214ce96297d64c7ea9274a4c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 14 20:24:25 2026 +1000

    include includes.h

commit ea505c83ecae67c66c020f03b964cf471055191e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 14 18:56:31 2026 +1000

    provide a htobe32() replacement

commit 8e0cb471774e39a308e41cf5890823dfb418fd5b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 14 15:02:24 2026 +1000

    hook up new regress/unittests/crypto

commit 5a474d1bf338a895ce5973883c2f79d766f7dd42
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jun 14 04:08:05 2026 +0000

    upstream: unit and regression tests for composite PQ ML-DSA44/Ed25519
    
    keys.
    
    Includes a new unittests/crypto test that tests basic functionality
    of the underlying crypto primitives against public test vectors
    
    OpenBSD-Regress-ID: 4463b2e8adec391efa24a953f3c911b72892ca80

commit db1bad146ff3e9aa8e2e8eac926b185870417b2f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jun 14 04:16:19 2026 +0000

    upstream: make crypto_sign_ed25519_keypair_from_seed non-static.
    
    The new ML-DSA/ed25519 code needs it
    
    OpenBSD-Commit-ID: 48d00a2094bca8e422494aaa76105c708837436e

commit 81ca1451bf94edd9533c4f6787130f2396219049
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jun 14 03:59:34 2026 +0000

    upstream: Add experimental support for a composite post-quantum
    
    signature scheme that combines ML-DSA 44 and Ed25519 using the construction
    specified in draft-ietf-lamps-pq-composite-sigs. There's also an early draft
    documenting use of the integration of this scheme into SSH as
    draft-miller-sshm-mldsa44-ed25519-composite-sigs
    
    This scheme is not enabled by default. To you use, you'll need
    to add it to HostKeyAlgorithms, PubkeyAcceptedAlgorithms, etc.
    Keys may be generated using "ssh-keygen -t mldsa44-ed25519".
    
    The ML-DSA implementation comes from libcrux. Thanks to
    Jonas Schneider-Bensch and Jonathan Protzenko for their work to
    make this available.
    
    Consensus is that it's time to get this in to allow people to
    experiment with it.
    
    feedback markus@ tb@ logan@ deraadt@
    
    OpenBSD-Commit-ID: 85f2d41e3d3374b4e8c28a45a7c92f153c4489e2

commit b7e552138b8861469295e33e1457040e3f747d06
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 13 00:37:13 2026 +0000

    upstream: when replying to a "query" SSH_AGENTC_EXTENSION request,
    
    don't append an SSH_AGENT_SUCCESS to the reply to the query. bz3967 ok
    dtucker@
    
    OpenBSD-Commit-ID: b51418708096e26dbf73a0c1d3cb49b7352bc899

commit 5af8f3f290bd892352eb007866c066b7bf4a4385
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jun 7 08:50:17 2026 +0000

    upstream: Make crypto_sign_ed25519_keypair_from_seed()
    
    static to prevent compiler warnings since it's only used within ed25519.c.
    
    OpenBSD-Commit-ID: cf8b1e8f364167eb1766f646cc18a40f32242991

commit 5ebfdf3afaede40b1f0f9b5874ba53bf9d21d6d5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jun 7 08:21:07 2026 +0000

    upstream: Import updated moduli
    
    OpenBSD-Commit-ID: c3081ccc6e4c1cb21e68c36f5a92e6d9f09e70b3

commit 47af21eb8d480c0f368a629ab58e31b993ed28f2
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 7 09:56:41 2026 +1000

    sync fmt_scaled.c with OpenBSD upstream
    
    Notably picks up this commit:
    
    revision 1.24
    date: 2026/06/06 23:49:25;  author: djm;  state: Exp;  lines: +28 -12;  commitid: oznzDs0MaUT3FEqO;
    rearrange scan_scaled(3) ordering of multiplications and divisions
    to better preserve accuracy for large exponents. From metsw24-max
    via https://github.com/openssh/openssh-portable/pull/671/
    
    ok tb@

commit e9916c44c1324ab9ab022719e4df08a390a83014
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 5 08:53:07 2026 +0000

    upstream: pass >9 commandline arguments to the internal-sftp server,
    
    previously they were silently dropped; reported by Steve Caffrey ok deraadt@
    
    OpenBSD-Commit-ID: ee6cd5430a3ca027c3223af54b58ad3cc7ccd624

commit 70d7044a966a541d9df6002fbeb62d005555cc78
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 5 08:48:43 2026 +0000

    upstream: avoid truncation of pathnames headed to lstat() for
    
    systems where PATH_MAX is not the actual max; reported by sahvx655-wq via
    GHPR688
    
    OpenBSD-Commit-ID: fcbeeff99d857f2f3916ad06570fa05fc38b0f07

commit 37bf1431aa0f5e746f9ae0247f52da1e8b5758d6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 5 06:51:02 2026 +0000

    upstream: rename a variable to be more accurate
    
    OpenBSD-Commit-ID: bf277f2832125eb40ac2c9fa3ea66e31214f2131

commit 7763a38bc2595be50baf1d72b19bf4720e41e8e3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 4 04:26:51 2026 +0000

    upstream: add signature malleability and pubkey validity checks to
    
    ed25519 verification (SSH doesn't depend on these properties) Pointed out by
    Soatok Dreamseeker
    
    Add an explicit-seed variant of the keygen function.
    
    feedback / "looks fine" tb@
    
    OpenBSD-Commit-ID: 2a71926bfda24628cf34a88357f44a790e338d5d

commit 65c6ac0a82f8bc3faf5a18fef36112fec1b54fc2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 2 06:18:27 2026 +0000

    upstream: refer to RFC9987 instead of I-D
    
    OpenBSD-Commit-ID: 6b273c50c2aa818b9144b8d9ab568c4239023297

commit c9ebebb22fa50ca50bd036599028d7e09f841c3f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jun 2 21:57:42 2026 +1000

    Reformat setup_ci command line.
    
    This prevents setup_ci from running twice on Cygwin due to different
    parsing of the command line since on Windows it's run via Powershell.

commit 60343e46d5f8b79137a14d2ea5c85bf0b7359cc1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jun 2 22:20:44 2026 +1000

    Fix search for awk formatter.
    
    AC_PATH_PROG only takes a single binary to look for, AC_PATH_PROGS is
    what's needed for more than one.  Looks like an error by me in 285546b.

commit 7e5590cf8ff732a946629b6f766c7a2c9b2ac425
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jun 2 18:49:02 2026 +1000

    Replace shell-level timeout with dedicated command.
    
    It turns out the systems we run this workflow on all have timeout(1),

commit 41bb8c1823a337dca1b027a1e5c560f6a5fc4acc
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jun 2 18:10:25 2026 +1000

    Add a single retry to VM package install steps.
    
    These are potentially flaky due to network issues, so hopefully this
    will reduce the number of manual retries needed.

commit 14d88d4da7fb72d94239049d76c7651723b1a3d9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jun 2 17:44:12 2026 +1000

    Add includes.h for compat functions.
    
    Fixes build on at least old AIX.

commit e8c12cc085272894e7c14eb761e82ec7c0d8f599
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jun 1 20:43:31 2026 +1000

    setup_ci.sh: add timeout and allow one retry

commit de97e5a44c88179b834939b84cd555249382de0e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 1 08:27:28 2026 +0000

    upstream: differentiate between execution failures and subsystem not
    
    found when logging why a subsystem failed to start; GHPR#637 from cuiweixie
    
    OpenBSD-Commit-ID: 42bc40dd6272b7f6726b069a8c4e16025a354056

commit 51db029b53488bc972deba13724034f8e35e6e38
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jun 1 18:26:31 2026 +1000

    Don't install shim for AWK=awk.
    
    If configure finds an undadorned awk, don't install the shim to prevent
    recursive calls to it.

commit 2afcdf7b3e429428d9b6415e0c948001bf968477
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jun 1 17:40:03 2026 +1000

    Pass awk detected by configure to regress tests.
    
    Some platforms' basic awk don't have toupper, but other awks like nawk
    or gawk do.  Pass the one found by configure through to the regress
    tests, and make a wrapper for it so we don't need to modify any tests.

commit 7b776066bc00a12ec3a7f9b04cf8a69a8d260c2c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jun 1 17:39:40 2026 +1000

    Update LibreSSL test 4.3.1->4.3.2.

commit 684d26a3c4d07e78027517fd6e98875ae5dff71d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 1 05:49:20 2026 +0000

    upstream: sk-usbhid: skip unsupported key types in read_rks()
    
    When enumerating resident keys, encountering a credential with an
    unsupported COSE key type (not ES256 or EdDSA) caused the entire
    enumeration to abort via goto out, discarding all valid keys.
    
    Move the key type check before the per-credential allocation so
    unsupported types can be skipped with continue instead. This
    preserves all valid resident keys on the token.
    
    Patch from Akhilesh Arora via GHPR657
    
    OpenBSD-Commit-ID: b344a44ff97d26faf099b8e0cad72ad1e793ac0f

commit de24573efc60ca145e4f2d7e45787eccf8bd41a4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 1 05:40:13 2026 +0000

    upstream: Actually set pollfd.events correctly for socket type
    
    channels; previously we were throwing away the events we computed if the
    channel had a c->sock distinct from it's other read and write fds.
    Fortunately, it appears that this case happens rarely, if ever.
    
    Reported by Darafei Praliaskouski via GHPR660
    
    OpenBSD-Commit-ID: d3f483b7919946c5649e8c697d5b927af35aac4b

commit 58b9381e0b1dbc8e56190b26fb61bae4cfb240be
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 13:12:07 2026 +0000

    upstream: handle compiled-time unsupported options in servconf.h
    
    better; leave a zero placeholder variable so we don't have #ifdef around
    their absence elsehwere in the tree
    
    OpenBSD-Commit-ID: 9601de2c67042aacb0ea12ca424e67c092fa7801

commit ea91c7a1a9ccb22bacd8fcff824c84e3b8414af5
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 31 22:03:56 2026 +1000

    depend

commit 3bc4ac43943852b214a3d85e3424d9304c8a736d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 11:39:44 2026 +0000

    upstream: unit test for new servconf.[ch] code, including a basic
    
    fuzz test for deserialisation
    
    OpenBSD-Regress-ID: f182c21485dc37a41a125f067b59bee48adbfe6c

commit f2b815e42d9fd654cb457cd7e7d1cb751f1a5a33
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 11:31:57 2026 +0000

    upstream: the new configuration dump code emits configuration
    
    directives with capitalisation (previously they were all lowercase), so make
    the tests that consume them insensitive to case
    
    OpenBSD-Regress-ID: 9a81d8501b8b8fc1c1a0d268d4cc91cbb19668f5

commit 633a4c1a24605e48c46fe76afc0814d20593fc00
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 04:20:58 2026 +0000

    upstream: flesh out match_pattern() tests, including a new
    
    comparison test of the new NFA-based implementation against the original one
    for all possible combinations of short inputs and patterns constructed from a
    small dictionary of possibilities.
    
    OpenBSD-Regress-ID: a18e86c95afb6243ac270468f5dd0ab4a78c8074

commit bebc855fdb3f8c7f96fd392f67bec2134cc42b1b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 11:30:50 2026 +0000

    upstream: big refactor of sshd config management code.
    
    This generates much of the initialisation, defaults and keyword table
    code from a set of macros rather than hand coding them. These same
    macros are also used to generate serialisation and deserialisation
    code.
    
    The macros are admittedly ugly but have the advantage of forcing a
    good degree of consistency across places that need to stay in sync
    with each other.
    
    The new de/serialisation code is used to pass configurations across
    the various sshd-* process boundaries. This removes the need to pass
    around raw text configurations that need to be re-parsed as well as
    eliminating some raw pointer leakage across the processes where
    structures were previously clumsily serialised.
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: 9a5109a480637e08c290eeb82aa8ef2ca7e848ce

commit a1dd1c80687fbfbdca19d3a314a8176b90ae471b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 06:14:42 2026 +0000

    upstream: avoid strlen(NULL) crash if an X11 channel was created before
    
    the x11-req SSH_MSG_CHANNEL_REQUEST was sent. Reported by Ben Perry via
    GHPR679
    
    OpenBSD-Commit-ID: 31db0da9ab6c73e6bbf4021ffd53dc3ce5c65f23

commit df18979e1137f41a3ffa25f9d06c4fc55073cb34
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 05:55:21 2026 +0000

    upstream: DNS0x20[1] can randomise the case of domain names returned by
    
    lookup to force some more uniqueness in queries to reduce the likelihood of
    spoofing attacks succeeding.
    
    Normally this should be hidden from the user by the resolver, but
    in some cases it can leak through. When it does, it can mess up
    ssh's CanonicalizePermittedCNAMEs.
    
    Fix this by forcing the name we received from the system resolver to
    lowercase.
    
    bz3966, report and fix by Martin D Kealey
    
    [1] https://datatracker.ietf.org/doc/html/draft-vixie-dnsext-dns0x20-00
    
    OpenBSD-Commit-ID: e0b300d3b3af289e053d928380af71949f95bfb0

commit 5a5e47740b6466d58242aca28b9e584bab4ccf1d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 04:59:51 2026 +0000

    upstream: disallow use of the copy-data extension to read and write
    
    to the same inode simultaneously; reported by Qifan Zhang of Palo Alto
    Networks; ok markus@
    
    OpenBSD-Commit-ID: 94ceb85146d92dbc1289c55d308498d5f56f274a

commit 073faa6beceea162eeeb7963c7352a6c851e507a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 04:51:45 2026 +0000

    upstream: Fix two separate one-byte out-of-cound reads
    
    1) if a server sent an empty reply to a SSH2_FXP_REALPATH request
    2) if a batch command used the full 2048 byte buffer but ended in a
      literal backslash character
    
    Both reported by Zhenpeng (Leo) Lin from depthfirst
    
    ok markus@
    
    OpenBSD-Commit-ID: d1ccc1f5a6eb109065ce8a552fea8e502381ce59

commit 8dfe7ed6e2fd988de08df508355a196b956b2753
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 04:47:29 2026 +0000

    upstream: DisableForwarding=yes didn't override PermitTunnel=yes
    
    Reported independently by Huzaifa Sidhpurwala of Redhat and Marko
    Jevtic; ok markus@
    
    OpenBSD-Commit-ID: b5c13f0746cf079b21f8deba47407fad49ccbf4c

commit 72b05ecd141b9683285dcdb439de01903c1a07d3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 04:44:38 2026 +0000

    upstream: make the transport protocol stricter by disconnecting if
    
    the peer sends non-KEX messages during a key re-exchange.
    
    Previously an evil peer could continue sending non-KEX messages
    without penalty, causing memory to be wasted up until the
    connection terminated or the server/client hit a OOM limit.
    
    reported by Marko Jevtic; ok markus@
    
    OpenBSD-Commit-ID: 8937f0f2096156f5c68ae2dce77956373589d757

commit 26cde4cfc55eb1d336e1249d702c0c4705b0424b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 04:37:56 2026 +0000

    upstream: stricter validation of the transport state passed from
    
    the unprivileged preauth sshd-auth process to the user-privileged postauth
    sshd-session process.
    
    These are harmless unless an attacker had an exploit for sshd-auth
    in which case they could be used for post-auth memory DoS or to
    crash you own session in a new and exciting way.
    
    Reported by bylee3 and Kayky Vinicius
    
    ok markus
    
    OpenBSD-Commit-ID: 214e256904a4ae4f83d2083096796c9689c1d7b5

commit 10f66b2af950c94af3b25027abec5209d90eb451
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 04:31:04 2026 +0000

    upstream: Enforce a maximum size for usernames in agent key use
    
    constraints
    
    Along with the match_pattern() performance change that was just
    committed this avoids a denial-of-service where an agent client could
    waste CPU on an agent by sending user constraints with lots of
    wildcards.
    
    Reported by Huzaifa Sidhpurwala of Redhat
    
    ok markus
    
    OpenBSD-Commit-ID: 0483817f1a8accf4dbff42b7073ee4d119105d71

commit 1e82d2cfcfd05ec2e4515894a92223f40839c7b8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 04:24:39 2026 +0000

    upstream: fix client use-after-free on error path if cipher_init()
    
    fails; reported by Qualys Security Advisory Team, ok markus@
    
    OpenBSD-Commit-ID: a8731da0c462b2b9d11314ba505c26ee0cdada83

commit 9d4c0b31f172782def72ccc2fb2dc217d3135e6f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 31 04:19:16 2026 +0000

    upstream: Replace the old recursive match_pattern() with an
    
    implementation that uses a NFA for matching. This avoids the exponential
    worst- case behaviour for the old implementation.
    
    ok markus@
    
    OpenBSD-Commit-ID: fc6b75a52f4c0acb52b7900658c8d25ff873cbae

commit 7ab700f1706b154d4bc5cf66e19c05be6d9b1fc1
Author: Damien Miller <djm@mindrot.org>
Date:   Sat May 30 23:24:01 2026 +1000

    Make failure to set SECCOMP or NO_NEW_PRIVS fatal
    
    If your Linux system lacks support for these then please don't
    enable the seccomp sandbox.
    
    Prompted by manfred.kaiser@ssh-mitm.at

commit 4f4aeee6edaa248f1e7ce22ee3f35ce183eabf38
Author: Manfred Kaiser <manfred.kaiser@ssh-mitm.at>
Date:   Sun May 24 09:53:42 2026 +0200

    sandbox-seccomp-filter: remove duplicate SC_ALLOW(__NR_clock_gettime64)
    
    The syscall is already permitted at line 297 in its own ifdef guard.
    No functional change.

commit 16908221360a01b1801c6ca70c26b73c83509ea3
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed May 27 13:57:26 2026 +0000

    upstream: Use the new RELINK feature in bsd.prog.mk to build the
    
    relink kits.
    
    OpenBSD-Commit-ID: df5c950444e208b320265fa8a1afd676e2edfa6e

commit 3bee4a1a260809992a0877d7ef202c4ff3e0be24
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Wed May 27 13:54:15 2026 +0000

    upstream: ssh: use sentinel idiom for timegm(3) and mktime(3)
    
    There is nothing wrong with times before the epoch, even -1, so use the
    idiom recently added to the CAVEATS section to figure out whether there
    was an error in the timegm() or mktime() calls.
    
    We should sweep the tree for this. If anyone is bored, feel free to beat
    me to it...
    
    ok deraadt djm
    
    OpenBSD-Commit-ID: e2b1721966dc782e776db5d6cfb18958534f9d4b

commit 26a8c13e6154a905b4eaf48798b134372747e86f
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Wed May 27 03:28:07 2026 +0000

    upstream: ssh-agent: add -V to usage()
    
    ok djm
    
    OpenBSD-Commit-ID: ea9bc250ce34c4c8317896673ca37f3ee17223c7

commit 3a05a07e78f7b88ba70fa7f96808bcb86a55cbe8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 27 03:05:21 2026 +0000

    upstream: use "ssh-agent -V" to test the binary is functional after
    
    relinking requested deraadt@
    
    OpenBSD-Commit-ID: eb4169949bf61188fb7336b11b73833019d10d7b

commit 7fbe3e440eae0cd2315545ce5abd89e936b3a92f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 27 03:04:30 2026 +0000

    upstream: add a -V flag to print the version, but mostly as a way
    
    to check the binary is functional; ok deraadt@
    
    OpenBSD-Commit-ID: 0cc5cb22cbfe09ac4c316dd5da0af7a4193a42af

commit f44f124a234785b9d2cd59a6da28737fb3c4ad9a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed May 27 23:04:36 2026 +0000

    upstream: Test all mutually supported algorithms,
    
    using dropbear's new -Q option to query its algorithms where possible.
    
    OpenBSD-Regress-ID: 7e1fa733dec3bfa9f8931e535a9397209b5953f3

commit 0cadf7e0e88f4088595afbea21f2e43f3ae28abc
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue May 12 13:02:40 2026 +0000

    upstream: Dropbear recently added a -Q option;
    
    use it to query KEX if available.
    
    OpenBSD-Regress-ID: beab781f357e27e75dfdd2ec600a7dff2c63cb5b

commit 0e2db7bc017d968ef57b0b5b4fd86643ecdb05e4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon May 4 10:57:24 2026 +0000

    upstream: Fix skip message.
    
    OpenBSD-Regress-ID: d192bbc19cc5914e64a3bb35a347eca0318729af

commit 0a561f90672b6dc6187763f3b90e47c4c4247875
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 26 10:48:19 2026 +1000

    Run hardenedmalloc test on ubuntu-latest.
    
    Needed for newer clang that supports -std=c23.

commit 3468ac72962970728a204e5052a3be9826090b13
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 26 09:33:51 2026 +1000

    Hardenedmalloc needs -std=c23 so build with clang.

commit 42b213c66ba143f543b824ea5951f1ceb3fdd15b
Author: Michael Forney <mforney@mforney.org>
Date:   Fri May 22 03:02:00 2026 +1000

    Fix IPTOS_DSCP_VA fallback
    
    0x2c is the unshifted value, and was copied over from openbsd before
    it was fixed to be 0xb0 in [0].
    
    Source of discrepancy identified by Leah Neukirchen.
    
    [0] https://cvsweb.openbsd.org/log/src/sys/netinet/ip.h#rev1.22

commit 66847768ffd5a2a004891c8d3bd79eaba12625b7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 21 18:39:54 2026 +1000

    Add OpenBSD 7.9 test VM.

commit d0d7981cf56363e6320f2aa6cf798e293420a7cf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 21 18:38:47 2026 +1000

    Another shell portability fix for Solaris.

commit 498372545f48effd30a4d4c005eea25b1141fc74
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 21 18:25:50 2026 +1000

    Use backticks for shell portability w/ Solaris.

commit 18b9db789e278c4d6a5ff21093a45683950db3ae
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 19 18:37:26 2026 +1000

    Add interop tests against Dropbear >= 2020.79

commit a5a1b7e75389231bf817433d93f15732ba13c0ad
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 21 04:04:57 2026 +0000

    upstream: mention that compression could potentially leak
    
    information about session contents (cf. the CRIME attack on TLS) if a
    connection allows attacker- controlled traffic over it alongside trused
    traffic. This might occur in some forwarding scenarios.
    
    with deraadt@
    
    OpenBSD-Commit-ID: 03d145cdbf3a8713e8309724b5c9a9b76c317749

commit e5c9cf9ac7543a5e59dabf11f993a9c032b9b71f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 21 02:50:59 2026 +0000

    upstream: mention usefulness of request type allow/denylisting for
    
    servers accepting untrusted clients
    
    OpenBSD-Commit-ID: 8b991bd263b46374a8e73f02d05cdccca73ae520

commit 62fce76130485773c635da8adaeb7de78382a5f0
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Mon May 18 04:14:57 2026 +0000

    upstream: chacha: avoid -Wunterminated-string-initialization
    
    warning
    
    The sizes of sigma[] and tau[] aren't used, so include a trailing NUL and
    thereby avoid upsetting modern compilers about use of dangerous, valid C.
    
    ok deraadt djm
    
    OpenBSD-Commit-ID: 030a71ff16bb1e6135170c6507bc558eabe7345c

commit 33392024f46e7aabaeaf947cc3b110d60a9fd9e3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 13 05:58:58 2026 +0000

    upstream: avoid validating bad cipher or mac lists in config files
    
    / commandline arguments as valid.
    
    Identified by SUSE and reported by Camila Camargo de Matos
    
    ok deraadt@ tb@
    
    OpenBSD-Commit-ID: 45d51154f2418549e08b80fa33df6c6532046054

commit cf6c0b3b94cdc223f1b8be1ef2d93e993af5d976
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 13 05:11:02 2026 +0000

    upstream: fix hard-to-reach NULL deref during pubkey auth
    
    To hit this, the user must be using a PEM style private key with no
    corresponding .pub key adjacent to it.
    
    OpenBSD-Commit-ID: b7150acc5322fa33f21491834d9471fbe3d30f20

commit 55df196e39cb23fd53e42b2f07292ffc01650bff
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 12 19:53:54 2026 +1000

    Retire OmniOS r151046 & r151054 test configs.
    
    They require packages from an external mirror which has been unreliable
    lately, so stop relying on it.

commit 6d9116d4dfefe387e42250ec7c01aad56ce43bda
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 12 19:43:48 2026 +1000

    Handle missing packages for FreeBSD 12.4.
    
    (Most) FreeBSD mirrors no longer have packages for 12.x, so install the
    only thing we need (sudo) from source on.

commit 99f1e0c2f91f00e0bb3c4a814ec448fda2b0e144
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 12 18:50:20 2026 +1000

    OmniOS: check for gcc before installing.

commit ded80eb0ff89f18ccf25cd3dc7997d92d755ef6a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 12 18:05:24 2026 +1000

    Add VM test versions for : OmniOS and FreeBSD.
    
    Add OmniOS r151056 and r151058 (with build-essentials, so hopefully
    faster and lower dependency) and FreeBSD 12.4 for better coverage.

commit 67f31cefd8ccf0f55f24e806c4dc86b028fa65ff
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 12 14:36:27 2026 +1000

    update getrrsetbyname.c from OpenBSD upstream
    
    revision 1.15
    date: 2026/05/09 01:54:51;  author: tb;  state: Exp;  lines: +14 -13;  commitid: zZPVUWycKAslGJtO;
    Avoid recursive cleanup in getrrsetbyname()
    
    Instead of freeing struct dns_query and struct dns_rr by walking the
    linked lists recursively, use a simple loop. This avoids a possible
    stack exhaustion unlikely to be reachable with the limits modern
    resolvers impose.
    
    From Dhiraj Mishra

commit 56e73cd804cff08e38caaa03b75bec253f16fd62
Author: Darafei Praliaskouski <me@komzpa.net>
Date:   Sat May 9 19:50:31 2026 +0400

    ci: avoid rsync dependency in NetBSD VM jobs

commit ac4a41265a3beccba7dc6f45c657298311280f01
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 5 06:21:14 2026 +0000

    upstream: unbreak; spotted by Darren's test army
    
    OpenBSD-Commit-ID: e95ceda842a2c7a08fc00ac3a529877d87fee7b2

commit 3754f2edd42039ace7d53873975870fbe9143b94
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 5 05:34:27 2026 +0000

    upstream: classify dynamic-tcpip channels as bulk, not interactive;
    
    bz3958, ok markus@
    
    OpenBSD-Commit-ID: b18f1c1eaff8423bf069ff6103e8865cec18d64b

commit 4ea08a0353f85b5b0cc1ddd70da5fa23e7d588a4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 4 23:33:57 2026 +1000

    Improve NetBSD PAM tests.
    
     - Set random password and use for password auth test.
     - When testing PAM builds, test with and without UsePAM.

commit 504d01d81fe0d17725786b05737db9cd7f3b2b5c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 4 23:15:05 2026 +1000

    Improve FreeBSD PAM tests.
    
     - Set random password and use for password auth test.
     - When testing PAM builds, test with and without UsePAM.

commit a05de3f67f69582e061445d5d78e5fcd01067299
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 4 22:57:58 2026 +1000

    Update to FreeBSD 14.4, add 15.0.

commit 6296749fe19a14d11826dd04591ebb84c110e96b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 4 21:40:52 2026 +1000

    Improve Solaris PAM tests.
    
     - Set up and run tests with SUDO.
     - Set random password to use for password & kbdint auth tests.
     - Only run t-exec when re-testing with PAM, don't rerun unit tests.
     - When testing PAM builds, test with and without UsePAM.

commit f9d62eaa536cba92bcb42658ff5f72c287c47e49
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 4 21:39:01 2026 +1000

    Only run t-exec when re-testing with PAM.
    
    There's no point rerunning unit tests.

commit 05af6553e9026df935163a12d14ff4d205465717
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 4 18:47:03 2026 +1000

    Add Solaris 11.4-clang-19 test.

commit cb654c2ce7b0113a14aba979ffe9f7f5ad312013
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon May 4 17:41:37 2026 +1000

    Add RUN_ONLY_PLATFORM to run a subset of tests.

commit 328993c8991e5cde61f5abf1b87b26fa2537ae6c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 4 16:05:34 2026 +1000

    skip ("#if 0") strvisx and stravis
    
    we don't use the in OpenSSH and some compilers throw warnings
    compiling them that break -Werror

commit 5fa60ae0d2ed3fc441f54c9349afbd63b6301929
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 1 09:19:56 2026 +1000

    Remove 9.9 and 10.0 branches from build status page.

commit 7ab5e4073a508a342be49e2c238087b2de4e099f
Author: Renaud Allard <renaud@allard.it>
Date:   Sat Mar 21 19:23:04 2026 +0100

    vm.yml: fix solaris PAM tests
    
    Add missing SSHD_CONFOPTS="UsePam yes" to the solaris PAM test
    step so it actually tests PAM functionality instead of re-running
    the default tests with a PAM-enabled binary.

commit 1c553a16065a95284468cd79b1c4919929dfe3ac
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 29 22:22:10 2026 +0000

    upstream: fiddle with mask after umask call and not before; avoids
    
    fortify warnings on android. bz3954
    
    OpenBSD-Commit-ID: 82224426b2ee989c68f305caa50aa3d3b4993a84

commit 1bfe4ce37c3c531150b33d1a9d4dae6234028076
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 28 21:32:05 2026 +0000

    upstream: unveil the actual listening socket path and its directory
    
    so it can be cleaned up at exit.
    
    Reported by / tested by David Krause, ok markus@
    
    OpenBSD-Commit-ID: b45d740e9a63dec0fad436ed78f6912b39f0cd53

commit f24dc9e993de6f99d5dcb06ba3a401fe5792b2f4
Author: job@openbsd.org <job@openbsd.org>
Date:   Mon Apr 20 07:43:52 2026 +0000

    upstream: Clarify comment on what setting extended types for
    
    channels does
    
    OK djm@
    
    OpenBSD-Commit-ID: fa035fb19b74571992fa3adca4396a4c572a7a8a

commit b9ccca0edfbd46b3114192956d9aaea3e7bc3c08
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 29 09:14:31 2026 +1000

    Add tracking for 10.3 branch.

commit 6185d1e6f74fb7749ff0227dfe44b2c3a9dd0885
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 28 09:09:57 2026 +1000

    Rename obsd arm64 snapshot VM for consistency.

commit 2029eddf4d57c654d53cdac7a192511de3b386dd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Apr 27 05:49:41 2026 +0000

    upstream: Use supported hostkeyalgorithms specifically in
    
    sshd_config instead of supported key types, which is almost but not
    completely correct.
    
    OpenBSD-Regress-ID: 43c3b348576900f3e710bff5d6a87f0e803c5b3d

commit ff254f67401fb27e6ae81a266f2d41d4c16bdbba
Author: claudio@openbsd.org <claudio@openbsd.org>
Date:   Thu Apr 23 12:57:47 2026 +0000

    upstream: Drop -Winline from CDIAGFLAGS it breaks on sparc64
    
    On sparc64 ssh/unittests/kex fails to build with:
     usr.bin/ssh/libcrux_mlkem768_sha3.h:8196: warning: inlining failed
     in call to 'libcrux_ml_kem_polynomial_ZERO_89_ea':
     --param max-inline-insns-single limit reached
    
    OK djm@ (long time ago) reminded by tb@
    
    OpenBSD-Regress-ID: c32094e3436536474039a4aeefabdbf0bd826554

commit 2be9cec2fc062ffa087db55d26203db8f1567661
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 27 21:53:36 2026 +1000

    Update OpenSSL tested versions.

commit b41203e500e067095ef64a8de8ca4417a6f39552
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 27 21:16:56 2026 +1000

    Comment out new PAM valgrind test until debugged.

commit 4e0d1aea897d77d3b93e191eda58436e44a53818
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 20 18:47:23 2026 +1000

    Simplify Cygwin permissions setting.

commit 6c5235cb6692415e475fea4c0b69ee7ea0af8055
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 20 18:45:37 2026 +1000

    Reorder steps to change perms before displaying.

commit ba110a56a7180fef18e02dfaccad97cc510a558f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 20 22:46:17 2026 +1000

    Allow setting TEST_SSH_TRACE via Github.

commit 8751cd9c5cac7b358b5648df0510b3f53b95fc22
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 20 22:55:48 2026 +1000

    Add tests for libressl-4.3.1.

commit 1afbd7bd1fb71e8b1d06f99978d439aec59dddca
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 27 20:51:17 2026 +1000

    Re-enable SHA1 sigs in OpenSSL on Cygwin for tests.
    
    Recently Cygwin imported changes from Fedora which disable SHA1
    signatures by default.  This breaks the unit tests (and a couple of
    regression tests), so set rh-allow-sha1-signatures=yes in the OpenSSL
    config to re-enable them.

commit 7235471fb40705130d7f5816ec31ab562efc8cf9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Apr 25 20:00:38 2026 +1000

    Check for OPENSSL_NO_ENGINE for --with-ssl-engine.
    
    OpenSSL 4 removes support for ENGINE, but it provides no-op stubs
    for the ENGINE functions in addition to setting OPENSSL_NO_ENGINE.
    
    The presence of the stubs fooled the old configure test, so if someone
    tried --with-ssl-engine with OpenSSL 4.0.0 it'd try but fail at build
    time.  Explicitly check for OPENSSL_NO_ENGINE. before trying to enable
    ENGINE support.  bz#3952.

commit 45b30e0a5439a02417a4fe982a4b16a9c126ba6b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 19 23:37:22 2026 +0000

    upstream: correctly set extended type for client-side channels.
    
    Fixes interactive vs bulk IPQoS for client->server traffic. ok job@
    
    OpenBSD-Commit-ID: 34f5131face8d6dc4ae6955196e5fcafb3570cfe

commit ca19b95ab6cd4efe5f2d8a08a377a2ac0b9caca1
Author: job@openbsd.org <job@openbsd.org>
Date:   Mon Apr 13 08:18:33 2026 +0000

    upstream: Also show the duration of the current session through the
    
    ~I escape
    
    OK dtucker@
    
    OpenBSD-Commit-ID: 695c1a09c4cc8b417a1bd3eb207b0cc7fa831c7a

commit 00d955cf9e2e09eb3e98ebf6b375adccb7f25842
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 7 07:40:40 2026 +0000

    upstream: want stdint.h here now that we've switched from u_intXX_t
    
    -> uintXX_t
    
    OpenBSD-Commit-ID: 6d5e80bd6f29a9db18b18beeb1cbe5423b59de44

commit eb34f95206c3556e10046f091ea95431c4be84f8
Author: Bob Beck <beck@openssl.org>
Date:   Thu Apr 16 10:09:02 2026 -0600

    Make ci work for OpenSSL 4 variants

commit 713ec5c5ae9b8ca91c3b752bec12e728612d13f4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Apr 16 20:55:23 2026 +1000

    Test against OpenSSL 3.6.2, 4.0.0 and 4.0-stable.

commit b6d46558dbd482d0d9c46ab53805d1803967b59c
Author: Dmitry Misharov <dmitry@openssl.org>
Date:   Mon Mar 16 09:08:57 2026 +0100

    account newer openssl versions in .github/setup_ci.sh

commit f2da6737e237324b43afc002ce4836e65659fb2e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Apr 16 19:32:34 2026 +1000

    Match case with other messages.

commit b433d015a6547598e568808d9cae16325bc8928f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 15 08:14:58 2026 +1000

    regen signature on allowed_signers file
    
    This was missed after the file was updated, but nobody noticed it
    until now.

commit 4168c905943f7f715182180b9f7c8cda54af2514
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 2 18:56:48 2026 +1100

    depend

commit f8b9d694fc20349b6c48a4af03a0499dea00f5f9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 2 18:55:50 2026 +1100

    Update versions in RPM spec files

commit 5aa09926fbf050d484a79717fadec8360c5c5645
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 2 07:52:15 2026 +0000

    upstream: adapt to username validity check change
    
    OpenBSD-Regress-ID: d22c66ca60f0d934a75e6ca752c4c11b9f4a5324

commit eb3a5bb2abd4798ff546564eb2210d188efaf0f1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 2 07:51:12 2026 +0000

    upstream: openssh-10.3
    
    OpenBSD-Commit-ID: 05e22de74e090e5a174998fa5799317d70ad19c4

commit 76685c9b09a66435cd2ad8373246adf1c53976d3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 2 07:50:55 2026 +0000

    upstream: move username validity check for usernames specified on
    
    the commandline to earlier in main(), specifically before some contexts where
    a username with shell characters might be expanded by a %u directive in
    ssh_config.
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    We continue to recommend against using untrusted input on
    the SSH commandline. Mitigations like this are not 100%
    guarantees of safety because we can't control every
    combination of user shell and configuration where they are
    used.
    
    Reported by Florian Kohnhäuser
    
    OpenBSD-Commit-ID: 25ef72223f5ccf1c38d307ae77c23c03f59acc55

commit fd1c7e131f331942d20f42f31e79912d570081fa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 2 07:48:13 2026 +0000

    upstream: correctly match ECDSA signature algorithms against
    
    algorithm allowlists: HostKeyAlgorithms, PubkeyAcceptedAlgorithms and
    HostbasedAcceptedAlgorithms.
    
    Previously, if any ECDSA type (say "ecdsa-sha2-nistp521") was
    present in one of these lists, then all ECDSA algorithms would
    be permitted.
    
    Reported by Christos Papakonstantinou of Cantina and Spearbit.
    
    OpenBSD-Commit-ID: c790e2687c35989ae34a00e709be935c55b16a86

commit 487e8ac146f7d6616f65c125d5edb210519b833a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 2 07:42:16 2026 +0000

    upstream: when downloading files as root in legacy (-O) mode and
    
    without the -p (preserve modes) flag set, clear setuid/setgid bits from
    downloaded files as one might expect.
    
    AFAIK this bug dates back to the original Berkeley rcp program.
    
    Reported by Christos Papakonstantinou of Cantina and Spearbit.
    
    OpenBSD-Commit-ID: 49e902fca8dd933a92a9b547ab31f63e86729fa1

commit c805b97b67c774e0bf922ffb29dfbcda9d7b5add
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 2 07:39:57 2026 +0000

    upstream: add missing askpass check when using
    
    ControlMaster=ask/autoask and "ssh -O proxy ..."; reported by Michalis
    Vasileiadis
    
    OpenBSD-Commit-ID: 8dd7b9b96534e9a8726916b96d36bed466d3836a

commit 78d549857e0cc480c3cbb0a3571078920e3b79c5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 2 07:38:14 2026 +0000

    upstream: Fix possible sshd crash when sshd_config set MaxStartups
    
    to a value <10 using the single-argument form of MaxStartups (e.g.
    MaxStartups=3). This doesn't affect the three-argument form of the directive
    (e.g. MaxStartups 3:20:5).
    
    Patch from Peter Kaestle via bz3941
    
    OpenBSD-Commit-ID: 1ad093cae69f55ebfdea1ab24318aefd593d63b8

commit 5d72f1865b95ebfd99ea7baa8f6f2a4b721d151e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 2 18:32:00 2026 +1100

    properly bail out when PAM changes username
    
    OpenSSH doesn't support PAM changing its conception of the
    username via a module calling pam_set_item(h, PAM_USER, ...).
    We were supposed to bail out here, but I messed up while "fixing"
    this last time and dropped a return statement.
    
    Reported by Mike Damm

commit fe86c39751d38eb9e9b03ace1e31aa4586ea6660
Author: Michael Forney <mforney@mforney.org>
Date:   Wed Apr 1 12:09:00 2026 +1100

    avoid k suffix in dd count operand in sftp-resume test
    
    Not all dd implementations support this. POSIX only specifies
    suffixes for block size operands.
    
    Instead, just use 1024k to avoid the special case. This also removes
    an incorrect redirection operator that appeared in the 1m case.

commit 52c01f2a8019002c70cfd93be87ff9adee1d0e73
Author: Michael Forney <mforney@mforney.org>
Date:   Tue Mar 31 12:54:22 2026 +1100

    add missing <stdio.h> include to unit tests for printf
    
    This fixes the build with --without-openssl on musl. glibc worked
    previously because it got stdio.h implicitly through resolv.h.

commit 1340d3fa8e4bb122906a82159c4c9b91584d65ce
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 30 21:58:44 2026 +1100

    Add proxyjump.sh omitted from previous commit.

commit 607bd871ec029e9aa22e632a22547250f3cae223
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 30 07:19:02 2026 +0000

    upstream: add a regression test for ProxyJump/-J; ok dtucker
    
    OpenBSD-Regress-ID: 400dc1b5fb7f2437d0dfbd2eb9a3583dafb412b3

commit 55fc7bfd1d3a46f4856fd68f09da60d901fac626
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 24 12:31:35 2026 +0000

    upstream: Use ~/.shosts for Hostbased test.
    
    OpenBSD-Regress-ID: ab64fd0a86422df1eadacde56c0a2cff5d93425d

commit 445db5cb620d73c9af1f1791c523aaf3d2236854
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 24 10:21:14 2026 +0000

    upstream: Ensure known_hosts file exists when setting up.
    
    OpenBSD-Regress-ID: 92721cad4c219fe62b7b795a73505c22e56f09e0

commit 2ecfcc0aae651621535e345a1c23ff6d2a9593c9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 23 09:53:52 2026 +0000

    upstream: Check if host keys exist before adding them, and expand
    
    on the warning about modifying the system config.
    
    OpenBSD-Regress-ID: 68038da909f9c992375b7665dab0331d6af426b7

commit 5576e260a0f9836ca55c8279e342c63d1a0851d1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 23 09:09:36 2026 +0000

    upstream: Add special handling of
    
    TEST_SSH_HOSTBASED_AUTH=setupandrun.
    
    This will MODIFY THE CONFIG OF THE SYSTEM IT IS RUNNING ON to enable
    hostbased authentication to/from itself and run the hostbased tests.  It
    won't undo these changes, so don't do this on a system where this matters.
    
    OpenBSD-Regress-ID: ae5a86db1791a2b8f999b07b5c8cc756d40bf645

commit 0a0ef4515361143cad21afa072319823854c1cf6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 30 07:18:24 2026 +0000

    upstream: apply the same validity rules to usernames and hostnames
    
    set for ProxyJump/-J on the commandline as we do for destination user/host
    names.
    
    Specifically, they are no longer allowed to contain most characters
    that have special meaning for common shells. Special characters are
    still allowed in ProxyJump commands that are specified in the config
    files.
    
    This _reduces_ the chance that shell characters from a hostile -J
    option from ending up in a shell execution context.
    
    Don't pass untrusted stuff to the ssh commandline, it's not intended
    to be a security boundary. We try to make it safe where we can, but
    we can't make guarantees, because we can't know the parsing rules
    and special characters for all the shells in the world, nor can we
    know what the user does with this data in their ssh_config wrt
    percent expansion, LocalCommand, match exec, etc.
    
    While I'm in there, make ProxyJump and ProxyCommand first-match-wins
    between each other.
    
    reported by rabbit; ok dtucker@
    
    OpenBSD-Commit-ID: f05ad8a1eb5f6735f9a935a71a90580226759263

commit b62a6cfbed3481dac8bff35fab22cf489bb0b77f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Mar 29 01:08:13 2026 +0000

    upstream: switch from int to long long for bandwidth calculations;
    
    fixes rate display when rate > 2GB/s; based on patch from Cyril Servant
    feedback/ok deraadt@
    
    OpenBSD-Commit-ID: 071eb48c4cba598d70ea3854bef7c49ddfabf8d3

commit 54443b8665c9c29ea0e3f5a5176d8f3c3403ad7c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 29 16:43:59 2026 +1100

    depend

commit c90f46b6230826cdadacd6c32b62b0f8106a09da
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 29 16:42:33 2026 +1100

    use nonnull attribute when available
    
    Set this attribute on a few string to avoid compiler warnings from
    -Wunterminated-string-initialization warnings in recent gcc.

commit bdaf65ae51d62c6cb676bd341cc34217c1b24920
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 29 16:24:59 2026 +1100

    fix state confusion between PAM and privsep code
    
    Commits b9a6dd4d6 and df2b28163 introduced a potential desynchronisation
    between the PAM code and the sshd-session monitor that could result in
    authentication bypass if the unprivileged sshd-auth process had been
    compromised.
    
    Reported by Ben Edelman of NIST. Only git HEAD is affected, these
    changes have not yet been included in an OpenSSH release.

commit 6eb5a68c42a587df802d3d9a19088671269ffca8
Author: Laurent Chardon <laurent.chardon@gmail.com>
Date:   Sat Mar 28 04:22:54 2026 -0400

    openbsd-compat: reword EAI_NONAME error string
    
    Reword the EAI_NONAME message in fake-rfc2553.c to make it
    clearer and grammatically correct.
    
    While there, remove a couple of stray periods from other error
    strings to keep the messages consistent.
    
    No functional change.

commit fd7d4b2b52deaf296b06d78b85c97fdae31912e8
Author: Icenowy Zheng <uwu@icenowy.me>
Date:   Sun Mar 22 15:13:31 2026 +0800

    seccomp sandbox: allow riscv_hwprobe syscall if present
    
    The development branch of zlib-ng now contains code for utilizing
    riscv_hwprobe syscall to retrieve availability information for several
    RISC-V extensions (and accelerate deflate algorithm with them).
    
    As the seccomp sandbox of OpenSSH will raise SIGSYS for filtered out
    syscalls, this will abruptly terminate the process when the
    riscv_hwprobe syscall is tried.
    
    Put it into the allowlist to prevent process termination. As all
    syscalls here are guarded by #ifdef's, the same will be done for
    riscv_hwprobe, and thus on non-RISC-V builds nothing will happen.
    
    Signed-off-by: Icenowy Zheng <uwu@icenowy.me>

commit fd5018fbeb6e91ae4321490c2825ecc632b83748
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Mar 28 05:16:18 2026 +0000

    upstream: ensure c->local_window doesn't underflow during updates;
    
    similar to checks performed elsewhere. From Renaud Allard
    
    OpenBSD-Commit-ID: 4827c10807936e9ab9af2cf1c7379e1f56dbdeac

commit 8331cb9daafd23391de4379e9977ff159bb8242e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Mar 28 05:10:25 2026 +0000

    upstream: fix base16 parsing; currently unused. From Renaud Allard
    
    OpenBSD-Commit-ID: 3f6e5d4c6a2550d5a7e3c33bcd895b7f8e42196b

commit 21ecb5fd72ee442a8b1eb5011c7f929ba8ce02f9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Mar 28 05:07:12 2026 +0000

    upstream: mention that RevokedKeys is read by the server at each
    
    authentication time and should only ever be replaced atomically.
    
    OpenBSD-Commit-ID: eeedf5a10331ac4e39fbd2fc41e4a11c38b2ef9b

commit c5182e3f06f9f1fd86d62b9dcd0397408dd698da
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Mar 28 05:06:16 2026 +0000

    upstream: fix potential hang if /etc/moduli doesn't contain the
    
    requested DH group values; from 77c9ca, ok dtucker@, markus@
    
    OpenBSD-Commit-ID: 1bf402cdb8876237c280ac77fbf7fafd2c16c5ae

commit d3efbba14fda78ed7b15fbc34cf34c1cf27d1716
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 19 17:57:26 2026 +1100

    Add a VM-based test for OpenBSD-current.

commit 4bb4f1601e0776e71cfca50aae3680eb0771e2d0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 23 17:50:40 2026 +1100

    Add a Valgrind test of the PAM config.

commit 12da685dfc98b14dddb5977a1fc52d06474f3308
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 19 17:52:54 2026 +1100

    Upstream tests don't use the config file.

commit 2ca6eef69d7dbecfd67cede25ea6a9aa1074ba3e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 23 01:33:46 2026 +0000

    upstream: clarify that Authorized(Keys|Principals)(File|Command)
    
    are only consulted for valid users.
    
    clarify that TOKENS are expanded without sanitisation or escaping
    and that it's the user's reponsibility to ensure their usage is
    safe.
    
    prompted by bz3936; feedback/ok deraadt@
    
    OpenBSD-Commit-ID: cd58abad1137346ba2dee55fa9ebb975f5fa7a06

commit 443616ce9070d370c97271347e91fcfd24b5df84
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Mar 19 02:36:28 2026 +0000

    upstream: repair ssh-keysign after pledge changes; spotted/tested
    
    by naddy@ ok deraadt@
    
    OpenBSD-Commit-ID: fccc6c7994c8f45c4417efe490d23154d9caaa6d

commit 552a5c786b60a9cfe0d2c157dd18f78950529513
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Mar 11 09:10:59 2026 +0000

    upstream: Check return values of fcntl(... O_CLOEXEC)
    
    calls by reusing the macro in monitor.c.  Flagged by Coverity CID
    901297 in ssh-sk-client.c, a few other instances added for good measure.
    begrudging ok deraadt@
    
    OpenBSD-Commit-ID: b9de92e17ac0b04348770e5a25cb15a02b416926

commit 24168275e6d0b29cf2233c3f2c1d4a4614feb582
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Mar 11 09:04:17 2026 +0000

    upstream: Fix potential 1-byte array overrun
    
    in the case where read() returns exactly 100 bytes.  Flagged by Coverity
    CID 901296, ok djm@
    
    OpenBSD-Commit-ID: 66a96b08166e63dcbeed00297c33f09c4f22c1f7

commit 70a41262839a2d65ca8ef9e8ea34ad471c52afa1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 10 07:27:14 2026 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: b16d2b4a96406538fa181053926cba44abca7f29

commit ef98b6014bc3268e904092894ffcb63022172a97
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Tue Mar 10 06:35:29 2026 +0000

    upstream: when unveils error our, use correct variable
    
    OpenBSD-Commit-ID: 6b496c10965e70413a9916a8823839c553c6b2c4

commit beba5884dfe8cc30aadef439af5e5d784b5788b1
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Tue Mar 10 03:45:01 2026 +0000

    upstream: When execve() failure is indicated on the pipe, replicate
    
    the same error conditions as the previous access() check did ok djm
    
    OpenBSD-Commit-ID: 875a77dddf0809a3501de2b913cb3bfd4b64f3f7

commit 2a9e1aadaa20a05430bddc30853fbd3449083a4d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 10 03:40:26 2026 +0000

    upstream: unveil ssh-pkcs11-helper too; fixes breakage spotted by
    
    anton@
    
    If SK/P11/askpass is overridden by environment, only unveil the requested
    path and not both the requested one and the default.
    
    feedback/ok deraadt@
    
    OpenBSD-Commit-ID: 84356c6a44f35e66fe73fc1524a7c8e908521eb2

commit 46eb7dc5a6f312f99437ebdcf04f0f2c03aa570b
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sat Mar 7 18:35:43 2026 +0000

    upstream: With it's own daemonization / fd cleaning code, ssh-agent
    
    opens /dev/null O_RDWR after a pledge without "wpath".  This is allowed in
    current pledge because "/dev/null" is implicitly allowed to be opened even
    with the most restrictive pledges or unveils.  This is a design decision in
    pledge made at the very beginning, to satisfy libc requirements.  We've
    finally had enough experience and know how to fix that in the near-future,
    but need to review and fix all code which opens these implicit paths. The fix
    is to add "wpath", so that "/dev/null" can be opened O_RDWR. But that is
    uncomfortable, so we add unveil() allowing "/" with "r", 4 unveil "x" for the
    potential askpass and helpers to be execve'd, and "/dev/null" with "wr".  As
    a result filesystem access is substantially more restricted than before, and
    ssh-agent is ready for the future pledge change. ok djm dtucker
    
    OpenBSD-Commit-ID: f223b11d2db3c0b14e53c1de59966dd5f372a977

commit b75bf339eae6115c544bdcefa0d67a6dcc971ec5
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sat Mar 7 18:27:52 2026 +0000

    upstream: Stop doing access() before execve(). It is a TOCTOU, but
    
    also it forces use of unveil "rx" instead of "x". This is done by using a
    pipe() through the fork+execve attempt to expose execve failure and create
    the same error return as the access() used to do. ok djm dtucker
    
    OpenBSD-Commit-ID: f9ee96e20352f35dc6f39127e0cc6b804700200a

commit 73888af650f0ce27cd93797f3e351b2d1b670550
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 10 14:43:30 2026 +1100

    stubs for OpenBSD unveil(2)

commit 4e15f7fc0c0ba897c227350eee1462d635ab32a6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 6 07:06:45 2026 +0000

    upstream: Move OpenBSD CVS ID marker to top of file to avoid conflicts
    
    when syncing changes to portable.
    
    OpenBSD-Regress-ID: 6b7a9ef354e13e26ed474e98d04ec1d74e56e54e

commit 2df416dff1a1d5fb31598b7ce8fb5cb6b0f64fd3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 6 06:57:33 2026 +0000

    upstream: Replace u_intXX_t types with the equivalent C99 uintXX_t
    
    types to match similar change to the main ssh code.
    
    OpenBSD-Regress-ID: a62b6499f784f75a4fcb865aebb83f5936917a91

commit e067ccd6b4306ca6422d94ff7ddd231cbddd43cb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Mar 5 05:44:15 2026 +0000

    upstream: ssh-agent supports a "query" extension that allows a
    
    client to request a list of extensions it support. This makes this capability
    available to ssh-add via the -Q flag.
    
    ok markus@
    
    OpenBSD-Commit-ID: f211630568ff1a7d6bb4983a94f05ddac1c2d4eb

commit 4fe278629c3f792628ea71132ba4fcbb9ceaa6b7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Mar 5 05:40:35 2026 +0000

    upstream: With IANA codepoints for draft-ietf-sshm-ssh-agent now
    
    allocated, it's safe to start using the standard names for requesting agent
    forwarding over the @openssh.com extension names we've used to date.
    
    Support for the standard names is advertised via EXT_INFO. When the
    client sees such support it will use the new names preferentially,
    but the existing names remain supported unconditionally.
    
    ok markus@
    
    OpenBSD-Commit-ID: 1ab4a0b4de01e81a432875c2b7e5f7357e231af3

commit 511f5bc41aeca7f6ee6611e9b24d48e4dd6ae3d5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Mar 5 05:35:44 2026 +0000

    upstream: correctness wrt draft-ietf-sshm-ssh-agent:
    
    extension requests should indicate failure using
    SSH_AGENT_EXTENSION_FAILURE rather than the generic SSH_AGENT_FAILURE
    error code. This allows the client to discern between "the request
    failed" and "the agent doesn't support this extension".
    
    ok markus@
    
    OpenBSD-Commit-ID: d15d89f210cc973271d68147f09550163df731c9

commit 2a387ba37452971747d2f00db7d4c18b4f2c45ed
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 3 09:57:25 2026 +0000

    upstream: Replace all remaining instances of u_intXX_t types with the
    
    C99 equivalent uintXX_t types.  ok djm@
    
    OpenBSD-Commit-ID: d9b81151266adb129574ce268af49f14ac23e65b

commit bb781f02d4efd178e329a62a838962bee16e3e9b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 2 02:40:15 2026 +0000

    upstream: Move banner exchange to sshd-auth process
    
    Previously, exchange of the initial SSH- banners was performed
    by the privileged sshd-session monitor. This moves it to the
    unprivileged sshd-auth subprocess, removing ~200 LoC from the
    monitor's privileged attack surface.
    
    The monitor gains a new "setcompat" RPC to allow sshd-auth to
    inform it of bug compat flags picked up from the client's banner.
    
    feedback dtucker@, ok markus@ deraadt@
    
    OpenBSD-Commit-ID: d767eb1183630d754d521d9f0d84a6c72fbe7fc8

commit b50b881b17ab15e34b5e57b159b65f2a02725798
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Mar 1 09:46:39 2026 +1100

    Try -lstdc++ for libcrypto before giving up.
    
    BoringSSL recently added destructors to libcrypto, which requires
    linking against libstdc++, so when checking for a working libcrypto if
    at first the link fails, try again with -lstdc++ before giving up.

commit c26d90e5ad05372b63dbb8727cb6c23a6505a2fb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Mar 1 09:41:39 2026 +1100

    Remove BoringSSL rpath as it's statically linked.

commit c65f4d2586416274e92720c9e1e745422e182488
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Feb 24 01:50:51 2026 +0000

    upstream: Use fmprintf instead of logit for challenge-response name and
    
    info to preserve UTF-8 characters where appropriate.  Prompted by github
    PR#452, with & ok djm@.
    
    OpenBSD-Commit-ID: e6361242329ec6925571478f60f4739726aad308

commit acf749756872d7555eca48514e5aca6962116fb2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 24 11:28:11 2026 -0500

    Add AWS-LC and BoringSSL as potential libcryptos.

commit c25254d1516df5e57affc0e391ed6ead8267b637
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 24 11:16:11 2026 -0500

    Add self-hosted status to main README now it's public.

commit 5da0ccec2b5806f104913465b62fea475b2e15bb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 24 11:10:16 2026 -0500

    Remove anchor to specific release notes version.

commit d7a9cd696a316c71e4c16f4158dc516b94abd863
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 23 21:34:48 2026 -0500

    Remove potentially leftover include compat shims.
    
    If we don't need a specific shim, ensure it does not exist.  Prevents
    confusion if configurations change or the directory is reused across
    different platforms.

commit c940e709ae2155a4614bc3709e393d88fdddabde
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 23 20:54:55 2026 -0500

    Check regress passwd is set before enabling kbdint.

commit 4ed5f9ecca9ed867c9f1040a3425af35f0703675
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Feb 24 00:39:59 2026 +0000

    upstream: Remove leftover debugging.
    
    OpenBSD-Regress-ID: e778d76b21696a14db80f31b9e79601f2d7a9abf

commit a07a53b00e9aeadb420336783d219be012d88ba1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 23 15:22:10 2026 -0500

    Activate kbdint test on PAM configs.

commit 5f98660c51e673f521e0216c7ed20205c4af10ed
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 18 12:39:31 2026 -0500

    Install libaudit-dev for --with-audit=linux test.

commit c9fcea8865b255d4b7566b28dce4af348d2bfbd6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 18 11:22:37 2026 -0500

    Enable BSM audit test on FreeBSD VMs.

commit f1a9628cd7e415ce14e157d80c10b61514a22d13
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 18 10:59:02 2026 -0500

    Move BSM audit test to selfhosted runner.
    
    The vmactions VM on Github does not have the required libraries
    installed.

commit 97e8e66219d036404ae656060f0e0179b61f0614
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 18 10:51:09 2026 -0500

    Increase riscv64 test coverage.
    
    The machine running the tests has been replaced with a faster one.

commit e5e18432a27b909aa2194ef0b28a5d49f0e6b3a6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 18 10:49:35 2026 -0500

    Whitespace fix.

commit b0463306174941274a1f96eb705618e036832920
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 18 09:48:55 2026 -0500

    Add test coverage for all of the --audit= configs.

commit 84206bde8adbef2dfe4f5b97dd23399827015333
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 18 03:04:12 2026 +0000

    upstream: same treatment for remote/remote copies (i.e. scp -3):
    
    adjust permissions on destination directory only if we created it or -p was
    requested. bz3925
    
    OpenBSD-Commit-ID: d977006df7b8330e06ceaa319383b347f1aca3ef

commit c3631567d9f77c2d073764e4b40f249687f4083e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 18 02:59:27 2026 +0000

    upstream: when uploading a directory using sftp/sftp (e.g. during a
    
    recursive transfer), don't clobber the remote directory permissions unless
    either we created the directory during the transfer or the -p flag was set.
    bz3925 ok dtucker@
    
    OpenBSD-Commit-ID: d66f40d01de05c9ec4029fab5413325301039b3a

commit 2b0f4a72bd87bef7cc9f0a1889cfc98545cbb158
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 17 21:45:07 2026 +0000

    upstream: make IPQoS first-match-wins in sshd_config as it's
    
    intended to be bz3924
    
    OpenBSD-Commit-ID: 42753eb8400ab09713c69ace6fa8bfdde133f942

commit 0e35095babe04ba1159e8029133e7f71e53d8fdb
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Mon Feb 16 23:47:06 2026 +0000

    upstream: remove duplicate includes; ok dtucker@
    
    OpenBSD-Commit-ID: 6b9191bc1a0f4320c926d5ccd9f36b09f0f3bcaf

commit 9eb778cfde5bca1d84bbad74d8664256301bb13b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 16 18:58:04 2026 -0500

    Restore utf8.h removed earlier as it's needed.
    
    ... for msetlocale prototype.

commit 723b76c8a358875cd53376c9a169887ba7a4b088
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 16 18:32:41 2026 -0500

    Removed duplicate includes; spotted by jsg@.

commit df2b28163ac75e023837de445d6492dc57359105
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 15 14:16:56 2026 -0500

    Remove "draining" of PAM prompts.
    
    With the previous commit, both prompts and info/error error messages are
    returned to keyboard-interactive immedately and none are accumulated, so
    there will never be any un-drained prompts.  ok djm@

commit b9a6dd4d66ee14577494d550b396d0452bf05e1e
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:   Tue Oct 17 04:27:32 2023 +0200

    auth-pam: Immediately report interactive instructions to clients
    
    SSH keyboard-interactive authentication method supports instructions but
    sshd didn't show them until an user prompt was requested.
    
    This is quite inconvenient for various PAM modules that need to notify
    an user without requiring for their explicit input.
    
    So, properly implement RFC4256 making instructions to be shown to users
    when they are requested from PAM.
    
    Closes: https://bugzilla.mindrot.org/show_bug.cgi?id=2876

commit a1158bba43e00240c00c530596de2d4e1d405b50
Author: Matthew Heller <hellermf@accre.vanderbilt.edu>
Date:   Mon Oct 14 09:25:41 2024 -0500

    fix duplicate PAM msgs, missing loginmsg reset
    
    without this change in mm_answer_pam_account all messages added in
    auth-pam.c sshpam_query(...) case PAM_SUCCESS end up sent here, then are
    still sitting in the loginmsg buffer and printed a second time in
    session.c do_login(...)

commit 7a59f55e621c841aab187c96e0f3271c5c799709
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 16 00:45:41 2026 +0000

    upstream: Reorder headers to match KNF and Portable.
    
    ID sync only.
    
    OpenBSD-Commit-ID: b7f9700d07b532eb3720f7bd722b952e31b1752f

commit c5cee49a0c5721532716365f32977fc02eeea1d5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 15 22:29:30 2026 +0000

    upstream: Add basic test for keyboard-interactive auth.
    
    Not enabled by default since it requires some setup on the host.
    
    OpenBSD-Regress-ID: aa8a9608a2ea2e5aaa094c5a5cc453e4797cd902

commit 07c6413e7bf08b7bfc6fd543eded9da68898e230
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Sat Feb 14 00:18:34 2026 +0000

    upstream: remove unneeded includes; ok dtucker@
    
    OpenBSD-Commit-ID: bba6e85492276c30c7a9d27dfd3c4c55fa033335

commit d8b806a2e6cd50c729e5d2bad569955a1df33f63
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 15 13:31:52 2026 -0500

    Remove obsolete comment referencing auth-chall.c.
    
    It was removed in commit 6cb6dcff along with the rest of the SSH1 server
    support.

commit 3e8a45e0eeb5c84f12ac04ea7cc2f831c91c263b
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:   Mon Oct 16 21:15:45 2023 +0200

    auth-pam: Add an enum to define the PAM done status
    
    Makes things more readable and easier to extend

commit 9b0e50b4132679f0c09c0f1272bf1c45959103ea
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:   Tue Oct 17 04:35:17 2023 +0200

    auth-pam: Add debugging information when we receive PAM messages

commit c2447697aaecae11d164f1ba30e06d14b5cabcdd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 13 15:34:44 2026 -0500

    Remove DragonFlyBSD workaround for sys/mount.h.
    
    ... since we're not not including it at all any more.

commit 8b3a0552054106feb036c632fc844f878568799f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 13 19:06:18 2026 +0000

    upstream: Replace <sys/mount.h> with <limits.h>
    
    The former is a portability hassle, but it turns out the only thing we
    need from it is PATH_MAX which we can get directly from limits.h.
    
    OpenBSD-Commit-ID: ccfbbd678bef3a3930ae89da456645c3ee5f83c0

commit db475199639667197b12b3aa5205de71ef102e23
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Fri Feb 13 01:04:47 2026 +0000

    upstream: remove unneeded forward struct declaration ok djm@
    
    OpenBSD-Commit-ID: a0c97e919667394bef8dbf31df72af3ba07542e9

commit ae51e05dbd840ad674fee754f33c0e2fd141074e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 11 22:58:23 2026 +0000

    upstream: very basic testing of multiple files in RevokedKeys and
    
    RevokedHostkeys
    
    OpenBSD-Regress-ID: 6cee76bcc4bd6840bc8d39dd0d32d724e1427aa7

commit 2f51e29b9a0ffd7acb9dc70d90defa466b5695d4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 11 22:57:55 2026 +0000

    upstream: support multiple files in a ssh_config RevokedHostKeys
    
    directive bz3918; ok dtucker
    
    OpenBSD-Commit-ID: 0ad2eacf836f912f347846ab84760799033dd348

commit 135a62238a479c7369f2b2d5dafb921ddc1c2b74
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 11 22:57:16 2026 +0000

    upstream: support multiple files in a sshd_config RevokedKeys
    
    directive bz3918; ok dtucker
    
    OpenBSD-Commit-ID: 9fc58c4e676f8e9ed2e3a0da666242a17b8a55b2

commit 3160f2a97e875bfa9454f98899cbccad48c96ff4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Feb 11 17:05:32 2026 +0000

    upstream: Add includes used in Portable to reduce diffs.
    
    OpenBSD-Commit-ID: 186c60cf2da0ddb075d5bc4879e87bbd8779b7e4

commit 6a756f3f7b9f87f24e948ec1de0266f5c1587811
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Feb 11 17:03:17 2026 +0000

    upstream: Remove unused sys/queue.h include.
    
    OpenBSD-Commit-ID: 564f75672e27f1006f280614934eb304abe69167

commit c169300df12b9aa7005ff6e61880a7e007e83bc5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Feb 11 17:01:34 2026 +0000

    upstream: Reorder includes and defines to match both KNF and
    
    Portable.
    
    OpenBSD-Commit-ID: f3f179c095f8e4787ded5f450e2842881f6b8ab2

commit 1a4eb511abaf3522b84fa5697524b81b4865279b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 11 17:36:42 2026 -0500

    Factor out RNG reseeding in to a single function.
    
    sshd and sshd-session both reseed the RNG after a fork.  Move the
    existing reseed_prngs() function into entropy.c and use for both.
    Clean up entropy.h too.  ok djm@

commit 81746188e9333b166b4c31f9654d8eb249ddd897
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 11 16:47:27 2026 -0500

    Remove do_pam_chauthtok since it's no longer used.

commit f1b9e0f7f1f1ed5be2bd1c39bda03fc99a1cf5d8
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Feb 11 16:57:38 2026 +0000

    upstream: Pass actual size of the buffer to hostname() instead of a
    
    define that's probably the same.  ok millert@ djm@
    
    OpenBSD-Commit-ID: 7c97b22439100b4193404ccfa1e5f539c5a8d039

commit 4ef24496b7c4c918d4d3a049f83739fbe2e36e9f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 9 22:15:45 2026 +0000

    upstream: De-underscore __inline__ to match -portable
    
    (and every other use of it in ssh).  ID sync only.
    
    OpenBSD-Commit-ID: 83c913d5e2345635bc5434167ed67cec5409d494

commit c8972792e5ce599e584bbe1aa084cc4056f1afe5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 9 22:12:48 2026 +0000

    upstream: Remove references to skey auth which is long gone.
    
    ID sync only.
    
    OpenBSD-Commit-ID: 0c2340566c399f7f74fe4c5366394974cd6fd122

commit db779679839d2798de7cda196a3fe750a12845e8
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 9 22:11:39 2026 +0000

    upstream: Remove unused OpenSSL includes,
    
    that are no longer used, even when building with OPENSSL=yes.
    
    OpenBSD-Commit-ID: e97e3e551ade9aee994b80a1d5851be6f32288e3

commit 8ec21f6274108e93601173ec4e6f7528b90b0003
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 9 22:09:48 2026 +0000

    upstream: Use https for URLs.
    
    ID sync only.
    
    OpenBSD-Commit-ID: 85b2919e95e6d2bfdeddf5e3b0709fb5b6b4c438

commit c3eaa953ae78e581d7ba2327beea35206a14bc1e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 9 21:38:14 2026 +0000

    upstream: Remove unused OpenSSL includes,
    
    which are no longer used even when building with OPENSSL=yes.
    
    OpenBSD-Commit-ID: 31adb21bf3f8f5c13cde59229f1b85c20f19a858

commit 280cf58afe71bf34141e732d30676367f0150bbe
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 9 21:23:35 2026 +0000

    upstream: Remove now-unused SKEYQUERY enums from monitor_reqtype.
    
    ID sync only.
    
    OpenBSD-Commit-ID: dab93b58e69c754887507e5557a81a0b5b84d734

commit bb2703365ede3b4e13fdfa1c250ac88408e75f38
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 9 21:21:39 2026 +0000

    upstream: Remove now-unused openssl includes since sshd.c no longer
    
    needs them, even when built with OpenSSL.
    
    OpenBSD-Commit-ID: ceaa0394db1520e92d75c37eea58130d44ba93c9

commit 8a5d591c9f42933c49ece95e49c116d684d6cca0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 11 11:38:58 2026 -0500

    Don't create sys/mount.h shim except on DragonFly.
    
    Fixes build on Mac OS X.

commit 957cb0fbe87b6ab76045e8dc99426db6afb54057
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 10 08:55:53 2026 +1100

    Minor resync with upstream
    
    Reorder definitions add whitespace to eliminate diffs vs upstream.

commit 4922635d3e66f9107c5b68a0a3fa57ddf0d820ae
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 10 07:22:30 2026 +1100

    Factor out COMPATINCLUDES into its own variable.

commit 3e9c4ed3b0e5d3890fcd2cbc9c3b595f17ea1946
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 10 05:34:46 2026 +1100

    Provide compat shims for sys/{mount.h,statvfs.h).
    
    In addition to shimming on platforms that don't have them, we also need to
    shim sys/mount.h on DragonFlyBSD since it uses its native STAILQ_ENTRYs
    which our compat queues.h does not have, which causes sftp-server.o to
    not build.  This is a little icky, but it limits the blast radius to
    just one source file on only DragonFly.  ok djm@

commit eeb671fa2f0fd7dda4c6b726098fe28016dc185b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 10 03:39:45 2026 +1100

    Shim <sys/queue.h> and <sys/tree.h>.
    
    This significantly reduces the diff vs upstream making future syncs
    less painful.  ok djm@

commit 47828dbd95c095d0cad327e12bb6859a510833c8
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 8 19:54:31 2026 +0000

    upstream: Reorder headers according to KNF,
    
    and pull in a few we don't have from Portable.
    
    OpenBSD-Commit-ID: d83f6c75da7bfb16bbff40fd2133d6eba4aba272

commit c73b8b09bf43be3dfe14bc0da349b352b280a74a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 8 17:51:43 2026 +0000

    upstream: Include sys/socket.h to match -portable,
    
    eliminating one diff.
    
    OpenBSD-Commit-ID: 7670fdf35b0c7aee41cd0d6ded86b4792e261f36

commit 9385d72dd36ba6050b5f7728c14e3edc8329fe95
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 8 17:50:49 2026 +0000

    upstream: Reorder headers as per KNF.
    
    OpenBSD-Commit-ID: 3e29fabe20422454fd5d77f85c853e1e557f2181

commit 62439369181b9b1dabf1ec3c2de6a7fbfcfb45eb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 9 06:56:35 2026 +1100

    Remove openindiana VM test.
    
    When it works it's by far the slowest (>1h to install packages) and the
    package installation is flaky.  We can bring it back if their infra ever
    improves.

commit 43d0bf02d84a20a3f7c9992dabf8c109d9c25bed
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 9 06:42:27 2026 +1100

    Sync header order with upstream and KNF.

commit a3742cc38a6aa48a653a1a6300bc825f083955af
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 9 06:41:07 2026 +1100

    Sync whitespace with upstream.

commit b62198a19a53227ca166c62825ac72a7696c42ed
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 9 05:02:36 2026 +1100

    Sync header order with upstream.

commit 98fdb05f0c0d7a89a066225a94eafd7fce10163d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 9 04:09:26 2026 +1100

    Remove generic check for getpagesize.
    
    We have a more specific check later.

commit 249476f45dba9a92056bd2935aae7429f0f3b17c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 9 03:47:25 2026 +1100

    Test KERBEROS5=yes builds on OpenBSD.

commit 6adb65508efc2def558f50a56c5eada09ca500c9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 8 15:28:01 2026 +0000

    upstream: Make ssh optionally build with Kerberos 5 against the
    
    Heimdal port. This updates the Makefiles and repairs some bitrot in headers,
    resyncing them against Portable.  To do this, "pkg_add heimdal" then "make
    KERBEROS5=yes".  ok djm@
    
    (ID sync only)
    
    OpenBSD-Commit-ID: 31f95c9ba58aa7ba89264f1d80c79106042b1095

commit d6c672a8c16c8962e6b3022e279441fa6630cb86
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 8 03:30:15 2026 +0000

    upstream: Remove sys/poll.h since we also have poll.h.
    
    Also removes one line of diff vs portable.
    (ID sync only).
    
    OpenBSD-Commit-ID: 461bd0cd35bfad82bd06892ccb0ff0fac15d1d27

commit 8605ed26334b9ae704b8abe51940b61bdfe1e974
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 8 00:16:34 2026 +0000

    upstream: Move setting of user, service and style earlier since
    
    -portable needs to use these when setting up PAM.  Removes two diffs vs
    portable.
    
    OpenBSD-Commit-ID: 8db130d42a3581b7a1eaed65917673d4474fc4fe

commit ecaaa4f9e44764e55c152a84af3d7efb63c50ce7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 8 11:30:21 2026 +1100

    Move USE_SYSTEM_GLOB into a glob.h compat shim.
    
    This moves the logic for selecting whether or not we can use the system
    glob into configure, and if either don't have glob or can't use it, we
    create the shim.  Removes several diffs vs upstream.

commit 2a1a257612b7c6bcacd934149146a3da7411c485
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Feb 7 18:04:53 2026 +0000

    upstream: misc.h is needed for ForwardOptions in servconf.h.
    
    OpenBSD-Commit-ID: b241d81c499e273fc2d81c82d5b7c7b280827416

commit ad632364fb06f3bd1e9177e587d0040cf7958676
Author: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date:   Sat Nov 2 22:30:07 2024 +0100

    Remove unused <netinet/in_systm.h> includes.
    
    netinet/in_systm.h is no longer in upstream and anything that actually
    needs it will get it from includes.h.

commit 9ebce88be9d88605e02551fe7f65ef6a16f72667
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Feb 7 17:10:34 2026 +0000

    upstream: Also check for EWOULDBLOCK on system error. This is the
    
    same as EAGAIN on OpenBSD so is a no-op but removes a diff making portable
    syncs easier.  (ID sync only).
    
    OpenBSD-Commit-ID: 68a5dcc5e2a506208c40396c6366f67bbf3b1dbe

commit ccc1faf67df795d5cd757df754703823d0874028
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Feb 7 17:04:22 2026 +0000

    upstream: Move ssherr.h to where portable needs it.
    
    (ID sync only)
    
    OpenBSD-Commit-ID: 0488ce85f24864186678dcac7c9973ca44bd2cd5

commit 6decbb90413c67c10ac2fd5b17a9c161196641ea
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 8 04:30:40 2026 +1100

    Move paths.h and poll.h includes to resync with upstream.

commit 4fe79e3deb5457af588ab67ee5db642afedd935f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 8 04:28:28 2026 +1100

    Move poll.h include to resync with upstream.

commit 9e585f11bb71115fb0376b2b6118892ab600aa4f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 8 04:25:42 2026 +1100

    Resync minor format diffs with upstream.

commit 3fd88caa36a94d85ae66bff297142606d08decde
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 8 03:56:15 2026 +1100

    Resync headers with upstream.

commit 77e41d0c1c8801c553b43eef5974268425395667
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 8 03:52:31 2026 +1100

    Resync with upstream (unused header and whitespace).

commit a393759f9693a08a7fba18d4824b74f2dda1fe3d
Author: Artem Savkov <artem.savkov@gmail.com>
Date:   Tue Nov 18 16:26:11 2025 +0100

    Fix ut_type for btmp records
    
    According to man utmp ut_type is supposed to be only switched from
    LOGIN_PROCESS to USER_PROCESS after succesfull authentication and this
    is how sshd behaved before 671c44078.
    
    Fixes: 671c44078 ("use construct_utmp to construct btmp records")
    Signed-off-by: Artem Savkov <artem.savkov@gmail.com>

commit 15fe1ceb29760d72398c6ac7df5a403416cba207
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 7 02:02:00 2026 +0000

    upstream: bit of webauthn support missed in previous commit
    
    OpenBSD-Commit-ID: 9768454543ded01b7c61567fc5b3e78664346be2

commit 670f7d210ceae59db73b16b67e52d8fd8def3012
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 6 23:39:14 2026 +0000

    upstream: Adjust Makefiles to include just-added
    
    ssherr_libcrypto where necessary.
    
    OpenBSD-Regress-ID: 53d179a2db3ab931f2aa0e5447cf20cb9787a8bb

commit 9c4949c11d8da1a5422e2174afb1a4f5b3dc8914
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 6 23:31:29 2026 +0000

    upstream: Fetch the error reason from libcrypto
    
    if available, append it to the corresponding ssh error message and
    optionall print the libcrypto full error stack (at debug1).  with &
    ok tb@ djm@ millert@ schwarze@
    
    Note that the quality of errors obtainable from libcrypto is somewhat
    variable, so these may be any of: useful, misleading, incomplete
    or missing entirely. As a result we reserve the right to change
    what is returned or even stop returning it if it does more harm than
    good.
    
    OpenBSD-Commit-ID: 1ad599ac3eeddbe254fec6b9c1cf658fa70d572e

commit 5b12d836e7c42c146ac1a69a9600db05282dbbb8
Author: THE-Spellchecker <The.Spellchecker@outlook.com>
Date:   Sat Jan 3 22:11:39 2026 -0600

    Typographical Fixes

commit 11600929832e04aa6ad20a57af7187c3feb973d4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 6 22:59:18 2026 +0000

    upstream: Typo fixes, mostly in comments.
    
    From THE-Spellchecker via github PR#620.
    
    OpenBSD-Commit-ID: 64929fafa3caae5a162f23257917ecf33f8a3764

commit b83c0bb5109eb245dd4f06e4af4a960f96a0c193
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 7 06:58:59 2026 +1100

    Enable gss-auth tests on Kerberos test configs.

commit d84dbccee4371ce395d28543f146e7b62d8c0d36
Author: Pavol Žáčik <zacik.pa@gmail.com>
Date:   Thu Jan 29 11:01:19 2026 +0100

    Add a GSSAPI authentication test

commit 86e0f4aa2c72d5e96618f0c7214109f5a46ca70d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 1 21:41:10 2026 +1100

    Split sudo out to its own install line.

commit dfbb8526b5006cfe368193fb15e16f58cce6e1d1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Dec 31 16:35:29 2025 +1100

    Remove obsolete comments.

commit f0b7ecf7f5976c11f8c89ee9b0ca19383b573764
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Dec 31 16:26:23 2025 +1100

    Run tests on older OmniOS version too.

commit 01bddc0663e5239df9342fcf7b373e5f58ff1b49
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Dec 31 16:25:16 2025 +1100

    Add OpenIndiana VM test target.

commit 91c4d422cc0af2ae592f5e6c0cc505a5d8d7a6d2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 6 01:24:36 2026 +0000

    upstream: remove vestige of when we supported running without privsep
    
    OpenBSD-Commit-ID: 5342c24d2330ef5ce357c294056f72b8123122c0

commit 6463960c58cd0adcb26bfbddceb9d4efcfbd9dd0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 5 22:05:49 2026 +0000

    upstream: Implement missing pieces of FIDO/webauthn signature support,
    
    mostly related to certificate handling and enable acceptance of this
    signature format by default.  bz3748 GHPR624 GHPR625
    
    Feedback tb / James Zhang; ok tb
    
    OpenBSD-Commit-ID: ce3327b508086b24a3f7a6507aa5c49d8e9505e6

commit 832a77000abe61f61bddb9e595f45c7131c0269d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 27 06:48:29 2026 +0000

    upstream: Implement "query" extension from
    
    draft-ietf-sshm-ssh-agent
    
    feedback jsg@, tb@; ok tb@
    
    OpenBSD-Commit-ID: adb2b79473ff86ba781ed5ab2735c1437b590f07

commit 409dc952ab88b5232e809e34fd55662c6f75ad81
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Thu Jan 22 15:30:07 2026 +0000

    upstream: Make it clear that DenyUsers/DenyGroups overrides
    
    AllowUsers/AllowGroups. Previously we specified the order in which the
    directives are processed but it was ambiguous as to what happened if both
    matched. OK djm@
    
    OpenBSD-Commit-ID: 6ae0ab52ff796b78486b92a45cd7ec9310e20f4e

commit d7950aca8eacae8b889d92c669e913111af75984
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 21 23:58:20 2026 +0000

    upstream: In ssh(1), don't try to match certificates held in an
    
    agent to private keys.
    
    This matching is done to support certificates that were
    loaded without their private key material, but is unnecessary for
    agent-hosted certificate which always have private key material
    loaded in the agent. Worse, this matching would mess up the
    request sent to the agent in such a way as to break usage of these
    keys when the key usage was restricted in the agent.
    
    Patch from Thibault Cools via bz3752, ok dtucker@
    
    OpenBSD-Commit-ID: ebfe37817dad4841c53339930565242ec683d726

commit b0d0b71651b5a19d0dbd27b623ebb4fc43145560
Author: sthen@openbsd.org <sthen@openbsd.org>
Date:   Wed Jan 21 15:44:51 2026 +0000

    upstream: If editline has been switched to vi mode (i.e. via "bind
    
    -v" in .editrc), setup a keybinding so that command mode can be entered. Diff
    originally from Walter Alejandro Iglesias with tweaks. Feedback from Crystal
    Kolipe. ok djm
    
    OpenBSD-Commit-ID: 5786e17ccd83573e2d86418023f9bc768223336a

commit 1cc936b2fabffeac7fff14ca1070d7d7a317ab7b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jan 20 22:56:11 2026 +0000

    upstream: Fill entropy in a single operation instead of hundreds.
    
    The sntrup761 code we use from SUPERCOP fills entropy arrays 4 bytes at
    a time.  On some platforms each of these operations has a significant
    overhead, so instead fill it in a single operation and as a precaution
    zero that array after it's used.
    
    Analysis and code change is from Mike Frysinger via Github PR#621 with
    feedback from djm@ and sed-ification from me.  ok djm@ beck@.
    
    This change was submitted by Mike to SUPERCOP upstream so hopefully
    future versions will already have it.
    
    OpenBSD-Commit-ID: 0e85c82f79b1b396facac59e05b288c08048f15c

commit a6f8f793d427a831be1b350741faa4f34066d55f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 4 09:52:58 2026 +0000

    upstream: rewrite SOCKS4/4A/5 parsing code to use sshbuf functions
    
    instead of manual pointer fiddling. Should make the code safer and easier to
    read. feedback/ok markus@
    
    OpenBSD-Commit-ID: 5ebd841fbd78d8395774f002a19c1ddcf91ad047

commit ea367b4bbc3fd49f84683763723425adfdce35c0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 30 04:28:42 2025 +0000

    upstream: test the right thing, doofus
    
    OpenBSD-Commit-ID: 31b2ec6e0b3dbd08c60ba2d969dd687cd80c25fd

commit 5f2bc9cb8625d1fd582e0e4b562200f9856f1f7d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 30 04:23:53 2025 +0000

    upstream: avoid possible NULL deref if
    
    ssh_packet_check_rekey_blocklimit() called before the encrypted transport is
    brought up.
    
    OpenBSD-Commit-ID: fb998ccbe59865e33a8ab6a6577f254d39bdc72f

commit b9c318777eb40db66fb92df87666c3642467d0e7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 30 00:12:58 2025 +0000

    upstream: unit tests for sshbuf_consume_upto_child()
    
    OpenBSD-Regress-ID: 13cbd0370ebca7c61c35346b3e0356517719a447

commit dd49a87bf4e4a219978bf20f03e2a72041f57b2f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 30 00:35:37 2025 +0000

    upstream: Remove bug compatibility for implementations that don't
    
    support rekeying. AFAIK this is only an ancient Sun SSH version.
    
    If such an implementation tries to interoperate with OpenSSH, it
    will eventually fail when the transport needs rekeying.
    
    This is probably long enough to use it to download a modern SSH
    implementation that lacks this problem :)
    
    ok markus@ deraadt@
    
    OpenBSD-Commit-ID: 228a502fee808cf8b7caee23169eb6a1ab1c331a

commit ca313fef2deed90668fe0706da8529310092d1dd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 30 00:22:58 2025 +0000

    upstream: Enforce maximum packet/block limit during
    
    pre-authentication phase
    
    OpenSSH doesn't support rekeying before authentication completes to
    minimise pre-auth attack surface.
    
    Given LoginGraceTime, MaxAuthTries and strict KEX, it would be
    difficult to send enough data or packets before authentication
    completes to reach a point where rekeying is required, but we'd
    prefer it to be completely impossible.
    
    So this applies the default volume/packet rekeying limits to the
    pre-auth phase. If these limits are exceeded the connection will
    simply be closed.
    
    ok dtucker markus
    
    OpenBSD-Commit-ID: 70415098db739058006e4ebd1630b6bae8cc8bf6

commit 55b6b1697433eca98052f5c45281133ca793a9c8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 29 23:52:09 2025 +0000

    upstream: Add sshbuf_consume_upto_child(), to similify particular
    
    parsing patterns using parent/child buffer; ok markus@
    
    OpenBSD-Commit-ID: c11ed27907751f2a16c1283313e77f88617e4852

commit 6eafc52a4185ba6d765047146cd645152baaeb58
Author: Ludovic Rousseau <ludovic.rousseau+github@gmail.com>
Date:   Sat Dec 27 10:07:22 2025 +0100

    Update ssh-agent.1
    
    Add a missing "/" in the default allowed providers list.

commit 09daf2ac5f248dc5d60a6f3a703b479d67da14b4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 03:36:43 2025 +0000

    upstream: correctly quote wildcard host certificate principal name,
    
    lest it expand to an unrelated filename in the working directory
    
    OpenBSD-Regress-ID: 8a9eb716d3ea7986d26c1a931758b996aa93c58e

commit dfd710e4e2928201743e32027e2d6cf0e2eafc61
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 03:12:05 2025 +0000

    upstream: return 0 in void function; spotted by clang -Wextra
    
    OpenBSD-Commit-ID: fe7461c93dfaef98a007a246af837a8275a1e539

commit ecdf9b9f8e89aae65d4a12fe5a25c560eea08393
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 01:50:46 2025 +0000

    upstream: regression tests for certificates with empty principals
    
    sections (which are now unconditionally refused) and for certificates with
    wildcard principals (which should only be accepted in host certs)
    
    OpenBSD-Regress-ID: fdca88845a68424060547b4f9f32f90a7cf82e73

commit adca2f439827eb829652805f36e288b5b260ce1b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 01:31:07 2025 +0000

    upstream: don't try to test webauthn signatures. Nothing in OpenSSH
    
    generates these (yet)
    
    OpenBSD-Regress-ID: 48d59b7c4768c2a22ce3d8cf3b455e6ada9fc7b0

commit 5166b6cbf2b6103117a79f90a68068e89e02bf66
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 01:49:03 2025 +0000

    upstream: When certificate support was added to OpenSSH,
    
    certificates were originally specified to represent any principal if the
    principals list was empty.
    
    This was, in retrospect, a mistake as it created a fail-open
    situation if a CA could be convinced to accidentally sign a
    certificate with no principals. This actually happened in a 3rd-
    party CA product (CVE-2024-7594).
    
    Somewhat fortunately, the main pathway for using certificates in
    sshd (TrustedUserCAKeys) never supported empty-principals
    certificates, so the blast radius of such mistakes was
    substantially reduced.
    
    This change removes this footcannon and requires all certificates
    include principals sections. It also fixes interpretation of
    wildcard principals, and properly enables them for host
    certificates only.
    
    This is a behaviour change that will permanently break uses of
    certificates with empty principals sections.
    
    ok markus@
    
    OpenBSD-Commit-ID: 0a901f03c567c100724a492cf91e02939904712e

commit aaac8c61c18124eb5fb8a2cff1e85dea2db6c147
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 01:20:39 2025 +0000

    upstream: Don't misuse the sftp limits extension's open-handles
    
    field. This value is supposed to be the number of handles a server will allow
    to be opened and not a number of outstanding read/write requests that can be
    sent during an upload/download.
    
    ok markus@
    
    OpenBSD-Commit-ID: 14ebb6690acbd488e748ce8ce3302bd7e1e8a5b0

commit daf6bdd34b59f640d2af0fd230da69f1cbad33b4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 01:17:31 2025 +0000

    upstream: add a "ssh -O channels user@host" multiplexing command to
    
    get a running mux process to show information about what channels are
    currently open; ok dtucker@ markus@
    
    OpenBSD-Commit-ID: 80bb3953b306a50839f9a4bc5679faebc32e5bb8

commit b652322cdc5e94f059b37a8fb87e44ccb1cdff33
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 19 01:27:19 2025 +0000

    upstream: typo in comment
    
    OpenBSD-Commit-ID: f72306b86953e74f358096db141b4f9c00d33ed7

commit 0b98be75dbb2ccb1c3146429c0077416c113b57d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 19 01:26:39 2025 +0000

    upstream: correctly check subsystem command is not the empty string
    
    (was repeatedly checking the subsystem name) spotted by Coverity (CID 898836)
    
    OpenBSD-Commit-ID: dabea2b499de8280f76f7291dd52086df6831cb0

commit 345892ba2e8efea4be03675c866395bee251c117
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 19 00:57:42 2025 +0000

    upstream: regression test for bz3906: sshd crashing at connection
    
    time if the config lacks a subsystem directive but one is defined in a match
    block.
    
    OpenBSD-Regress-ID: 5290553665307ccddaec2499ec1eb196bb2efc84

commit 81e5bb8d93f2d8361bd7f4b034044ad8ee4ded0e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 19 00:48:47 2025 +0000

    upstream: check that invalid subsystem directives inside Match
    
    blocks are noticed at startup; bz#3906
    
    OpenBSD-Regress-ID: b9171bde4cc24757a826b3da0e9eadc33995a453

commit 831e6db69ff8625b6e81c2809aa082abbab6c0b1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 19 00:56:34 2025 +0000

    upstream: don't crash at connection time if the main sshd_config
    
    lacks any subsystem directive but one is defined in a Match block
    
    bz#3906; ok dtucker
    
    OpenBSD-Commit-ID: 2eb9024726d6f10eaa41958faeca9c9ba5ca7d8a

commit 4e0f2dee54d210dc44f72f73e703c6dc5348a406
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 19 00:48:04 2025 +0000

    upstream: detect invalid sshd_config Subsystem directives inside
    
    Match blocks at startup rather than failing later at runtime;
    
    noticed via bz#3906; ok dtucker
    
    OpenBSD-Commit-ID: e6035ff0baa375de6c9f22c883ed530a8649dfed

commit 4c9de155ce1d35c9e3c05223cc093580f9efff9a
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Thu Dec 18 23:54:10 2025 +0000

    upstream: new sentence, new line
    
    OpenBSD-Commit-ID: 23974d7c98b2ba4fea7f5143676c34e04ffd4128

commit 3ab346aa6d9030379df3ec1ed0b0ce608f952c5f
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Thu Dec 18 23:51:56 2025 +0000

    upstream: fix markup, .CM -> .Cm
    
    OpenBSD-Commit-ID: 4db8cb254792df8a4dce11825852e089ae3d053a

commit f878d7ccc25b02a39e6766f5dd405d5de6fb106c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Dec 16 08:36:43 2025 +0000

    upstream: Plug leak in ssh_digest_memory on error path.
    
    Bonehead mistake spotted by otto@, ok djm@
    
    OpenBSD-Commit-ID: 4ad67ac402e0b4c013f4f4e386d22b88969a5dd7

commit 49480f1934f8cf994afa646d4bcbd22ac08bb6af
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Dec 16 08:32:50 2025 +0000

    upstream: Add 'invaliduser' penalty to PerSourcePenalties, which is
    
    applied to login attempts for usernames that do not match real accounts.
    Defaults to 5s to match 'authfail' but allows administrators to block such
    sources for longer if desired.  with & ok djm@
    
    OpenBSD-Commit-ID: bb62797bcf2adceb96f608ce86d0bb042aff5834

commit 94bf1154b4132727114f222a587daeac101f1f5b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 8 03:55:22 2025 +0000

    upstream: add a GssDelegateCreds option for the server, controlling
    
    whether it accepts delgated credentials offered by the client. This option
    mirrors GssDelegateCreds in ssh_config.
    
    From Dmitry Belyavskiy via GHPR614; ok dtucker@
    
    OpenBSD-Commit-ID: ac419354edb26cef9ad15692e0bed17a03997786

commit 24f32f7755801b16368375b8e27fb1a48d250fc5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 8 00:45:00 2025 +0000

    upstream: errant line
    
    OpenBSD-Commit-ID: 8542d59f5ba48a67c3ebd5de17f9fa408ec54ca5

commit a1e37f0998ed5027f6c8dd30befb379ea2cac95b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 8 00:44:16 2025 +0000

    upstream: There is a warning next to the authorized_keys command=""
    
    flag that forcing a command doesn't automatically disable forwarding. Add one
    next to the sshd_config(5) ForceCommand directive too.
    
    feedback deraadt@
    
    OpenBSD-Commit-ID: bfe38b4d3cfbadbb8bafe38bc256f5a17a0ee75c

commit 70ad2e9a2b3aa6f856200464078c2750bfba0e3d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 8 00:41:46 2025 +0000

    upstream: increment correct variable when counting group
    
    memberships. Reported by Kevin Day via bz3903
    
    OpenBSD-Commit-ID: 772b9aafd5165a7c407f08cb95f8b94cc5a4c1c0

commit d05b704086d53c02f4ad7de921435f7e7e3ad60a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Dec 7 20:10:42 2025 +1100

    Add OpenBSD 7.8 VM test target.

commit f086fafa0486012df6ba095664be75ecbf68e8e1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Dec 7 13:43:02 2025 +1100

    Remove generated compat includes during distclean.

commit 185459dd87c4f7580a2591fbbbb1d800ec249b78
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Dec 7 14:17:20 2025 +1100

    Define IPTOS_DSCP_VA if not already defined.

commit f701869185915b9a324dcc23c12d0035251ef93f
Author: phessler@openbsd.org <phessler@openbsd.org>
Date:   Fri Dec 5 17:48:47 2025 +0000

    upstream: allow network programs select DSCP_VA for network ToS
    
    OK stsp@
    
    OpenBSD-Commit-ID: 8019fd6e8c522b4b5f291a2c0e3bf2437cc70dc1

commit f62868e03e51785c521c4d20d60662c0bbdd695e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Dec 7 02:59:53 2025 +0000

    upstream: Avoid "if ! thing || ! otherthing; then" constructs since
    
    they seem to cause portability problems.
    
    OpenBSD-Regress-ID: ff001be683de43bf396cd5f9f6a54e0c7a99c3cf

commit 45aca67d79c194660342a64a9175d814d4e8ba56
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Dec 7 02:49:41 2025 +0000

    upstream: spaces->tab
    
    OpenBSD-Regress-ID: c78eb430da0ec2c4b6919ff4d27ef8e565ef52ff

commit ab164f671609a3a25cd0efcd967aff29144081bb
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Dec 6 07:10:24 2025 +0000

    upstream: Append a newline, otherwise some sed's won't output anything.
    
    OpenBSD-Regress-ID: 507cb8c36bb7fc338f60a55bf7040f479536b3f7

commit c99a30d30a5d2af6fec30b9b0d85aa9b252760c9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Dec 6 03:23:27 2025 +0000

    upstream: Don't check compressions stats when ssh does not support
    
    compression.
    
    OpenBSD-Regress-ID: 026db51b2654a949e9a10b908443dab83b64c74a

commit 5f5d1af478d4b9daf61fab1e4298973980d4c348
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 5 11:13:35 2025 +0000

    upstream: ASSERT_DOUBLE_* test helpers
    
    OpenBSD-Regress-ID: cdb5c4e95c0f00efb773ddba4056a49e33702cf9

commit 70a01a7e66075047329e3aeccc942678f512ebdd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Dec 5 20:02:39 2025 +1100

    Set SSH_REGRESS_TMP after making tmpdir.
    
    Put both of these later in the script so the cvsids don't cause
    conflicts on every synced patch.

commit 89a67a04e581423cdc443f2597cb1e2c7d8cc50f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 5 08:09:34 2025 +0000

    upstream: Shell compatibility fix.
    
    OpenBSD-Regress-ID: bceaeb267d49c13e4a797c42e93b8f0cdb14dbd7

commit f4e79a4ba91cf0fd7397846424d1b261f3648708
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 5 07:43:24 2025 +0000

    upstream: unit tests for convtime_double()
    
    OpenBSD-Regress-ID: d3ba7b894019b4128845d638c78fca37b3b6eecf

commit c48de35bea389308428cb47b5ee55b1b1fb4567c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 5 07:49:45 2025 +0000

    upstream: convert PerSourcePenalties to using floating point time,
    
    allowing penalties to be less than a second. This is useful if you need to
    penalise things you expect to occur at >=1 QPS.
    
    feedback dtucker / deraadt; ok deraadt@
    
    OpenBSD-Commit-ID: 89198be755722131b45a52d22d548e4c602201f0

commit f45cd249e45a15c84bf1316ac719039d04a74e84
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 5 07:43:12 2025 +0000

    upstream: Add convtime_double() that converts a string interval,
    
    such as "3w2d4h5m10.5s", into a floating point number of seconds.
    
    Reimplement the existing convtime() function using convtime_double()
    (it just drops the fractional seconds)
    
    lots of feedback deraadt@ / dtucker@; ok deraadt@
    
    OpenBSD-Commit-ID: 053cdd0c72325a20efc6613caa847473fb89e36f

commit b7dc1d95ee838c86a93df59663dad32e9b555520
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 5 06:55:22 2025 +0000

    upstream: Add test for ssh -Oconninfo mux command.
    
    OpenBSD-Regress-ID: e939edc41caad8b6ad00ff294f33b61ed32a1edd

commit eb97fc2b5e7c85a37fdb3f8a6ee1d665ef086c3f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 5 06:16:27 2025 +0000

    upstream: Add an ssh -Oconninfo command
    
    that shows connection information, similar to the ~I escapechar.
    This is the first use of the mux extension mechanism, so it should be
    both forward and backward compatible: a new client talking to an old
    server will not allow the "conninfo" request to be sent, but everything
    else should work seamlessly.  feedback and ok djm@
    
    OpenBSD-Commit-ID: 50f047a85da277360558cabdfed59cb66f754341

commit 66622394fd3a51e9a6c99c39a068f8ba709542fa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Dec 3 06:29:50 2025 +0000

    upstream: correctly quote filenames in verbose output for local->local
    
    copies; from Colin Watson via bz3900; ok dtucker@
    
    OpenBSD-Commit-ID: 5c09b030e2024651ebc8c1f9af6a8a2d37912150

commit 8fce5520a1c9c2cf3fc6c6974dd158f4b3ce9c4e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Nov 29 06:49:56 2025 +0000

    upstream: Add local hostname and pid to ~I escape connection info,
    
    only display peer information for TCP connections including source address
    and port This provides enough information to uniquely identify a connection
    on the host or network.
    
    OpenBSD-Commit-ID: aa18a4af2de41c298d1195d2566808585f8ce964

commit 2e8b5de4a79fb393482465531be1e347b81699f3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Nov 29 05:00:50 2025 +0000

    upstream: Add compression stats to ~I connection info escape
    
    option.
    
    OpenBSD-Commit-ID: 83424b71fc226ea6b3dc8dda39f993475fdbd775

commit 52037ed910a9dcb669b9c9f612ccac711ac586f2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Nov 27 02:18:48 2025 +0000

    upstream: Add Escape option ~I that shows information about the current
    
    SSH connection. ok djm@, "I like/want" sthen@ florian@
    
    OpenBSD-Commit-ID: 0483fc0188ec899077e4bc8e1e353f7dfa9f5c1d

commit 0fb1f3c9955d78fb0959842202b9ecfc36e37486
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 25 01:14:33 2025 +0000

    upstream: move mention of default MaxStartups (which uses the
    
    form.
    
    GHPR568 from Santiago Vila
    
    OpenBSD-Commit-ID: 7e68771f3cad61ec67303607afb3b85639288b29

commit 2d0d26602f739b4a3ddde6c4dbc8f3ddab38ac0d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 25 01:08:35 2025 +0000

    upstream: Support writing ED25519 keys in PKCS8 format. GHPR570 from
    
    Josh Brobst
    
    OpenBSD-Commit-ID: 4f36019a38074b2929335fbe9cb8d9801e3177af

commit c23122c5ea7348b7b6daa2982e53c201a5354007
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 25 00:57:04 2025 +0000

    upstream: avoid leak of fingerprint on error path; from Lidong Yan via
    
    GHPR611
    
    OpenBSD-Commit-ID: 253f6f7d729d8636da23ac9925b60b494e85a810

commit 6157e1c41071fb0f5621868c38861934284268b1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 25 00:52:00 2025 +0000

    upstream: don't set the PerSourceNetBlockSize IPv6 mask if sscanf
    
    didn't decode it. From Mingjie Shen via GHPR598
    
    OpenBSD-Commit-ID: c722014e735cbd87adb2fa968ce4c47b43cf98b0

commit 1fdc3c61194819c16063dc430eeb84b81bf42dcf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 24 23:56:58 2025 +0000

    upstream: give ssh-agent more time to start in tests; requested in
    
    GHPR602
    
    OpenBSD-Regress-ID: 7d771db2c1d4a422e83c3f632ba1e96f72a262b8

commit 5e7c3f33b2693b668ecfbac84b85f2c0c84410c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 24 23:54:15 2025 +0000

    upstream: When testing PKCS11, explicitly allow the module path in
    
    ssh-agent.
    
    Allows testing of PKCS11 modules outside system directories.
    
    From Morgan Jones via GHPR602
    
    OpenBSD-Regress-ID: 548d6e0362a8d9f7d1cc01444b697a00811ff488

commit 69965aefe3355488e0462291be13a233b8405091
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 24 23:43:10 2025 +0000

    upstream: When loading FIDO2 resident keys, set the comment to the
    
    FIDO application string. This matches the behaviour of ssh-keygen -K
    
    From Arian van Putten via GHPR608
    
    OpenBSD-Commit-ID: 3fda54b44ed6a8a6f94cd3e39e69c1e672095712

commit 2238c48dc90dc56af1d86b298d2cb25fa0c7ef14
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Sun Nov 23 07:04:18 2025 +0000

    upstream: pkcs11_fetch_ecdsa_pubkey: use ASN1_STRING accessors
    
    In anticipation of davidben and beck making ASN1_STRING opaque in
    OpenSSL 4 with the aim of enabling surgery to make the X509 data
    structure less bad [1], we need to use dumb accessors to avoid build
    breakage. Fortunately only in one spot.
    
    This is OpenSSL 1.1 API and available in all members of the fork family.
    
    ok beck djm
    
    [1]: https://github.com/openssl/openssl/issues/29117
    
    OpenBSD-Commit-ID: 0bcaf691d20624ef43f3515c983cd5aa69547d4f

commit 643222df689c95efff9e9506b76de458f69dd9c7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 21 14:28:20 2025 +1100

    Update OSSFuzz link to current bug tracker.

commit 2efdfbb4d78b9bbb73f55af150e8f985d4fe4c0f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 21 14:21:07 2025 +1100

    Add VM CI and CIFuzz status badges.

commit 71e8779113965d60d91ba2d15cdeeb43ecf230a7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 21 01:29:27 2025 +0000

    upstream: unit tests for sshbuf_get_nulterminated_string()
    
    OpenBSD-Regress-ID: cb0af1e4d6dcc94e263942bc4dcf5f4466d1f086

commit dec6334aaf6f542f34a0aca27dc2f535e9161a67
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 21 01:29:06 2025 +0000

    upstream: add a sshbuf_get_nulterminated_string() function to pull a
    
    \0- terminated string from a sshbuf. Intended to be used to improve parsing
    of SOCKS headers for dynamic forwarding.
    
    ok deraadt; feedback Tim van der Molen
    
    OpenBSD-Commit-ID: cf93d6db4730f7518d5269c279e16b172b484b36

commit a8718c3fc52511e5237f1cbe10c210948c5616ea
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Nov 20 05:07:57 2025 +0000

    upstream: Free opts in FAIL_TEST. It should always be NULL anyway so
    
    this is a no-op, but it should placate Coverity CID 405064.
    
    OpenBSD-Regress-ID: 06789754de0741f26432c668fad8b9881c14c153

commit d68d528fefeca1e331696296ef5db7c4db246f9a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Nov 20 05:10:56 2025 +0000

    upstream: Plug leaks while parsing Match blocks. Coverity CID
    
    469304, ok djm@
    
    OpenBSD-Commit-ID: f9b79b86879a953ad034e6b92a398265b251bea7

commit e3f1fbb427df898d70083b42caab72baaa715400
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Nov 20 05:10:11 2025 +0000

    upstream: Plug leaks while parsing Match blocks. Coverity CID
    
    515634, ok miod@ djm@
    
    OpenBSD-Commit-ID: c7932eddecd47e5122e945246a40c56ffa42a546

commit ccad76e9e1e4f06889ee023893cea98bc165858b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Nov 18 20:14:44 2025 +1100

    Pull in rev 1.17 for spelling fix.
    
    Prompted by github PR#609 from Edge-Seven.

commit 58533bbdf7aa0548de8e2abd3cb2de0593fa9fdc
Author: jca@openbsd.org <jca@openbsd.org>
Date:   Mon Nov 17 12:59:29 2025 +0000

    upstream: Export XDG_RUNTIME_DIR to child ssh sessions
    
    Currently setusercontext(LOGIN_SETALL) does create the directory in
    /tmp/run/user, since LOGIN_SETXDGENV is part of LOGIN_SETALL, but the
    env variable wasn't exported.
    
    ok djm@
    
    OpenBSD-Commit-ID: 02b8433f72759b3a07b55cbc5a7cdb84391b0017

commit e4cc5ab0efd85f01c0e1ae46825ffc0c7a8f44ce
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 17 05:24:42 2025 +0000

    upstream: don't strnvis() log messages that are going to be logged
    
    by sshd-auth via its parent sshd-session process, as the parent will also run
    them though strnvis().
    
    Prevents double-escaping of non-printing characters in some log
    messages. bz3896 ok dtucker@
    
    OpenBSD-Commit-ID: d78faad96a98af5269d66ddceee553cf7d396dfe

commit bad220decb95d3b5cc6e30f843c4fc9d9b0b7a67
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 17 21:36:45 2025 +1100

    Remove obsolete CVSID.

commit 2fe6e406b496b54351dab923f9be95579d39d071
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Nov 17 09:59:13 2025 +0000

    upstream: Ensure both sides of the test are non-NULL instead of just
    
    either. Coverity CID 443285.
    
    OpenBSD-Regress-ID: aa90e57b1bc8efce9e50734a07a8ffec0680059a

commit e2b93e16232834c61c9dcff5b20e4c55a26b324d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 13 23:30:48 2025 +1100

    Move libcrypto init check into entropy.c.
    
    This prevents link errors with the openbsd-compat tests when the linker
    tries to bring in all the logging bits.

commit ec41739bd68d639b0847b366697706e7dab3498d
Author: Icenowy Zheng <uwu@icenowy.me>
Date:   Fri Nov 7 14:27:35 2025 +0800

    seccomp sandbox: allow uname(3)
    
    The uname(3) syscall is utilized by zlib-ng on RISC-V to decide whether
    the kernel handles VILL bit of V extension properly (by checking the
    kernel version against 6.5).
    
    Allow it in the seccomp sandbox.
    
    Signed-off-by: Icenowy Zheng <uwu@icenowy.me>

commit 90501bc30ca94fa5443e2b7e2072d5d454587ef8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 13 22:04:19 2025 +1100

    Remove remaining OpenSSL_add_all_algorithms() calls.
    
    We already have OPENSSL_init_crypto() in the compat layer (now with a
    check of its return code, prompted by tb@). Prompted by github PR#606
    from Dimitri John Ledkov.  ok beck@

commit d9955e4571ec356ba4f2e99d01f7fa88f6e20a63
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Nov 13 10:35:14 2025 +0000

    upstream: Remove calls to OpenSSL_add_all_algorithms()
    
    and ERR_load_crypto_strings(). These are no-ops in LibreSSL, and in
    Portable have been mostly replaced by a call to OPENSSL_init_crypto()
    in the compat layer.  ok tb@
    
    OpenBSD-Commit-ID: 4c3e0af10fe276766054eda34428a37a5606d3ea

commit 6aba7008e6451ae3f9298214b13b8eded5fd9ff0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 13 05:13:06 2025 +0000

    upstream: sync support for systems that lack __builtin_popcount() from
    
    portable
    
    unused on OpenBSD (nothing sets MISSING_BUILTIN_POPCOUNT), but it
    makes syncing much easier.
    
    OpenBSD-Commit-ID: 496446300d82615b24f83eca886b8fabdbee445b

commit 84347d67ad2d5ee0db43f32bca91bacccecdb647
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 13 04:56:23 2025 +0000

    upstream: update our ML-KEM implementation to upstream libcrux
    
    v0.0.4
    
    tested/ok tb@
    
    OpenBSD-Commit-ID: 525a62549efbf53492adcb2c57e4872cdbaeed62

commit c09eeba78ad622b988ab7f8d96e75b7edd434598
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Fri Nov 7 06:29:45 2025 +0000

    upstream: sshkey_ec_validate_public: zap trailing blank I missed on
    
    review
    
    OpenBSD-Commit-ID: b296bd6056f33fd567ca0d5e9123dac1ec00f037

commit 7cb3ea4dcc7d73b2fad6782a119901cfa2b022aa
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 13 10:23:45 2025 +1100

    Simplify git command to avoid yaml syntax error.

commit 08786bbe7eebff316efb0b4ccb882f93f33a16b8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 13 09:53:17 2025 +1100

    Don't use OpenSSL's ed25519 if built without EC.
    
    Explicitly check for OPENSSL_NO_EC, since otherwise the test will link
    but then fail at runtime.

commit d12813314452173b1709f7fdbae74add84c0056f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 7 15:49:55 2025 +1100

    octal-escape the colon character
    
    Apparently these are YAML magic when followed by whitespace

commit 5a104d81a2a916a6b9a42e28a7fa11bb781dfdf4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 7 15:44:18 2025 +1100

    try single quotes instead of escaped quotes

commit 48d8293956b9801b870a56782e19f29793ca04ba
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 7 15:42:57 2025 +1100

    escape quotes in yaml

commit 1f1d63e16b5ce67f6f2f1170ec7221f1e6bff530
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 7 04:33:52 2025 +0000

    upstream: Escape SSH_AUTH_SOCK paths that are sent to the shell as
    
    setenv commands.
    
    Unbreaks ssh-agent for home directory paths that contain whitespace.
    
    Based on fix from Beat Bolli via bz3884; feedback/ok dtucker@
    
    OpenBSD-Commit-ID: aaf06594e299940df8b4c4b9f0a1d14bef427e02

commit 5794f2a186ee8ea7db0002bf7470b817572aaef0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 6 17:24:28 2025 +0000

    upstream: sk-dummy.so needs sshlog() stub after ed25519-openssl.c
    
    change
    
    OpenBSD-Regress-ID: 50b7f49021b8085728d0544275e141fb1bf4a2b5

commit a1c526f29b47147046f77a0f74097008256396f6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 6 01:33:26 2025 +0000

    upstream: unit test for stringlist_append() and stringlist_free()
    
    OpenBSD-Regress-ID: a3a4dae538c831b3810f69abc34ad8504dc3c460

commit 9d8c686981834bc1dde09f5067ff925d8fc158f5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 6 01:33:03 2025 +0000

    upstream: link against ed25519-openssl.c instead of ed25519.c
    
    OpenBSD-Regress-ID: f789d46e99d2598929e3c2d00b45c47cc3102501

commit e57ef43c3ecb69aa237e2d88b793f18ee8a25817
Author: anton@openbsd.org <anton@openbsd.org>
Date:   Sat Nov 1 05:39:25 2025 +0000

    upstream: Cope with recent changes and don't link hash.c.
    
    OpenBSD-Regress-ID: 577ef2f36ee592528448e8c0f33499e2e3512054

commit 9bea081888fa659b964e6bfa41caca2b5def98c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 7 04:11:59 2025 +0000

    upstream: Remove some unnecessary checks in
    
    sshkey_ec_validate_public()
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    Checking nQ == infinity is not needed for cofactor 1 curves.
    Checking x and y coordinates against order is not needed either.
    
    patch from Szilárd Pfeiffer, with further refinement by tb@
    ok tb@
    
    OpenBSD-Commit-ID: ef985e2be7c64e215d064757d3fc65eb181e8ede

commit 1399419f0b2d024bde968ffe769a3808611917e4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 6 01:31:11 2025 +0000

    upstream: move stringlist_append() and stringlist_free() to misc.c
    
    OpenBSD-Commit-ID: 7d047bbff6964b9abbc04e9b3e2e1b4cc1db0aea

commit f2ff1d9c1687be313dd491fcd136c682ef51bea8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 31 01:50:43 2025 +0000

    upstream: cleanup file descriptors across PKCS#11 client/helper
    
    execution; ok markus
    
    OpenBSD-Commit-ID: 993628a5b361e30aa48bbb4c07667a280f3f23ab

commit 7e5d404cf73b6762715eec69b67cce2c4801f9e9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Nov 1 08:34:15 2025 +1100

    Support using git for OpenBSD src tree tests.

commit d87e7f0bed66fc9f76fe4a2f43390fdc9a664132
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Nov 1 08:33:07 2025 +1100

    Add OpenBSD 7.8 test target.

commit 2425d7faf4154b32b5f836596023cf2432b81eaf
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 31 13:47:49 2025 +1100

    check PAM user against previous user, not pw_name
    
    Avoids early fatal() if the user doesn't exist.
    
    Reported by Viswesh Narayanan; ok dtucker@

commit 7e2f89b0fb72141abbce098e2682ba8e090cabfc
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 31 12:19:47 2025 +1100

    skip pkcs11 tests when built --without-openssl

commit 590a260f0bedc895688bb38b1cf6f0f72d8013e3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 31 12:19:34 2025 +1100

    add sshlog() replacement to sk-dummy.so

commit 57e347bae04cf214795fdeae3579991f0cc2e090
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 31 11:16:29 2025 +1100

    rename openbsd-compat sha2.h -> bsd-sha2.h
    
    avoids confusion with system header when included from files under
    openbsd-compat/

commit a5f638585152863dc64ee9436a08e1d84735d740
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 31 11:07:17 2025 +1100

    fix linking for sk-dummy.so, used in tests

commit c2a178959b03472c1b1677fea4bb263ed9fee2bd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 30 23:55:09 2025 +0000

    upstream: don't link hash.c
    
    OpenBSD-Regress-ID: a145f09c1efb1fcd3924544463f1f94f5d4805c0

commit 249224a0d43fdd2a536d7476c2bb15f4006dbbdd
Author: miod@openbsd.org <miod@openbsd.org>
Date:   Thu Oct 23 19:06:10 2025 +0000

    upstream: Prepare for gcc 3 leaving the building, COMPILER_VERSION
    
    can no longer get set to "gcc3".
    
    OpenBSD-Regress-ID: 02351ea947975b80be60b9a8c6e4dbb57789e890

commit 9dcd640d44b8270c75783ef662c340187250d6e4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Oct 23 06:15:26 2025 +0000

    upstream: Check tmux version and skip if too old. ok djm@
    
    OpenBSD-Regress-ID: fb62024eb753c61b4d78402ec8378af839fad26c

commit 94a78254a1c953c2a55eb54f65a5d99873b54bdf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 30 23:19:33 2025 +0000

    upstream: move crypto_hash_sha512() to be inline in crypto_api.h, saves
    
    about 0.5kb per binary and makes life easier for portable; with/ok dtucker@
    
    OpenBSD-Commit-ID: 672d7390f78bb6581c12661d7f5adc8a9c6be564

commit 266647c5f2075d397bd5ed5316450183eda73388
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 30 20:49:10 2025 +0000

    upstream: support ed25519 signatures via libcrypto. Mostly by Jeremy
    
    Allison Feedback tb@, ok tb@ markus@
    
    OpenBSD-Commit-ID: e8edf8adffd5975d05769dde897df882d7933526

commit 4f3e65bda22b65dc5fff82df1e97af07456fed42
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 30 03:19:54 2025 +0000

    upstream: Activate UnusedConnectionTimeout only after last channel
    
    has closed. Previously UnusedConnectionTimeout could fire early after a
    ChannelTimeout.
    
    This was not a problem for the OpenSSH client because it terminates
    once all channels have closed but could cause problems for other
    clients (e.g. API clients) that do things differently.
    
    bz3827; ok dtucker
    
    OpenBSD-Commit-ID: ff2e4607cbd4e600de3c8a5ece3b0e4bb641ed8f

commit e7f5928ef1c8e8c725bdca9cdd6b80e77fe774ac
Author: miod@openbsd.org <miod@openbsd.org>
Date:   Thu Oct 23 19:06:10 2025 +0000

    upstream: Prepare for gcc 3 leaving the building, COMPILER_VERSION
    
    can no longer get set to "gcc3".
    
    OpenBSD-Commit-ID: 98eefed432ff8253b307002e20d28da14b93e7e3

commit 0ffb76c6590800958777cd0f7b1aaae19c74fa3f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 22 06:22:58 2025 +0000

    upstream: more explicit synchronisation around killing tmux sessions
    
    between runs.
    
    OpenBSD-Regress-ID: 1735f5cb13ad281e869ab998c7d49b692ee3ed47

commit ffd086b69886e8cfeb74f9b2bcb18764bf7d9a52
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 22 05:22:31 2025 +0000

    upstream: remove debugging junk
    
    OpenBSD-Regress-ID: 3247e0ac98ae4cfe4eede871ef424d166e29e828

commit 52712d5f11172ca98ffb0b2ac93007f74cb67134
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 21 23:30:01 2025 +0000

    upstream: just skip the test if $PATH or $HOME has whitespace in it
    
    OpenBSD-Regress-ID: ccf75a29d1a300a35f63be0e4f11ad5276756275

commit a8eac05a85e31b11513a6a8dc5d662b14cbc2f4b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 21 22:13:27 2025 +0000

    upstream: quote paths; avoids test failure when run from a path with a
    
    space in it
    
    OpenBSD-Regress-ID: e4b7bffc289f10d47c50c02dd70b0323078a83b4

commit 425e5b6bd765efbfc7691f43bfc08c86dc8a615e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 21 08:35:22 2025 +0000

    upstream: fix test for executability of tmux
    
    OpenBSD-Regress-ID: a18119876ecfd95edb78225b086ac668eb0977ab

commit d1d8144ea682adae5c3bb2994322fa524584ce8b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 21 08:34:52 2025 +0000

    upstream: add some more synchronisation to avoid a race between
    
    command entry and ^C that showed up on the portable regress tests.
    
    OpenBSD-Regress-ID: 5527e74aed1b008aa7e5223ca5a84aedecd973d4

commit 8704c141bf6ded67ab466f5e987c49329ebbd968
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Oct 21 07:18:27 2025 +0000

    upstream: Always create logfiles. Should prevent "can't operate on
    
    symlink" warnings during test runs.
    
    OpenBSD-Regress-ID: 65cf5ce3c8b87b5609f1f3ea142b4f381128dc33

commit dc9af8fb0436013afb544248e0afc2fd02a1a8fa
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Sun Oct 19 09:33:23 2025 -0400

    bsd-openpty: include stdio.h for snprintf

commit afe83537e0c0c159c7c3b6ef859424f6da18169c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 21 09:14:35 2025 +1100

    include tmux in CI package list

commit a750ec60782d21db69383344dda478342d40ffa1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 20 18:31:08 2025 +1100

    Detect tmux at configure time and pass to tests.
    
    ok djm@

commit 75faa8a167b5cd4453937387b15216aa3cbc52ce
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 20 18:29:24 2025 +1100

    Update LibreSSL versions and add 4.2.0.

commit 74369b2b7c366887211ef5c092b0aaa60f31ef11
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 20 00:45:10 2025 +0000

    upstream: regression test for "interactive" ssh with a PTY attached,
    
    using tmux
    
    would have likely caught the ControlPersist regression in 10.1.
    
    feedback nicm@
    
    OpenBSD-Regress-ID: d4d709c08657769cb5691893cc98f34b6f537e76

commit a204650386124df8035b8c8613dccbe9b3158cdf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 17 16:26:22 2025 +1100

    Retire macos-13 runners, add Intel-specific ones.

commit a6503f1e22aa34ac08d5b4d2b6730954ffd30116
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 17 16:23:43 2025 +1100

    If we have nfds_t, check if it's int or long.
    
    Should fix build on very old Mac OS X, eg 10.3.  Spotted and patch tested
    by Sevan Janiyan.

commit ce49aceba9f4b5f34a1041145782914aa35ca880
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 16 11:15:16 2025 +1100

    link ssh against ssh-pkcs11.o
    
    Should fix PIN entry for direct use of PKCS11Provider in ssh(1)
    bz3879

commit 946574b97ceae126e0f0af2db43abb454937defe
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 16 00:01:54 2025 +0000

    upstream: regress test for PKCS#11 directly in ssh (not via ssh-agent)
    
    would have caught bz3879
    
    OpenBSD-Regress-ID: ceafb1e9a6c07185cc0cb0589f3170489a516123

commit e3fdb82fb02723dbe139f9d4be274d7fddfb7983
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 16 00:00:36 2025 +0000

    upstream: missed a case in previous
    
    OpenBSD-Commit-ID: 271c5602b5e719ee3def19dbd9a33328b4fa7edc

commit d926a84d17fb28bc94219e68575cb4847af02e9a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 15 23:55:01 2025 +0000

    upstream: don't try to pledge() the client if a PKCS11Provider is
    
    in use
    
    OpenBSD-Commit-ID: 445b2bf4b1e36e515f4d888f35244fd2dcfbb566

commit 9c8572a357c071923569a62bd9cfb68b1f788e09
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 15 23:54:20 2025 +0000

    upstream: mention this is for both ssh-pkcs11.c and
    
    ssh-pkcs11-client.c
    
    OpenBSD-Commit-ID: 26eff4b9a328fa056e98b997cb57254639e48fda

commit a4e404a64b117a15453075ee26eb061d416e58cd
Author: Arnout Engelen <arnout@bzzt.net>
Date:   Sat Jun 21 09:47:28 2025 +0200

    mdoc2man: process `Dl` macros
    
    `Dl` marks a single line as 'literal'. Since we don't output single
    lines differently in literal vs regular mode (we only insert line
    breaks for multi-line blocks in literal mode), we can just skip it.

commit 45e2d8861bb724cfced1bf0693a6418a0cba6ab2
Author: Arnout Engelen <arnout@bzzt.net>
Date:   Fri Jun 20 21:36:44 2025 +0200

    mdoc2man: support `Ns` inside `Ic`
    
    When encountering an `Ns` mdoc macro ('no space') inside an `Ic` block
    ('command'), such as for 'lines=number' in ssh-keygen.1, `mdoc2man`
    just output the macro instead of processing it.
    
    This adds processing for `Ns` when seen inside an `Ic` block.

commit 2b1761dea36c120417d8b73db8310dc09a781e6f
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Mon Oct 13 11:29:36 2025 -0400

    gitignore: ignore all *~ files
    
    This is a common backup style.

commit 3ccdd9841f48e7d660f8b60c996965e9dde0a3a9
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Mon Oct 13 12:49:24 2025 -0400

    bsd-misc: include sys/ioctl.h
    
    This file uses ioctl() to implement some fallback functions, but
    doesn't include sys/ioctl.h for it.

commit 3adc47e161901001816045c032fa61e94b0c9426
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 14 14:52:50 2025 +1100

    don't leak PAM handle on repeat invocations
    
    Reported by Casper Dik via bz3882; ok dtucker@

commit a6ee0eb8cd951d0a00b2f06687c77f8f573b5985
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 13 19:02:45 2025 +1100

    Switch OpenBSD VMs to use doas instead of sudo.
    
    OpenBSD 7.3 packages have been removed from the mirrors so we can't
    install sudo for it any more, so switch to the native doas utility.

commit da2f945f62e5a462381103803ee72e924bd1f137
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 13 14:33:04 2025 +1100

    check whether diff accepts -N

commit cd8c96f283dbad90991edc09ade962bcfd96adc9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 13 00:56:15 2025 +0000

    upstream: test remote/remote recursive transfers where the source
    
    path ends in ".."
    
    OpenBSD-Regress-ID: 2f42078cfcee986d08b5d135968b8de6186c0003

commit be0777ae3ef6d9deacb0e3c494674c84feac34bd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 13 00:55:45 2025 +0000

    upstream: test recursive transfers, including cases where the
    
    source path ends in ".."
    
    OpenBSD-Regress-ID: a38e3dbc86f6b7a95605784dcc601f17ede9c3f0

commit 36a98fccaacbbf07eaf67855a8057cba724c5e91
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 13 00:55:09 2025 +0000

    upstream: test implicit destination path selection when source path
    
    ends with ".."
    
    OpenBSD-Regress-ID: 42a88e7cdceee8a83879f5730199084ee4a95902

commit 4f14ca8633a2c8c0a1a19165663421f0ab32f6ab
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 13 00:54:29 2025 +0000

    upstream: similar to scp, fix implicit destination path selection
    
    when source path ends with ".."; ok deraadt@
    
    OpenBSD-Commit-ID: 9b8d2a662d96b241293a88b3ea21f2419bfc4812

commit 6432b9f6a216d0f5fb43df500e9bc30bebb3f58b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 13 00:53:51 2025 +0000

    upstream: when using the SFTP protocol for transfers, fix implicit
    
    destination path selection when source path ends with ".."; ok deraadt@
    bz3871
    
    OpenBSD-Commit-ID: d75b3b006386c5302ed4f67c4add18464ab36a0b

commit 30c20c901d8f665fb28edd006f6f8c1e46413051
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Oct 11 23:39:14 2025 +0000

    upstream: Import regenerate moduli.
    
    OpenBSD-Commit-ID: 8512e01cf917dca6455be561d66db8eeb49f3f0b

commit b6fd0e6d085ef519982c968b57fbaa9e509e1a3a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 10 15:23:59 2025 +1100

    depend

commit d6212b0b89241e96d2fea9619b2d66ea668bceaa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 10 00:31:53 2025 +0000

    upstream: clean up more thoroughly between tests
    
    OpenBSD-Regress-ID: c8394eae7547374a8fc43d03d865539e2917ea50

commit 9525aa3ecc6b27643fb83d8be4d61e831e357134
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 9 23:58:27 2025 +0000

    upstream: simplify
    
    OpenBSD-Regress-ID: 8e91a2a5c1eb50128de3be72118b544d73a86673

commit e7b4b3f153713c15e3888aa50df039b2445492dd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 9 23:26:47 2025 +0000

    upstream: don't abuse SSHKEY_FLAG_EXT to signal that a key is in
    
    the agent, as that triggers special handling on sshkey_free()
    
    OpenBSD-Commit-ID: 2ae2247babd2db167a30cf7a4f7eae4f26c000a8

commit 59a336cfd1283f512f067e01bc91bda5af253f80
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 9 23:25:23 2025 +0000

    upstream: downgrade a useless error() -> debug()
    
    OpenBSD-Commit-ID: 5b0c9bcddb324f8bed2c8e8ffe9c92d263adc2d9

commit 649c9994e7d1995a03d8621f1412cfee90a430af
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 9 03:23:33 2025 +0000

    upstream: silence "mm_log_handler: write: Broken pipe" logspam
    
    OpenBSD-Commit-ID: bcf7c6ea509e755bd5a7cd567ff7cad725111a14

commit fb0bf236b0237aa83a0c5b666af7bdc0423ac457
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 9 17:57:17 2025 +1100

    Add tracking for 10.2 branch.

commit 081b8dbbe90d81a43b5e0f1995fe59a0e319aa15
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 ac4457787900c99ada9cc3768249291b002fa16e
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 3470f465c6f5c7c371e73927ebb403dd7ba05893
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 0f3b8fd68a29766697d7a709bae8b0a61da6cff2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 8 21:48:40 2025 +0000

    upstream: When tab-completing a filename, ensure that the completed
    
    string does not end up mid-way through a multibyte character, as this will
    cause a fatal() later on.
    
    based on GHPR#587 from @TaoistBrickscarrier; feedback tb@ kevlo@
    ok dtucker@
    
    OpenBSD-Commit-ID: efb977164b4e20d61204a66201a7592ba8291362

commit 0118c30acaff308deb089fc25fe98ef59a149ca5
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 64ea9e95256203f30f98a6896f4721fd223106aa
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 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

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.

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.

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

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.

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.

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

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

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

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

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

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

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

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

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

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.

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

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

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

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

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

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.

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

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

    Fix debug log path.

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.

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@

commit 0cbeedba81b57c56379e1d202b9ccd3b72af7ddc
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 18 19:03:42 2025 +1100

    openssh-9.9p2

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

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

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

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

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

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

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

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

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.

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

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

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

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

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.

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

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

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

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

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

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.

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

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>

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

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.

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

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

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

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

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

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

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

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

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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 6452f89577ec4f22440c31b8e19b061d1a7c4b2a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 11 16:49:19 2023 +1000

    Test against LibreSSL 3.7.2.

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 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 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 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 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 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 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 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

commit 51875897b81b5c21b80c256a29597916edbde454
Author: guenther@openbsd.org <guenther@openbsd.org>
Date:   Wed Mar 8 04:43:12 2023 +0000

    upstream: Delete obsolete /* ARGSUSED */ lint comments.
    
    ok miod@ millert@
    
    OpenBSD-Commit-ID: 7be168a570264d59e96a7d2d22e927d45fee0e4c

commit a76085bda883c2104afb33ab0334eca190927362
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Mar 8 17:25:37 2023 +1100

    Extra brackets to prevent warning.

commit 147ae57d4dfa0508109f93b78a7d8b92819e1f83
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 8 00:05:58 2023 +0000

    upstream: use RSA/SHA256 when testing usability of private key in
    
    agent; with/ok dtucker
    
    OpenBSD-Commit-ID: fe1382e2fdf23fcae631308e72342bad56066a56

commit 27fd251bc906a763e70ce0f27c8abdf8bbd1e416
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 8 00:05:37 2023 +0000

    upstream: use RSA/SHA256 when testing usability of private key;
    
    based on fix in bz3546 by Dmitry Belyavskiy; with/ok dtucker
    
    OpenBSD-Commit-ID: 0ef414cc363a832f9fab92a5da0234448bce2eba

commit eee9f3fc3d52ae7d2106929bb06b7f291fb0b81a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 7 21:47:42 2023 +0000

    upstream: refactor to be more readable top to bottom. Prompted by
    
    Coverity CID 405048 which was a false-positive fd leak; ok dtucker@
    
    OpenBSD-Commit-ID: fc55ec2af622a017defb9b768bf26faefc792c00

commit 42a06b29a4c99272bf690f9b3be520b08b448dc5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 7 18:34:41 2023 +1100

    Add header changes missed in previous.

commit 4710077096edff2e6926dd5b15bf586491d317db
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 7 06:09:14 2023 +0000

    upstream: Fix mem leak in environment setup.
    
    From jjelen at redhat.com via bz#2687, ok djm@
    
    OpenBSD-Commit-ID: 9f9e4ba3cac003e6f81da3bcebd1b9ec43e7f353

commit 03acc50d0ccb78fc91d1570de1cd0fdfea646028
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 6 12:15:47 2023 +0000

    upstream: Unit test for kex_proposal_populate_entries.
    
    OpenBSD-Regress-ID: bdb211d80d572a08bf14b49fe2a58b9ff265c006

commit 3f9231c2e1f374ebb08016ba00ea97b47c0ed20b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 7 05:37:26 2023 +0000

    upstream: fix memory leak in process_read() path; Spotted by James
    
    Robinson in GHPR363; ok markus@
    
    OpenBSD-Commit-ID: cdc2d98e6478b7e7f3a36976845adae3820429d8

commit c5e6e890839ec520ab9301a92cba56303749dea2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 7 01:30:52 2023 +0000

    upstream: correct size for array argument when changing
    
    UMAC_OUTPUT_LEN Coverity CID 291845; ok dtucker@
    
    OpenBSD-Commit-ID: 2eb017d10705bb623d4418691f961c930eafaec0

commit 9641753e0fd146204d57b2a4165f552a81afade4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 6 12:14:48 2023 +0000

    upstream: Refactor creation of KEX proposal.
    
    This adds kex_proposal_populate_entries (and corresponding free) which
    populates the KEX proposal array with dynamically allocated strings.
    This replaces the previous mix of static and dynamic that has been the
    source of previous leaks and bugs.  Remove unused compat functions.
    With & ok djm@.
    
    OpenBSD-Commit-ID: f2f99da4aae2233cb18bf9c749320c5e040a9c7b

commit aa59d6a489fb20973fa461d0fdb1110db412947b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Mar 5 09:24:35 2023 +0000

    upstream: Fix mem and FILE leaks in moduli screening.
    
    If multiple -Ocheckpoint= options are passed, the earlier ones would
    be overwritten and leaked.  If we use an input file that wasn't stdin,
    close that.  From Coverity CIDs 291884 and 291894.
    
    OpenBSD-Commit-ID: a4d9d15f572926f841788912e2b282485ad09e8b

commit 23b8cb41767af99a1aac24589d1882d9c8c2c205
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Mar 5 08:18:58 2023 +0000

    upstream: Plug mem leak in moduli checkpoint option parsing.
    
    From Coverity CID 291894.
    
    OpenBSD-Commit-ID: 9b1aba2d049741ae21c8dc4560a7e29ab17310f4

commit fc7f8f2188d4a4fc8ba77eddbe863c7665666db5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Mar 5 05:34:09 2023 +0000

    upstream: Remove unused compat.h includes.
    
    We've previously removed a lot of the really old compatibility code,
    and with it went the need to include compat.h in most of the files that
    have it.
    
    OpenBSD-Commit-ID: 5af8baa194be00a3092d17598e88a5b29f7ea2b4

commit 6c165c36246d8004c20e1df5cec4961a5ac422d6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Mar 4 03:22:59 2023 +0000

    upstream: Use time_t for x11 timeout.
    
    Use time_t instead of u_int for remaining x11 timeout checks for 64bit
    time_t safety.  From Coverity CIDs 405197 and 405028, ok djm@
    
    OpenBSD-Commit-ID: 356685bfa1fc3d81bd95722d3fc47101cc1a4972

commit 4a3918f51bd2d968387e7aa87e33b32c78077fb4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 3 10:23:42 2023 +0000

    upstream: Ensure ms_remain is always initialized
    
    similar to what we do in ssh_packet_write_wait.  bz#2687, from jjelen
    at redhat.com.
    
    OpenBSD-Commit-ID: a50e0541cf823f8d1c72f71ccde925d3dbe6dfac

commit e44846a4487d2885ac7f2610be09b1e2bf52249b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 3 09:48:51 2023 +0000

    upstream: Check for non-NULL before string
    
    comparison. From jjelen at redhat.com via bz#2687.
    
    OpenBSD-Commit-ID: 0d9b2e0cac88a311b5766b1aef737082583c285f

commit 1842d523fae63b862ce8e60725c9b606cddb86a6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 3 05:00:34 2023 +0000

    upstream: guard against getsockname(-1, ...) from Coverity CID
    
    291832
    
    OpenBSD-Commit-ID: e58d5227327917d189229b7f0b37d2780f360d5f

commit 78571a5fe9847d40d7f220c92b707574ae9ec4ce
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 3 04:36:20 2023 +0000

    upstream: some options are not first-match-wins. Mention that there
    
    are exceptions at the start of the manpage and label some of them in the
    option description.
    
    OpenBSD-Commit-ID: 3b74728446fa6fc8742769eeb8c3674e233e84c4

commit d1c1b3272e8895a96c4f5889bd6e07a8525bd9f1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 3 04:34:49 2023 +0000

    upstream: actually print "channeltimeout none" in config dump mode;
    
    spotted via Coverity CID 405022
    
    OpenBSD-Commit-ID: b074b52bf138b75f08264e8da15880b29c7a630f

commit 8bf61e95610b48192d4e1720cc15d9004617301d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Mar 3 14:50:03 2023 +1100

    Add Coverity badges.

commit 93291bd723959adf462b1df958106cf07a7734dd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 3 03:12:24 2023 +0000

    upstream: Check return values of dup2. Spotted by Coverity, ok djm@
    
    OpenBSD-Commit-ID: 19fb1b53072826d00c67df677731d2f6c1dd602b

commit e37261dff33af23f37202cfce0848d36f5c1055c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 3 02:37:58 2023 +0000

    upstream: Use time_t for x11_refuse_time timeout. We need
    
    SSH_TIME_T_MAX for this, so move from misc.c to misc.h so it's available.
    Fixes a Coverity warning for 64bit time_t safety, ok djm@
    
    OpenBSD-Commit-ID: c69c4c3152cdaab953706db4ccf4d5fd682f7d8d

commit 32755a98c29114b13f4c9d47454bbb265b932ad7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 3 02:34:29 2023 +0000

    upstream: Check return value from fctnl and warn on failure.
    
    Spotted by Coverity, ok djm@
    
    OpenBSD-Commit-ID: 2097c7db3cf657f1e3a6c5077041bacc63143cab

commit 5fc60e8246c36b8255f72a937ebe9787b39648c6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Mar 2 11:10:27 2023 +0000

    upstream: Remove SUDO in proxy command wrapper. Anything that needs
    
    sudo is already run by it, and it breaks if root isn't in sudoers.
    
    OpenBSD-Regress-ID: 6cf22fda32a89c16915f31a6ed9bbdbef2a3bac9

commit 0d514659b23a257247491179cfbb53a6dd64e164
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Mar 2 08:24:41 2023 +0000

    upstream: Fix breakage on dhgex test.
    
    This was due to the sshd logs being written to the wrong log file.
    While there, make save_debug_logs less verbose, write the name of the
    tarball to regress.log and use $SUDO to remove the old symlinks (which
    shouldn't be needed, but won't hurt).  Initial problem spotted by anton@.
    
    OpenBSD-Regress-ID: 9c44fb9cd418e6ff31165e7a6c1f9f11a6d19f5b

commit 860201201d4ae655702807966901682cff30a171
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Mar 2 08:14:52 2023 +0000

    upstream: Quote grep and log message better.
    
    OpenBSD-Regress-ID: 3823d9063127169736aa274b1784cb28e15b64d4

commit 03a03c6002525f5ad9c8fc874a5d5826a35d9858
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Mar 2 06:41:56 2023 +0000

    upstream: Always call fclose on checkpoints.
    
    In the case of an fprintf failure we would not call fclose which would
    leak the FILE pointer.  While we're there, try to clean up the temp file
    on failure.  Spotted by Coverity, ok djm@
    
    OpenBSD-Commit-ID: 73c7ccc5d4fcc235f54c6b20767a2815408525ef

commit 13fe8f9785e6d90400ce548939a0b0ddc11fcb3c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Mar 1 21:54:50 2023 +0000

    upstream: Remove old log symlinks
    
    before creating new ones. In -portable some platforms don't like
    overwriting existing symlinks.
    
    OpenBSD-Regress-ID: 7e7ddc0beb73e945e1c4c58d51c8a125b518120f

commit 131fcbcaffd1e3bcf5ab766ec497b5d768955310
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Mar 1 23:23:02 2023 +1100

    Adjust test jobs for new log directory.

commit a6f4ac8a2baf77e5361cfa017d0dc250d1409bec
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Mar 1 09:29:32 2023 +0000

    upstream: Rework logging for the regression tests.
    
    Previously we would log to ssh.log and sshd.log, but that is insufficient
    for tests that have more than one concurent ssh/sshd.
    
    Instead, we'll log to separate datestamped files in a $OBJ/log/ and
    leave a symlink at the previous location pointing at the most recent
    instance with an entry in regress.log showing which files were created
    at each point.  This should be sufficient to reconstruct what happened
    even for tests that use multiple instances of each program.  If the test
    fails, tar up all of the logs for later analysis.
    
    This will let us also capture the output from some of the other tools
    which was previously sent to /dev/null although most of those will be
    in future commits.
    
    OpenBSD-Regress-ID: f802aa9e7fa51d1a01225c05fb0412d015c33e24

commit 8ead62ed5e86c7df597d8604f332f49cd1527b85
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Feb 28 21:31:50 2023 +0000

    upstream: fatal out if allocating banner string fails to avoid
    
    potential null deref later in sscanf.  Spotted by Coverity, ok deraadt@
    
    OpenBSD-Commit-ID: 74e8d228ac00552e96e9e968dfcccf8dd1f46ad5

commit 44ca56ba0b3f531f1d85730cc701097cd49e6868
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Feb 28 08:45:24 2023 +0000

    upstream: Explicitly ignore return from fchmod
    
    similar to other calls to prevent warning.
    
    OpenBSD-Commit-ID: fdc5287dcee0860b5a493186414226c655b0eb0a

commit 803392933a3a6f09f834aa5f0c2aab06a3b382f4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 27 22:12:40 2023 +0000

    upstream: Plug mem leak on globbed ls error path.
    
     Spotted by Coverity, ok deraadt@
    
    OpenBSD-Commit-ID: de28476025db29820a9a2e56e98b964d8a02861c

commit aa33b4d396abf47a2a45f982f28d054fb1dcb5c3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 27 21:04:22 2023 +1100

    Cast time_t's in debug output to long long.
    
    Should fix Coverity warning about truncation of 64bit time_t.

commit b0fd60a9de62a03189ad57d0c07f0ac51dc00e95
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 27 17:28:59 2023 +1100

    Do shadow expiry calcs using "long long".
    
    Coverity flags these as potentially not 64bit time_t safe so use
    long long for the calculations and debug output.  ok djm@

commit 01dbeb3084d714bbd001ff9d03b9de542e8cdf58
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 27 17:07:52 2023 +1100

    avoid clash between for getopt's struct option
    
    Since we don't use getopt_long() nothing outside the getopt()
    implementation itself uses this structure, so move it into the
    source to remove it from visibility and clashes with libc's
    
    ok dtucker@

commit eb88d07c43afe407094e7d609248d85a15e148ef
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 25 14:45:41 2023 +1100

    Revert explicit chmods on private keys.
    
    This should no longer be needed on Cygwin test runners due to previous
    commit.

commit 52b75db61030a6c8baf66b73644380cf3f58e26a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 25 14:43:28 2023 +1100

    Remove extended ACLs from working dirs.
    
    This should allow umask to work as expected and prevent tests from
    failing due to excessive permissions on private keys.

commit 0c5d4c843df5605b043a758d69f9a611ef63c479
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 24 13:44:13 2023 +1100

    Explicitly set permissions on user and host keys.
    
    On cygwin, the umask might not be sufficient.  Should fix tests on
    Github runners.

commit 6c9fc9d7a9f7abf82c3294d74e6d4a25735862ce
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 22 03:56:43 2023 +0000

    upstream: fix progressmeter corruption on wide displays; bz3534
    
    feedback/ok dtucker@
    
    OpenBSD-Commit-ID: f4affee067cec7c182f3e0b307d758e0472762a3

commit fe0bd3cde9665d364e5eedd2c2c2e60d4cdc3786
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Feb 21 06:48:18 2023 +0000

    upstream: fseek to end of known_hosts before writing to it.
    
    POSIX and ANSI C require that applications call fseek or similar between
    read and writing to a RW file.  OpenBSD doesn't enforce this, but some
    (System V derived) platforms need this to prevent it from writing a
    spurious extra byte (in this case, a newline).  ok djm@ deraadt@
    
    OpenBSD-Commit-ID: 33e680dcd8110582a93a40a8491024e961f45137

commit 357fb8ae14c07cd025eeed66e73de91bab569849
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 21 17:51:09 2023 +1100

    Also run unit tests on AIX VMs.
    
    In the past these tests took too long, but these days it only adds
    about 5 min to the run.

commit 17781aaa5188ee1477f7779b280d105512e3dbed
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 21 17:38:55 2023 +1100

    Wrap stdint.h inside ifdef.

commit ef798bad38505f7bf1b5fa5c0843dfc5a2b192b9
Author: Mayank Sharma <mayank.fit2010@gmail.com>
Date:   Mon Feb 20 17:37:15 2023 +0530

    Add includes to ptimeout test.
    
    Fixes test failures on AIX due to type mismatches.

commit ab69dda05d5268454209f529fa80f477e60d846a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 20 18:24:39 2023 +1100

    Always use the openssl binary configure tells us.
    
    This fixes tests on platforms that do not have the openssl tool
    installed at all.

commit 2a7e3449908571af601a4c2d12ab140096442e47
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 17 04:22:50 2023 +0000

    upstream: Remove now-unused compat bit SSH_BUG_RSASIGMD5. The code
    
    to set this was removed in OpenSSH 7.7 when support for SSH implementations
    dating back to before RFC standardization were removed.  "burn it all" djm@
    
    OpenBSD-Commit-ID: 6330935fbe23dd00be79891505e06d1ffdac7cda

commit 0833ccf2c8b7ae08b296c06f17bd53e3ab94b0b0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 17 03:06:18 2023 +0000

    upstream: Remove now-unused compat bit SSH_BUG_BIGENDIANAES. This
    
    was previously set for OpenSSH 2.3 (released in 2000) but this check was
    removed in OpenSSH 7.7 (2018).  ok djm@ deraadt@
    
    OpenBSD-Commit-ID: 326426ea328707fc9e83305291ab135c87f678af

commit c81c2bea6e828d52b62b448b4ffdd3c163177975
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 17 10:12:40 2023 +1100

    whitespace fixes

commit 500f90b39db5f0014e6b0c49ff1f45c994b69293
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 17 10:02:08 2023 +1100

    whitespace at EOL

commit 68350152406339170721c15e97afdf827a5e4001
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Feb 16 10:10:00 2023 +0000

    upstream: Remove SSH_BUG_PASSWORDPAD compat bit
    
    since it's no longer used. ok markus@
    
    OpenBSD-Commit-ID: b92c21f56fe4b7f9a54790d6a9650725c226820b

commit 537cccd804eaf65f32bdce037cc31db4e0ab0f44
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Feb 16 07:55:15 2023 +0000

    upstream: Remove SSH_BUG_IGNOREMSG compat flag
    
    since it's only applicable to SSH1 and thus no longer used.  ok markus@
    "kill it with fire" djm@
    
    OpenBSD-Commit-ID: ea13318b1937795d9db4790d3ce0a6ed01584dab

commit 285cf6cd4b91a0a0ce33193c358c99085af33e43
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Feb 10 06:41:53 2023 +0000

    upstream: space between macro and punctuation; sort usage();
    
    OpenBSD-Commit-ID: 6141610cfca037700730e41f868d1d9124958f8c

commit d39a96f70f81878c77336ed35f5c648c1804b71a
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Feb 10 06:40:48 2023 +0000

    upstream: space between macro and punctuation;
    
    OpenBSD-Commit-ID: abc95e550be9e6d9a7ff64b65c104c7be21ab19e

commit 16e82bf53fc34e43e3b948d43b68d5b27a7335e6
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Feb 10 06:39:27 2023 +0000

    upstream: sort SYNOPSIS;
    
    OpenBSD-Commit-ID: dacd9da33277d5669a51213d880632599c890c1e

commit d9685121ff6d57b8797411f3cb123884a4b96e30
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 11 12:32:19 2023 +1100

    Improve seccomp compat on older systems.
    
    Check if flags to mmap and madvise are defined before using them.
    Should fix problems building on older Linux systems that don't have
    these.  bz#3537, with & ok djm@.

commit 6180b0fa4f7996687678702806257e661fd5931e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 10 05:06:03 2023 +0000

    upstream: test -Ohashalg=... and that the default output contains both
    
    specified hash algorithms; prompted by dtucker@
    
    OpenBSD-Regress-ID: 26f309208c8d8b8fa9c5f419767b85f1e9b22f51

commit d651f5c9fe37e61491eee46c49ba9fa03dbc0e6a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 10 04:56:30 2023 +0000

    upstream: let ssh-keygen and ssh-keyscan accept
    
    -Ohashalg=sha1|sha256 when outputting SSHFP fingerprints to allow algorithm
    selection. bz3493 ok dtucker@
    
    OpenBSD-Commit-ID: e6e07fe21318a873bd877f333e189eb963a11b3d

commit 18938d11a90b74d63c20b2d3c965d5bd64786ab1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 10 04:47:19 2023 +0000

    upstream: add a `sshd -G` option that parses and prints the
    
    effective configuration without attempting to load private keys and perform
    other checks. This allows usage of the option before keys have been
    generated.
    
    bz3460 feedback/ok dtucker@
    
    OpenBSD-Commit-ID: 774504f629023fc25a559ab1d95401adb3a7fb29

commit df7d3dbf7194db8e97730ee0425d4d9d7bdb8b10
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 10 04:40:28 2023 +0000

    upstream: make `ssh -Q CASignatureAlgorithms` work as the manpage says
    
    it should bz3532
    
    OpenBSD-Commit-ID: 0ddb17b3fcbd99bfb5baea4ac5e449620cbd3adc

commit d3b8d4198b6595f23b5859d43dc8fc701f97429b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 10 14:26:44 2023 +1100

    Add CentOS 7 test targets.

commit 22efb01e355bba4755b730ed417f91c081445bfc
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Feb 9 09:55:33 2023 +0000

    upstream: Test adding terminating newline to known_hosts.
    
    OpenBSD-Regress-ID: 5fc3010ac450195b3fbdeb68e875564968800365

commit caec6da1a583ed8c32c6ad3b81bbcaab46ac8b61
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Feb 8 08:06:03 2023 +0000

    upstream: ssh-agent doesn't actually take -v,
    
    so the recently-added ones will result in the test not cleaning up
    after itself.  Patch from cjwatson at debian.org vi bz#3536.
    
    OpenBSD-Regress-ID: 1fc8283568f5bf2f918517c2c1e778072cf61b1a

commit 3c379c9a849a635cc7f05cbe49fe473ccf469ef9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Feb 9 09:54:11 2023 +0000

    upstream: Ensure that there is a terminating newline when adding a new
    
    entry to known_hosts.  bz#3529, with git+openssh at limpsquid.nl, ok deraadt@
    markus@
    
    OpenBSD-Commit-ID: fa8d90698da1886570512b96f051e266eac105e0

commit 95b6bbd2553547260b324b39d602061c88b774bc
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 7 08:43:47 2023 +1100

    Replace 9.1 with 9.2 on CI status page.

commit 195313dfe10a23c82e9d56d5fdd2f59beee1bdcf
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 3 16:33:09 2023 +1100

    harden Linux seccomp sandbox
    
    Linux mmap(2) and madvise(2) syscalls support quite a number of funky
    flags that we don't expect that sshd/libc will ever need. We can
    exclude this kernel attack surface by filtering the mmap(2) flags
    and the madvise(2) advice arguments.
    
    Similarly, the sandboxed process in sshd is a single-threaded program
    that does not use shared memory for synchronisation or communication.
    Therefore, there should be no reason for the advanced priority
    inheritance futex(2) operations to be necessary. These can also be
    excluded.
    
    Motivated by Jann Horn pointing out that there have been kernel bugs
    in nearby Linux kernel code, e.g. CVE-2020-29368, CVE-2020-29374 and
    CVE-2022-42703.
    
    Feedback Jann Horn, ok dtucker@

commit 6dfb65de949cdd0a5d198edee9a118f265924f33
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 2 23:21:54 2023 +1100

    crank versions in RPM specs

commit d07cfb11a0ca574eb68a3931d8c46fbe862a2021
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 2 23:21:45 2023 +1100

    update version in README

commit 9fe207565b4ab0fe5d1ac5bb85e39188d96fb214
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 2 23:17:49 2023 +1100

    adapt compat_kex_proposal() test to portable

commit 903c556b938fff2d7bff8da2cc460254430963c5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 2 12:12:52 2023 +0000

    upstream: test compat_kex_proposal(); by dtucker@
    
    OpenBSD-Regress-ID: 0e404ee264db546f9fdbf53390689ab5f8d38bf2

commit 405fba71962dec8409c0c962408e09049e5624b5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 19 07:53:45 2023 +0000

    upstream: Check if we can copy sshd or need to use sudo to do so
    
    during reexec test. Skip test if neither can work.  Patch from anton@, tweaks
    from me.
    
    OpenBSD-Regress-ID: 731b96ae74d02d5744e1f1a8e51d09877ffd9b6d

commit b2a2a8f69fd7737ea17dc044353c514f2f962f35
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 2 12:10:22 2023 +0000

    upstream: openssh-9.2
    
    OpenBSD-Commit-ID: f7389f32413c74d6e2055f05cf65e7082de03923

commit 12da7823336434a403f25c7cc0c2c6aed0737a35
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 2 12:10:05 2023 +0000

    upstream: fix double-free caused by compat_kex_proposal(); bz3522
    
    by dtucker@, ok me
    
    OpenBSD-Commit-ID: 2bfc37cd2d41f67dad64c17a64cf2cd3806a5c80

commit 79efd95ab5ff99f4cb3a955e2d713b3f54fb807e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 1 17:17:26 2023 +1100

    Skip connection-timeout test on minix3.
    
    Minix 3's Unix domain sockets don't seem to work the way we expect, so
    skip connection-timeout test on that platform.  While there, group
    together all similarly skipped tests and explicitly comment.

commit 6b508c4e039619842bcf5a16f8a6b08dd6bec44a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 1 12:12:05 2023 +1100

    fix libfido2 detection without pkg-config
    
    Place libfido2 before additional libraries (that it may depend upon)
    and not after. bz3530 from James Zhang; ok dtucker@

commit 358e300fed5e6def233a2c06326e51e20ebed621
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed Jan 18 20:56:36 2023 +0000

    upstream: delete useless dependency
    
    OpenBSD-Commit-ID: e1dc11143f83082e3154d6094f9136d0dc2637ad

commit a4cb9be1b021b511e281ee55c356f964487d9e82
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed Jan 18 20:43:15 2023 +0000

    upstream: Create and install sshd random relink kit.
    
    ../Makefile.inc and Makfile are concatenated for reuse, which hopefully won't
    be too fragile, we'll see if we need a different approach. The resulting sshd
    binary is tested with the new sshd -V option before installation.  As the
    binary layout is now semi-unknown (meaning relative, fixed, and gadget
    offsets are not precisely known), change the filesystem permissions to 511 to
    prevent what I call "logged in BROP". I have ideas for improving this further
    but this is a first step ok djm
    
    OpenBSD-Commit-ID: 1e0a2692b7e20b126dda60bf04999d1d30d959d8

commit bc7de6f91a9a0ae2f148a9d31a4027d441a51999
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Jan 18 06:55:32 2023 +0000

    upstream: tweak previous; ok djm
    
    OpenBSD-Commit-ID: df71ce4180c58202dfdc1d92626cfe900b91b7c3

commit a20b7e999773e6333c8aa9b0a7fa41966e63b037
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jan 31 19:35:44 2023 +1100

    Skip connection-timeout test under Valgrind.
    
    Valgrind slows things down so much that the timeout test fails.  Skip
    this test until we figure out if we can make it work.

commit c3ffb54b4fc5e608206037921db6ccbc2f5ab25f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jan 25 21:58:40 2023 +1100

    Skip connection-timeout when missing FD passing.
    
    This tests uses multiplexing which uses file descriptor passing, so
    skip it if we don't have that.  Fixes test failures on Cygwin.

commit 35253af01d8c0ab444c8377402121816e71c71f5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 18 02:00:10 2023 +0000

    upstream: when restoring non-blocking mode to stdio fds, restore
    
    exactly the flags that ssh started with and don't just clobber them with
    zero, as this could also remove the append flag from the set;
    
    bz3523; ok dtucker@
    
    OpenBSD-Commit-ID: 1336b03e881db7564a4b66014eb24c5230e9a0c0

commit 7d17ea151c0b2519f023bd9cc7f141128833ac47
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Wed Jan 18 01:50:21 2023 +0000

    upstream: Add a -V (version) option to sshd like the ssh client
    
    has. OK markus@ deraadt@
    
    OpenBSD-Commit-ID: abe990ec3e636fb040132aab8cbbede98f0c413e

commit 62360feb7f08f2a4c6fc36f3b3449309203c42c9
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Tue Jan 17 18:52:44 2023 +0000

    upstream: For "ssh -V" always exit 0, there is no need to check opt
    
    again. This was missed when the fallthrough in the switch case above it was
    removed.  OK deraadt@
    
    OpenBSD-Commit-ID: 5583e5d8f6d62a8a4215cfa95a69932f344c8120

commit 12492c0abf1eb415d08a897cc1d8b9e789888230
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 17 10:15:10 2023 +0000

    upstream: also check that an active session inhibits
    
    UnusedConnectionTimeout idea markus@
    
    OpenBSD-Regress-ID: 55c0fb61f3bf9e092b0a53f9041d3d2012f14003

commit cef2593c33ac46a58238ff998818754eabdf64ff
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 17 10:02:34 2023 +0000

    upstream: regression test for UnusedConnectionTimeout
    
    OpenBSD-Regress-ID: 7f29001374a68e71e5e078f69e4520cf4bcca084

commit aff9493a89c71d6a080419b49ac64eead9730491
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 16 04:11:29 2023 +0000

    upstream: unbreak test: cannot access shell positional parameters
    
    past $9 without wrapping the position in braces (i.e. need ${10}, etc.)
    
    OpenBSD-Regress-ID: 3750ec98d5d409ce6a93406fedde6f220d2ea2ac

commit 0293c19807f83141cdf33b443154459f9ee471f6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 17 09:44:48 2023 +0000

    upstream: Add a sshd_config UnusedConnectionTimeout option to terminate
    
    client connections that have no open channels for some length of time. This
    complements the recently-added ChannelTimeout option that terminates inactive
    channels after a timeout.
    
    ok markus@
    
    OpenBSD-Commit-ID: ca983be74c0350364c11f8ba3bd692f6f24f5da9

commit 8ec2e3123802d2beeca06c1644b0b647f6d36dab
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 15 23:35:10 2023 +0000

    upstream: adapt to ed25519 changes in src/usr.bin/ssh
    
    OpenBSD-Regress-ID: 4b3e7ba7ee486ae8a0b4790f8112eded2bb7dcd5

commit 9fbbfeca1ce4c7ec0001c827bbf4189a3ba0964b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 15 23:05:32 2023 +0000

    upstream: update OpenSSH's Ed25519 code to the last version of SUPERCOP
    
    (20221122) and change the import approach to the same one we use for
    Streamlined NTRUPrime: use a shell script to extract the bits we need from
    SUPERCOP, make some minor adjustments and squish them all into a single file.
    
    ok tb@ tobhe@
    
    OpenBSD-Commit-ID: 1bc0fd624cb6af440905b8ba74ac7c03311b8e3b

commit 6283f4bd83eee714d0f5fc55802eff836b06fea8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jan 14 22:02:44 2023 +1100

    Allow writev is seccomp sandbox.
    
    This seems to be used by recent glibcs at least in some configurations.
    From bz#3512, ok djm@

commit 923c3f437f439cfca238fba37e97a7041782f615
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jan 14 10:05:54 2023 +0000

    upstream: Shell syntax fix. From ren mingshuai vi github PR#369.
    
    OpenBSD-Regress-ID: 6696b2eeefe128099fc3d7ea9f23252cc35156f9

commit 4d87a00f704e0365e11c3c38b170c1275ec461fc
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jan 14 09:57:08 2023 +0000

    upstream: Instead of skipping the all-tokens test if we don't have
    
    OpenSSL (since we use it to compute the hash), put the hash at the end and
    just omit it if we don't have it.  Prompted by bz#3521.
    
    OpenBSD-Regress-ID: c79ecba64250ed3b6417294b6c965e6b12ca5eea

commit b05406d6f93b8c8ec11ec8b27e7c76cc7a5a55fb
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jan 13 07:13:40 2023 +0000

    upstream: fix double phrase in previous;
    
    OpenBSD-Commit-ID: 671e6c8dc5e9230518b2bbfa143daaa88adc66c2

commit 40564812b659c530eb1f4b62d09e85612aef3107
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 13 03:16:29 2023 +0000

    upstream: Document "UserKnownHostsFile none". ok djm@
    
    OpenBSD-Commit-ID: f695742d39e34ecdcc3c861c3739a84648a4bce5

commit d03e245e034019a37388f6f5f893ce848ab6d2e2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jan 13 23:02:34 2023 +1100

    Retry package installation 3 times.
    
    When setting up the CI environment, retry package installation 3 times
    before going up.  Should help prevent spurious failures during
    infrastructure issues.

commit 625f6bc39840167dafb3bf5b6a3e18503ac986e8
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 13 04:47:34 2023 +0000

    upstream: Move scp path setting to a helper function. The previous
    
    commit to add scp to the test sshd's path causes the t-envpass test to fail
    when the test scp is given using a fully qualified path.  Put this in a
    helper function and only call it from the scp tests.
    
    OpenBSD-Regress-ID: 7533dc1c4265c1de716abb062957994195b36df4

commit 6e6f88647042b3cde54a628545c2f5fb656a9327
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 13 04:23:00 2023 +0000

    upstream: Add scp's path to test sshd's PATH.
    
    If the scp we're testing is fully qualified (eg it's not in the system
    PATH) then add its path to the under-test sshd's PATH so we can find
    it. Prompted by bz#3518.
    
    OpenBSD-Regress-ID: 7df4f5a0be3aa135495b7e5a6719d3cbc26cc4c0

commit 8a5e99a70fcf9b022a8aa175ebf6a71f58511da3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jan 13 15:49:48 2023 +1100

    Remove skipping test when scp not in path.
    
    An upcoming change renders this obsolete by adding scp's path to the
    test sshd's PATH, and removing this first will make the subsequent sync
    easier.

commit 41f36dd896c8fb8337d403fcf476762986976e9d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 13 02:58:20 2023 +0000

    upstream: Add a "Host" line to the output of ssh -G showing the
    
    original host arg. Inspired by patch from vincent at bernat.ch via bz#3343,
    ok djm@
    
    OpenBSD-Commit-ID: 59c0f60a222113a44d0650cd394376e3beecc883

commit f673b49f3be3eb51074fbb8a405beb6cd0f7d93e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 13 02:44:02 2023 +0000

    upstream: avoid printf("%s", NULL) if using ssh
    
    -oUserKnownHostsFile=none and a hostkey in one of the system known hosts file
    changes; ok dtucker@
    
    OpenBSD-Commit-ID: 7ca87614bfc6da491315536a7f2301434a9fe614

commit 93fc7c576563e3d88a1dc019dd213f65607784cc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 11 05:39:38 2023 +0000

    upstream: clamp the minimum buffer lengths and number of inflight
    
    requests too
    
    OpenBSD-Commit-ID: c4965f62fa0ba850940fd66ae3f60cf516bbcd56

commit 48bf234322e639d279c5a28435eae50155e9b514
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 11 05:36:50 2023 +0000

    upstream: ignore bogus upload/download buffer lengths in the limits
    
    extension
    
    OpenBSD-Commit-ID: c5b023e0954693ba9a5376e4280c739b5db575f8

commit 36b00d31833ca74cb0f7c7d8eda1bde55700f929
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 11 02:13:52 2023 +0000

    upstream: remove whitespace at EOL from code extracted from SUPERCOP
    
    OpenBSD-Commit-ID: 1ec524ff2fbb9387d731601437c82008f35a60f4

commit d888de06c5e4d7dbf2f2b85f2b5bf028c570cf78
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 11 00:51:27 2023 +0000

    upstream: rewrite this test to use a multiplexed ssh session so we can
    
    control its lifecycle without risk of race conditions; fixes some of the
    Github integration tests for openssh-portable
    
    OpenBSD-Regress-ID: 5451cad59ba0d43ae9eeda48ec80f54405fee969

commit 4bcc737a35fdd9cc4af7423d6c23dfd0c7ef4786
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 11 11:45:17 2023 +1100

    remove buffer len workaround for NetBSD 4.x
    
    Switching to from pipes to a socketpair for communicating with the
    ssh process avoids the (kernel bug?) problem.

commit f5154d2aac3e6a32a1b13dec23a701a087850cdc
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 11 11:44:19 2023 +1100

    add back use of pipes in scp.c under USE_PIPES
    
    This matches sftp.c which prefers socketpair but uses pipes on
    some older platforms.

commit eec737b59cf13841de46134967a206607000acd4
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Tue Jan 10 23:22:15 2023 +0000

    upstream: Switch scp from using pipes to a socketpair for
    
    communication with it's ssh sub-processes.  We no longer need to reserve two
    descriptors to ensure that we don't end up using fd 0-2 unexpectedly, that is
    handled by sanitise_stdfd() in main(). Based on an original diff from djm@.
    OK deraadt@ djm@
    
    OpenBSD-Commit-ID: b80c372faac462471e955ddeab9480d668a2e48d

commit d213d126a4a343abd3a1eb13687d39c1891fe5c8
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jan 6 08:44:11 2023 +0000

    upstream: tweak previous; ok djm
    
    OpenBSD-Commit-ID: 229c493452766d70a78b0f02f6ff9894f9028858

commit 4a5590a5ee47b7dfd49773e9fdba48ad3089fe64
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 9 16:33:56 2023 +1100

    try to improve logging for dynamic-forward test
    
    previously the logs from the ssh used to exercise the forwarding
    channel would clobber the logs from the ssh actually doing the
    forwarding

commit 715bc25dcfccf9fb2bee820155fe071d01a618db
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jan 7 23:24:50 2023 +1100

    Skip dynamic-forward test on minix3.
    
    This test relies on loopback addresses which minix does not have.
    Previously the test would not run at all since it also doesn't have
    netcat, but now we use our own netcat it tries and fails.

commit dd1249bd5c45128a908395c61b26996a70f82205
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 8 12:08:59 2023 +1100

    don't test IPv6 addresses if platform lacks support

commit d77fc611a62f2dfee0b654c31a50a814b13310dd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 6 12:33:33 2023 +0000

    upstream: When OpenSSL is not available, skip parts of percent test
    
    that require it. Based on github pr#368 from ren mingshuai.
    
    OpenBSD-Regress-ID: 49a375b2cf61ccb95b52e75e2e025cd10988ebb2

commit 1cd2aac312af9172f1b5cb06c2e1cd090abb83cf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jan 7 23:01:11 2023 +1100

    Use our own netcat for dynamic-forward test.
    
    That way we can be surer about its behaviour rather than trying to
    second-guess the behaviour of various netcat implementations.

commit 26cab41c05d7b0859d2a1ea5b6ed253d91848a80
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jan 7 14:30:43 2023 +1100

    Use autoconf to find openssl binary.
    
    It's possible to install an OpenSSL in a path not in the system's
    default library search path.  OpenSSH can still use this (eg if you
    specify an rpath) but the openssl binary there may not work.  If one is
    available on the system path just use that.

commit 5532e010a0eeb6aa264396514f9aed7948471538
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jan 7 10:34:18 2023 +1100

    Check openssl_bin path is executable before using.

commit 5d7b16cff48598d5908db970bfdc9ff9326142c8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jan 6 23:19:07 2023 +1100

    Set OPENSSL_BIN from OpenSSL directory.

commit 344a0e8240eaf08da5d46a5e3a9ecad6e4f64c35
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 6 08:50:33 2023 +0000

    upstream: Save debug logs from ssh for debugging purposes.
    
    OpenBSD-Regress-ID: 109e40b06de1c006a3b8e0d8745b790b2c5870a0

commit e1ef172646f7f49c80807eea90225ef5e0be55a8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 08:07:39 2023 +0000

    upstream: regression test for ChannelTimeout
    
    OpenBSD-Regress-ID: 280bfbefcfa415428ad744e43f69a8dede8ad685

commit 2393ea8daf25853459eb07a528d7577688847777
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 07:18:18 2023 +0000

    upstream: fix typo in verbose logging
    
    OpenBSD-Regress-ID: 0497cdb66e003b2f50ed77291a9104fba2e017e9

commit 161a5378a3cc2e7aa3f9674cb7f4686ae6ce9586
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 02:59:50 2023 +0000

    upstream: unit tests for misc.c:ptimeout_* API
    
    OpenBSD-Regress-ID: 01f8fb12d08e5aaadd4bd4e71f456b6588be9a94

commit 018d671d78145f03d6f07ae9d64d51321da70325
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Wed Jan 4 22:48:57 2023 +0000

    upstream: Copy bytes from the_banana[] rather than banana()
    
    Fixes test failure due to segfault seen on arm64 with xonly snap.
    
    ok djm
    
    OpenBSD-Regress-ID: 86e2aa4bbd1dff1bc4ebb2969c0d6474485be046

commit ab6bb69e251faa8b24f81b25c72ec0120f20cad4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 6 19:13:36 2023 +1100

    unbreak scp on NetBSD 4.x
    
    e555d5cad5 effectively increased the default copy buffer size for SFTP
    transfers. This caused NetBSD 4.x to hang during the "copy local file to
    remote file in place" scp.sh regression test.
    
    This puts back the original 32KB copy buffer size until we can properly
    figure out why.
    
    lots of debugging assistance from dtucker@

commit 2d1ff2b9431393ad99ef496d5e3b9dd0d4f5ac8c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 02:47:18 2023 +0000

    upstream: Implement channel inactivity timeouts
    
    This adds a sshd_config ChannelTimeouts directive that allows channels that
    have not seen traffic in a configurable interval to be automatically closed.
    Different timeouts may be applied to session, X11, agent and TCP forwarding
    channels.
    
    Note: this only affects channels over an opened SSH connection and not
    the connection itself. Most clients close the connection when their channels
    go away, with a notable exception being ssh(1) in multiplexing mode.
    
    ok markus dtucker
    
    OpenBSD-Commit-ID: ae8bba3ed9d9f95ff2e2dc8dcadfa36b48e6c0b8

commit 0e34348d0bc0b1522f75d6212a53d6d1d1367980
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 02:42:34 2023 +0000

    upstream: Add channel_set_xtype()
    
    This sets an "extended" channel type after channel creation (e.g.
    "session:subsystem:sftp") that will be used for setting channel inactivity
    timeouts.
    
    ok markus dtucker
    
    OpenBSD-Commit-ID: 42564aa92345045b4a74300528f960416a15d4ca

commit ceedf09b2977f3a756c759a6e7eb8f8e9db86a18
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 02:41:49 2023 +0000

    upstream: tweak channel ctype names
    
    These are now used by sshd_config:ChannelTimeouts to specify timeouts by
    channel type, so force them all to use a similar format without whitespace.
    
    ok dtucker markus
    
    OpenBSD-Commit-ID: 66834765bb4ae14f96d2bb981ac98a7dae361b65

commit c60438158ad4b2f83d8504257aba1be7d0b0bb4b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 02:39:59 2023 +0000

    upstream: Add channel_force_close()
    
    This will forcibly close an open channel by simulating read/write errors,
    draining the IO buffers and calling the detach function.
    
    Previously the detach function was only ever called during channel garbage
    collection, but there was no way to signal the user of a channel (e.g.
    session.c) that its channel was being closed deliberately (vs. by the
    usual state-machine logic). So this adds an extra "force" argument to the
    channel cleanup callback to indicate this condition.
    
    ok markus dtucker
    
    OpenBSD-Commit-ID: 23052707a42bdc62fda2508636e624afd466324b

commit d478cdc7ad6edd4b1bcd1e86fb2f23194ff33d5a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 02:38:23 2023 +0000

    upstream: replace manual poll/ppoll timeout math with ptimeout API
    
    feedback markus / ok markus dtucker
    
    OpenBSD-Commit-ID: c5ec4f2d52684cdb788cd9cbc1bcf89464014be2

commit 4adf3817a24efe99b06e62630577d683c7cd8065
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 02:37:04 2023 +0000

    upstream: add ptimeout API for keeping track of poll/ppoll
    
    timeouts; ok dtucker markus
    
    OpenBSD-Commit-ID: 3335268ca135b3ec15a947547d7cfbb8ff929ead

commit 8c7c69d32375d2f3ce9da0109c9bffc560842316
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 5 05:49:13 2023 +0000

    upstream: suppress "Connection closed" message when in quiet mode
    
    OpenBSD-Commit-ID: 8a3ab7176764da55f60bfacfeae9b82d84e3908f

commit 845ceecea2ac311b0c267f9ecbd34862e1876fc6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 2 07:03:57 2023 +0000

    upstream: regression test for PermitRemoteOpen
    
    OpenBSD-Regress-ID: 8271aafbf5c21950cd5bf966f08e585cebfe630c

commit b3daa8dc582348d6ab8150bc1e571b7aa08c5388
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 2 07:03:30 2023 +0000

    upstream: fix bug in PermitRemoteOpen which caused it to ignore its
    
    first argument unless it was one of the special keywords "any" or "none".
    
    Reported by Georges Chaudy in bz3515; ok dtucker@
    
    OpenBSD-Commit-ID: c5678a39f1ff79993d5ae3cfac5746a4ae148ea5

commit 0872663a7be0301bcc3d49acdbc9b740a3d972d4
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Dec 26 19:16:03 2022 +0000

    upstream: spelling fixes; from paul tagliamonte amendments to his
    
    diff are noted on tech
    
    OpenBSD-Commit-ID: d776dd03d0b882ca9c83b84f6b384f6f9bd7de4a

commit 797da2812a71785b34890bb6eb44767a7d09cd34
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 16 07:13:22 2022 +0000

    upstream: Mention that scp uses the SFTP protocol and remove
    
    reference to legacy flag. Spotted by, feedback and ok jmc@
    
    OpenBSD-Commit-ID: 9dfe04966f52e941966b46c7a2972147f95281b3

commit 93f2ce8c050a7a2a628646c00b40b9b53fef93ef
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 16 06:56:47 2022 +0000

    upstream: Clear signal mask early in main(); sshd may have been
    
    started with one or more signals masked (sigprocmask(2) is not cleared
    on fork/exec) and this could interfere with various things, e.g. the
    login grace timer.
    
    Execution environments that fail to clear the signal mask before running
    sshd are clearly broken, but apparently they do exist.
    
    Reported by Sreedhar Balasubramanian; ok dtucker@
    
    OpenBSD-Commit-ID: 77078c0b1c53c780269fc0c416f121d05e3010ae

commit 4acfaabfae41badb9d334a2ee88c5c6ad041c0d5
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Dec 16 06:52:48 2022 +0000

    upstream: add -X to usage();
    
    OpenBSD-Commit-ID: 1bdc3df7de11d766587b0428318336dbffe4a9d0

commit e555d5cad5afae7d5ef2bbc02ca591178fe16fed
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 16 03:40:03 2022 +0000

    upstream: add a -X option to both scp(1) and sftp(1) to allow
    
    control over some SFTP protocol knobs: the copy buffer length and
    the number of inflight requests, both of which are used during
    upload/download.
    
    Previously these could be controlled in sftp(1) using the -b/-R options.
    This makes them available in both SFTP protocol clients using the same
    option character sequence.
    
    ok dtucker@
    
    OpenBSD-Commit-ID: 27502bffc589776f5da1f31df8cb51abe9a15f1c

commit 5a7a7acab2f466dc1d7467b5d05d35268c3137aa
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Thu Dec 15 18:20:39 2022 +0000

    upstream: The idiomatic way of coping with signed char vs unsigned
    
    char (which did not come from stdio read functions) in the presence of
    ctype macros, is to always cast to (unsigned char).  casting to (int)
    for a "macro" which is documented to take int, is weird.  And sadly wrong,
    because of the sing extension risk.. same diff from florian
    
    OpenBSD-Commit-ID: 65b9a49a68e22ff3a0ebd593f363e9f22dd73fea

commit b0b58222c7cc62efd8212c4fb65a545f58ebb22d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Dec 19 18:49:51 2022 +1100

    Simply handling of SSH_CONNECTION PAM env var.
    
    Prompted by bz#3508: there's no need to cache the value of
    sshpam_conninfo so remove the global.  While there, add check of
    return value from pam_putenv.  ok djm@

commit ed8444572ae684fdb892f97bae342c6cb6456f04
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Dec 19 18:42:34 2022 +1100

    Add tests for LibreSSL 3.7.0 and OpenSSL 1.1.1s.

commit abb9a8aaddfcacbd12641f6e4f203da0fa85a287
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Dec 18 21:36:25 2022 +1100

    Use sudo when resetting perms on directories.

commit 2f5664c5908d84697cbe91302d5d5c4d83cb2121
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Dec 18 21:19:33 2022 +1100

    Set group perms on regress dir.
    
    This ensures that the tests don't fail due to StrictMode checks.

commit 137196300fc1540affadde880210f02ba6cb4abf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Dec 18 21:13:42 2022 +1100

    Fetch regress logs from obj dir.

commit 5f93c4836527d9fda05de8944a1c7b4a205080c7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Dec 13 20:59:54 2022 +1100

    obsdsnap test VMs runs-on libvirt too.

commit 8386886fb1ab7fda73069fb0db1dbe0e5a52f758
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Dec 13 20:55:37 2022 +1100

    Run upstream obsdsnap tests on ephemeral runners.

commit b6e01459b55ece85d7f296b2bc719d1841e1009e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Dec 13 20:48:56 2022 +1100

    Move obsdsnap test VMs to ephemeral runners.

commit ea6fdf9a1aa71a411f7db218a986392c4fb55693
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 9 18:00:21 2022 +1100

    use calloc for allocating arc4random structs
    
    ok dtucker

commit 4403b62f5548e91389cb3339d26a9d0c4bb07b34
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 9 00:22:29 2022 +0000

    upstream: Warn if no host keys for hostbased auth can be loaded.
    
    OpenBSD-Commit-ID: 2a0a13132000cf8d3593133c1b49768aa3c95977

commit a6183e25e3f1842e21999fe88bc40bb99b121dc3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 9 00:17:40 2022 +0000

    upstream: Add server debugging for hostbased auth.
    
    auth_debug_add queues messages about the auth process which is sent to
    the client after successful authentication.  This also sends those to
    the server debug log to aid in debugging.  From bz#3507, ok djm@
    
    OpenBSD-Commit-ID: 46ff67518cccf9caf47e06393e2a121ee5aa258a

commit b85c3581c16aaf6e83b9a797c80705a56b1f312e
Author: cheloha@openbsd.org <cheloha@openbsd.org>
Date:   Sun Dec 4 23:50:49 2022 +0000

    upstream: remove '?' from getopt(3) loops
    
    userspace: remove vestigial '?' cases from top-level getopt(3) loops
    
    getopt(3) returns '?' when it encounters a flag not present in the in
    the optstring or if a flag is missing its option argument.  We can
    handle this case with the "default" failure case with no loss of
    legibility.  Hence, remove all the redundant "case '?':" lines.
    
    Prompted by dlg@.  With help from dlg@ and millert@.
    
    Link: https://marc.info/?l=openbsd-tech&m=167011979726449&w=2
    
    ok naddy@ millert@ dlg@
    
    OpenBSD-Commit-ID: b2f89346538ce4f5b33ab8011a23e0626a67e66e

commit 9a067e8d28a2249fd73f004961e30c113ee85e5d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Dec 7 11:45:43 2022 +0000

    upstream: Fix comment typo.
    
    OpenBSD-Regress-ID: 3b04faced6511bb5e74648c6a4ef4bf2c4decf03

commit ce3c3e78ce45d68a82c7c8dc89895f297a67f225
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Dec 7 18:58:25 2022 +1100

    Add SANDBOX_DEBUG to the kitchensink test build.

commit bc234605fa3eb10f56bf0d74c8ecb0d91ada9d05
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 7 18:38:25 2022 +1100

    disable SANDBOX_SECCOMP_FILTER_DEBUG
    
    It was mistakenly enabled in 2580916e4872
    
    Reported by Peter sec-openssh-com.22.fichtner AT 0sg.net

commit b087c5cfa011b27992e01589314fec830266f99d
Author: Rose <83477269+AtariDreams@users.noreply.github.com>
Date:   Tue Nov 29 15:12:54 2022 -0500

    Update autotools
    
    Regenerate config files using latest autotools

commit d63f5494978a185c7421d492b9c2f6f05bb54138
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Dec 6 12:22:36 2022 +1100

    Fix typo in comment.  Spotted by tim@

commit 73dcca12115aa12ed0d123b914d473c384e52651
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Dec 4 11:03:11 2022 +0000

    upstream: Remove duplicate includes.
    
     Patch from AtariDreams via github PR#364.
    
    OpenBSD-Commit-ID: b9186638a05cb8b56ef7c0de521922b6723644ea

commit 3cec15543010bc8d6997d896b1717a650afb7e92
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 2 04:40:27 2022 +0000

    upstream: make struct sshbuf private
    
    and remove an unused field; ok dtucker
    
    OpenBSD-Commit-ID: c7a3d77c0b8c153d463398606a8d57569186a0c3

commit 5796bf8ca9535f9fa7d01829a540d2550e05c860
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Dec 2 11:43:36 2022 +1100

    Restore ssh-agent permissions on exit.
    
    ...enough that subsequent builds can overwrite ssh-agent if necessary.

commit ccf5a13868cbb4659107458cac1e017c98abcbda
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Dec 1 02:22:13 2022 +0000

    upstream: Clean up ssh-add and ssh-agent logs.
    
    OpenBSD-Regress-ID: 9eda8e4c3714d7f943ab2e73ed58a233bd29cd2c

commit 7a8b40cf6a5eda80173140cc6750a6db8412fa87
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Dec 1 02:19:29 2022 +0000

    upstream: Log output of ssh-agent and ssh-add
    
    This should  make debugging easier.
    
    OpenBSD-Regress-ID: 5974b02651f428d7e1079b41304c498ca7e306c8

commit 4a1805d532616233dd6072e5cd273b96dd3062e6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Nov 29 22:41:14 2022 +0000

    upstream: Add void to client_repledge args to fix compiler warning. ok djm@
    
    OpenBSD-Commit-ID: 7e964a641ce4a0a0a11f047953b29929d7a4b866

commit 815c4704930aa449edf6e812e99d69e9ffd31f01
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 28 01:38:22 2022 +0000

    upstream: tighten pledge(2) after session establishment
    
    feedback, ok & testing in snaps deraadt@
    
    OpenBSD-Commit-ID: aecf4d49d28586dfbcc74328d9333398fef9eb58

commit f7cebbbf407d772ed71403d314343766782fe540
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 28 01:37:36 2022 +0000

    upstream: New EnableEscapeCommandline ssh_config(5) option
    
    This option (default "no") controls whether the ~C escape is available.
    Turning it off by default means we will soon be able to use a stricter
    default pledge(2) in the client.
    
    feedback deraadt@ dtucker@; tested in snaps for a while
    
    OpenBSD-Commit-ID: 7e277595d60acb8263118dcb66554472257b387a

commit d323f7ecf52e3d4ec1f4939bf31693e02f891dca
Author: mbuhl@openbsd.org <mbuhl@openbsd.org>
Date:   Fri Nov 18 19:47:40 2022 +0000

    upstream: In channel_request_remote_forwarding the parameters for
    
    permission_set_add are leaked as they are also duplicated in the call. Found
    by CodeChecker. ok djm
    
    OpenBSD-Commit-ID: 4aef50fa9be7c0b138188814c8fe3dccc196f61e

commit 62cc33e6eed847aafdc29e34aa69e9bd82a0ee16
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 30 11:23:11 2022 +1100

    Use -fzero-call-used-regs=used on clang 15.
    
    clang 15 seems to have a problem with -fzero-call-used-reg=all which
    causes spurious "incorrect signature" failures with ED25519.  On those
    versions, use -fzero-call-used-regs=used instead.  (We may add exceptions
    later if specific versions prove to be OK).  Also move the GCC version
    check to match.
    
    Initial investigation by Daniel Pouzzner (douzzer at mega nu), workaround
    suggested by Bill Wendling (morbo at google com).  bz#3475, ok djm@

commit f84b9cffd52c9c5c359a54a1929f9948e803ab1d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 28 21:09:28 2022 +1100

    Skip unit tests on slow riscv64 hardware.

commit 9f2747e0bed3faca92679eae69aef10c95dc82f5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 27 15:26:22 2022 +1100

    Rework how selfhosted tests interact with runners.
    
    Previously there was one runner per test target (mostly VMs).  This had
    a few limitations:
     - multiple tests that ran on the same target (eg multiple build
       configs) were serialized on availability or that runner.
     - it needed manual balancing of VMs over host machines.
    
    To address this, make VMs that use ephemeral disks (ie most of them)
    all use a pool of runners with the "libvirt" label.  This requires that
    we distinguish between "host" and "target" for those.  Native runners
    and VMs with persistent disks (eg the constantly-updated snapshot ones)
    specify the same host and target.
    
    This should improve test throughput.

commit d664ddaec87bdc7385be8ef7f1337793e1679d48
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 27 12:19:37 2022 +1100

    Run vmstartup from temp dir.
    
    This will allow us to create ephemeral disk images per-runner.

commit 0fa16e952b1fc1c4cf65e3dd138b0e87003e2e45
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 27 12:14:00 2022 +1100

    Make "config" in matrix singular and pass in env.
    
    This will allow the startup scripts to adapt their behaviour based on
    the type and config.

commit e8857043af54809187be1e8b06749db61112899f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 27 11:42:22 2022 +1100

    Add "libvirt" label to dfly30.

commit 9775473d84902dc37753686cd10ae71fbe67efda
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 27 09:28:20 2022 +1100

    Rename "os" in matrix to "target".
    
    This is in preparation to distinguish this from the host that the runner
    runs on in case where they are separate (eg VMs).

commit 04fd00ceff39f4544ced6f5342060abe584835d0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 27 09:23:04 2022 +1100

    Remove unused self-hosted test targets.

commit c9d9fcad2a11c1cd1550a541f44091d65f0b5584
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 27 09:16:15 2022 +1100

    Remove explicit "default" test config argument.
    
    Not specifying the test config implicitly selects default args.

commit 15a01cf15f396f87c6d221c5a6af98331c818962
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 23 13:18:54 2022 +1100

    Add fallback for old platforms w/out MAP_ANON.

commit 6b9bbbfe8b26db6e9a30a7e08c223e85421aed98
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 23 13:09:11 2022 +1100

    If we haven't found it yet, recheck for sys/stat.h.
    
    On some very old platforms, sys/stat.h needs sys/types.h, however
    autoconf 2.71's AC_CHECK_INCLUDES_DEFAULT checks for them in the
    opposite order, which in combination with modern autoconf's
    "present but cannot be compiled" behaviour causes it to not be
    detected.

commit 8926956f22639132a9f2433fcd25224e01b900f5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 11 11:25:37 2022 +1100

    Add dfly62 test target.

commit 650de7ecd3567b5a5dbf16dd1eb598bd8c20bca8
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Nov 10 23:03:10 2022 +0000

    upstream: Handle dynamic remote port forwarding in escape commandline's
    
    -R processing. bz#3499, ok djm@
    
    OpenBSD-Commit-ID: 194ee4cfe7ed0e2b8ad0727f493c798a50454208

commit 5372db7e7985ba2c00f20fdff8942145ca99e033
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 10 12:44:51 2022 +1100

    Remove seed passing over reexec.
    
    This was added for the benefit of platforms using ssh-rand-helper to
    prevent a delay on each connection as sshd reseeded itself.
    
    ssh-random-helper is long gone, and since the re-exec happens before the
    chroot the re-execed sshd can reseed itself normally. ok djm@

commit ca98d3f8c64cfc51af81e1b01c36a919d5947ec2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 9 20:59:20 2022 +1100

    Skip reexec test on OpenSSL 1.1.1 specifically.
    
    OpenSSL 1.1.1 has a bug in its RNG that breaks reexec fallback, so skip
    that test.  See bz#3483 for details.

commit 5ec4ebc2548e5f7f1b55b2a5cef5b67bdca8146f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Nov 9 09:04:12 2022 +0000

    upstream: Fix typo in fatal error message.
    
    Patch from vapier at chromium.org.
    
    OpenBSD-Commit-ID: 8a0c164a6a25eef0eedfc30df95bfa27644e35cf

commit e6abafe9a6d809422d3432b95b3f9747b0acaa71
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Nov 9 09:01:52 2022 +0000

    upstream: Remove errant colon and simplify format
    
    string in error messages. Patch from vapier at chromium.org.
    
    OpenBSD-Commit-ID: fc28466ebc7b74e0072331947a89bdd239c160d3

commit db2027a687516f87c3fb141e87154bb3d8a7807c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 9 01:37:44 2022 +0000

    upstream: rename client_global_hostkeys_private_confirm() to
    
    client_global_hostkeys_prove_confirm(), as it handles the
    "hostkeys-prove00@openssh.com" message; no functional change
    
    OpenBSD-Commit-ID: 31e09bd3cca6eed26855b88fb8beed18e9bd026d

commit 1c2be7c2004cf1abcd172fee9fe3eab57cd4c426
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 9 00:15:59 2022 +0000

    upstream: typo in comment
    
    OpenBSD-Commit-ID: 39c58f41e0f32d1ff31731fa6f5bbbc3ad25084a

commit cf1a9852d7fc93e4abc4168aed09529a57427cdc
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 9 09:23:47 2022 +1100

    Defer seed_rng until after closefrom call.
    
    seed_rng will initialize OpenSSL, and some engine providers (eg Intel's
    QAT) will open descriptors for their own use.  bz#3483, patch from
    joel.d.schuetze at intel.com, ok djm@

commit dffa64480163fbf76af7e4fb62c26bb0dd6642aa
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 9 08:27:47 2022 +1100

    Fix comment text.  From emaste at freebsd.org.

commit d9df5689c29823ab830ec4f54c83c6cc3c0077ad
Author: Pierre Ossman <ossman@cendio.se>
Date:   Wed Jul 6 13:52:10 2022 +0200

    Avoid assuming layout of fd_set
    
    POSIX doesn't specify the internal layout of the fd_set object, so let's
    not assume it is just a bit mask. This increases compatibility with
    systems that have a different layout.
    
    The assumption is also worthless as we already refuse to use file
    descriptors over FD_SETSIZE anyway. Meaning that the default size of
    fd_set is quite sufficient.

commit 419aa8a312e8d8f491933ca3d5933e602cb05aae
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Nov 8 12:42:52 2022 +1100

    Shutdown any VM before trying to check out repo.
    
    In the case where the previous run did not clean up, the checkout will
    fail as it'll leave a stale mount.

commit a32c07cbb78f65d8527642b96474a83b413f8108
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Nov 8 11:33:25 2022 +1100

    Run vm startup and shutdown from runner temp dir.
    
    Should work even if the github workspace dir is on a stale sshfs mount.

commit 2b40a7dfcdb8e616155b9504145aa52b271455aa
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Nov 8 11:03:31 2022 +1100

    Add valrind-5 test here too.

commit 2ea03d1f6d0a05ee2b63ed2dc0f2d54f1e4655a1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Nov 8 09:21:10 2022 +1100

    Update checkout and upload actions.
    
    Update actions/checkout and actions/upload-artifact to main branch for
    compatibility with node.js v16.

commit 4e316ff0f18a118232bb9ac6512ee62773a9e8ea
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Nov 8 09:17:04 2022 +1100

    Split out rekey test since it runs the longest.

commit 21625a6424258a92a96a3bb73ae6aabc5ed8a6b4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Nov 7 10:09:28 2022 +0000

    upstream: The IdentityFile option in ssh_config can also be used to
    
    specify a public key file, as documented in ssh.1 for the -i option. Document
    this also for IdentityFile in ssh_config.5, for documentation completeness.
    From laalsaas at systemli.org via portable github PR#352, ok jmc@ djm@
    
    OpenBSD-Commit-ID: 2f943be9f96e60ef81a9a4faa25b009999f9883b

commit 747691604d3325ed2b62bad85b6fd8563ad32f6c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Nov 7 10:05:38 2022 +0000

    upstream: Remove some set but otherwise unused variables, spotted
    
    in -portable by clang 16's -Wunused-but-set-variable.  ok djm@
    
    OpenBSD-Commit-ID: 3d943ddf2369b38fbf89f5f19728e7dc1daf3982

commit 1d78d25653805aefc7a8dd9d86cd7359ada3823c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Nov 7 10:02:59 2022 +0000

    upstream: Check for and disallow MaxStartups values less than or
    
    equal to zero during config parsing, rather than faling later at runtime.
    bz#3489, ok djm@
    
    OpenBSD-Commit-ID: d79c2b7a8601eb9be493629a91245d761154308b

commit a00f59a645072e5f5a8d207af15916a7b23e2642
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 7 04:04:40 2022 +0000

    upstream: fix parsing of hex cert expiry time; was checking whether the
    
    start time began with "0x", not the expiry time.
    
    from Ed Maste
    
    OpenBSD-Commit-ID: 6269242c3e1a130b47c92cfca4d661df15f05739

commit f58acaf8c7315483f4ac87d46a1aa2142a713cd8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 7 15:10:59 2022 +1100

    Fix merge conflict.

commit 162e5741020a8d996c0c12b988b118e71ed728e6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 7 15:04:33 2022 +1100

    Branch-specific links for master status badges.

commit e4b7c12ab24579312aa3ed38ce7041a439ec2d56
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 7 14:46:38 2022 +1100

    Add CIFuzz status badge.

commit b496b9f831acd1e5bcd875e26e797488beef494a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 7 14:45:16 2022 +1100

    Do not run CIFuzz on selfhosted tree.
    
    We already run it on the regular tree, no need to double up.

commit 2138b1c4ddb300129a41a5104627b0d561184c7b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 7 14:41:58 2022 +1100

    Whitespace change to trigger CIFuzz workflow.

commit 4670b97ef87c7b0f21283c9b07c7191be88dda05
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 7 14:34:04 2022 +1100

    Run cifuzz workflow on the actions as regular CI.

commit 79391e66ce851ace1baf3c6a35e83a23f08ec2ba
Author: David Korczynski <david@adalogics.com>
Date:   Tue Nov 30 11:45:20 2021 +0000

    Add CIFuzz integration

commit c1893364a0be243270014d7d34362a8101d55112
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Nov 7 02:21:22 2022 +0000

    upstream: Import regenerated moduli.
    
    OpenBSD-Commit-ID: b0e54ee4d703bd6929bbc624068666a7a42ecb1f

commit 5c3f18fb994ef27e685b205ee2351851b80fdbd1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Nov 7 01:53:01 2022 +0000

    upstream: Fix typo. From pablomh via -portable github PR#344.
    
    OpenBSD-Commit-ID: d056ee2e73691dc3ecdb44a6de68e6b88cd93827

commit e1c6fcc142066417c9832e634463faa3dd5d116c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 7 12:46:58 2022 +1100

    Link to branch-specific queries for V_9_1 status.

commit 4f4a5fad6d8892c3f8ee9cd81ec7de6458210c9f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 6 10:55:59 2022 +1100

    Use "prohibit-password" in -portable comments.
    
    "without-password" is the deprecated alias for "prohibit-password",
    so we should reference the latter. From emaste at freebsd.org.

commit 0f7e1eba55259ec037f515000b4c4afbf446230a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 6 10:50:01 2022 +1100

    Fix tracing disable on FreeBSD.
    
    Some versions of FreeBSD do not support using id 0 to refer to the
    current pid for procctl, so pass getpid() explicitly.  From
    emaste at freebsd.org.

commit 32fddb982fd61b11a2f218a115975a87ab126d43
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 7 10:39:01 2022 +1100

    Fix setres*id checks to work with clang-16.
    
    glibc has the prototypes for setresuid and setresgid behind _GNU_SOURCE,
    and clang 16 will error out on implicit function definitions, so add
    _GNU_SOURCE and the required headers to the configure checks.  From
    sam at @gentoo.org via bz#3497.

commit 12af712d116f42164bcfa56db901d06e4fa27199
Author: Sam James <sam@gentoo.org>
Date:   Sun Nov 6 04:52:38 2022 +0000

    configure.ac: Fix -Wstrict-prototypes
    
    Clang 16 now warns on this and it'll be removed in C23, so let's
    just be future proof. It also reduces noise when doing general
    Clang 16 porting work (which is a big job as it is).  github PR#355.
    
    Signed-off-by: Sam James <sam@gentoo.org>

commit 40b0a5eb6e3edfa2886b60c09c7803353b0cc7f5
Author: Sam James <sam@gentoo.org>
Date:   Sun Nov 6 04:47:35 2022 +0000

    configure.ac: Add <pty.h> include for openpty
    
    Another Clang 16ish fix (which makes -Wimplicit-function-declaration
    an error by default).  github PR#355.
    
    See: 2efd71da49b9cfeab7987058cf5919e473ff466b
    See: be197635329feb839865fdc738e34e24afd1fca8

commit 6b17e128879ec6cc32ca2c28b5d894b4aa72e32d
Author: Rochdi Nassah <rochdinassah.1998@gmail.com>
Date:   Fri Oct 28 01:26:31 2022 +0100

    Fix broken zlib link.

commit 99500df246ccb736ddbdd04160dcc82165d81a77
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 4 16:59:26 2022 +1100

    Don't run openbsd-compat tests on Cygwin.
    
    Add "compat-tests" to the default TEST_TARGET so we can override as
    necessary.  Override TEST_TARGET for Cygwin as the tests don't currently
    compile there.

commit 3cae9f92a31897409666aa1e6f696f779759332b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 3 21:59:20 2022 +0000

    upstream: replace recently-added valid_domain() check for hostnames
    
    going to known_hosts with a more relaxed check for bad characters; previous
    commit broke address literals. Reported by/feedback from florian@
    
    OpenBSD-Commit-ID: 10b86dc6a4b206adaa0c11b58b6d5933898d43e0

commit 9655217231c9056200bea7ae2dffcc9c0c3eb265
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 3 23:07:50 2022 +1100

    Rerun tests on changes to Makefile.in in any dir.

commit 3500f0405a3ab16b59a26f3508c4257a3fc3bce6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 3 23:04:08 2022 +1100

    Link libssh into compat tests.
    
    The cygwin compat code uses xmalloc, so add libssh.a so pick up that.

commit ec59effcf65b8a4c85d47ff5a271123259dd0ab8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 3 21:44:23 2022 +1100

    Fix compat regress to work with non-GNU make.

commit 73550a218e7dfbbd599534cbf856309bc924f6fd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 3 13:41:16 2022 +1100

    Increase selfhosted job timeout.
    
    The default job timeout of 360 (6h) is not enough to complete the
    regress tests for some of the slow VMs depending on the load on the host.
    Increase to 600 (10h).

commit db97d8d0b90c6ce52b94b153d6f8f5f7d3b11777
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 3 10:00:43 2022 +1100

    Only run opensslver tests if built with OpenSSL.

commit ba053709638dff2f6603df0c1f340352261d63ea
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 2 14:16:04 2022 +1100

    Add tests for OpenSSL 3.0.7 and LibreSSL 3.6.1.

commit edd24101c7e17d1a8f6576e1aaf62233b47ad6f5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 3 08:17:39 2022 +1100

    Run compat regress tests too.

commit fe88d67e7599b0bc73f6e4524add28d743e7f977
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 3 08:14:05 2022 +1100

    Compat tests need libcrypto.
    
    This was moved to CHANNELLIBS during the libs refactor.  Spotted by
    rapier at psc.edu.

commit 96b519726b7944eee3c23a54eee3d5c031ba1533
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 3 04:24:39 2022 +1100

    Include time.h when defining timegm.
    
    Fixes build on some platforms eg recent AIX.

commit da6038bd5cd55eb212eb2aec1fc8ae79bbf76156
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Nov 1 19:10:30 2022 +1100

    Always use compat getentropy.
    
    Have it call native getentropy and fall back as required.  Should fix
    issues of platforms where libc has getentropy but it is not implemented
    in the kernel.  Based on github PR#354 from simsergey.

commit 5ebe18cab6be3247b44c807ac145164010465b82
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 2 10:51:48 2022 +1100

    Check for sockaddr_in.sin_len.
    
    If found, set SOCK_HAS_LEN which is used in addr.c.  Should fix keyscan
    tests on platforms with this (eg old NetBSD).

commit a1febadf426536612c2734168d409147c392e7cf
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Oct 30 18:42:07 2022 +0000

    upstream: Use variable for diff options
    
    instead of unconditionally specifying "-rN". This will make life easier
    in -portable where not all diff's understand -N.
    
    OpenBSD-Regress-ID: 8b8a407115546be1c6d72d350b1e4f1f960d3cd3

commit f6d3ed9a8a9280cbb68d6a499850cfe810e92bd0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 31 05:13:02 2022 +1100

    OpenSSL dev branch is 302 not 320.
    
    While there, also accept 301 which it shat it was previously.

commit 25c8a2bbcc10c493d27faea57c42a6bf13fa51f2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 02:47:04 2022 +0000

    upstream: put sshkey_check_rsa_length() back in sshkey.c to unbreak
    
    OPENSSL=no builds
    
    OpenBSD-Commit-ID: 99eec58abe382ecd14b14043b195ee1babb9cf6e

commit 1192588546c29ceec10775125f396555ea71850f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 02:29:34 2022 +0000

    upstream: allow ssh-keyscan(1) to accept CIDR address ranges, e.g.
    
    ssh-keyscan 192.168.0.0/24
    
    If a CIDR range is passed, then it will be expanded to all possible
    addresses in the range including the all-0s and all-1s addresses.
    
    bz#976 feedback/ok markus@
    
    OpenBSD-Commit-ID: ce6c5211f936ac0053fd4a2ddb415277931e6c4b

commit 64af4209309461c79c39eda2d13f9d77816c6398
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 28 12:54:35 2022 +1100

    fix merge botch

commit 27267642699342412964aa785b98afd69d952c88
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 00:44:44 2022 +0000

    upstream: refactor sshkey_private_deserialize
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: f5ca6932fdaf840a5e8250becb38315a29b5fc9f

commit 2519a7077a9332f70935e5242ba91ee670ed6b87
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 00:44:17 2022 +0000

    upstream: refactor sshkey_private_serialize_opt()
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: 61e0fe989897901294efe7c3b6d670cefaf44cbd

commit 11a768adf98371fe4e43f3b06014024c033385d5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 00:43:30 2022 +0000

    upstream: refactor certify
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: 35d742992e223eaca3537e6fb3d3002c08eed4f6

commit 3fbc58bb249d967cc43ebdc554f6781bb73d4a58
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 00:43:08 2022 +0000

    upstream: refactor sshkey_sign() and sshkey_verify()
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: 368e662c128c99d05cc043b1308d2b6c71a4d3cc

commit a1deb6cdbbe6afaab74ecb08fcb62db5739267be
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 00:41:52 2022 +0000

    upstream: refactor sshkey_from_blob_internal()
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: 1f46c0cbb8060ee9666a02749594ad6658c8e283

commit 7d00799c935271ce89300494c5677190779f6453
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 00:41:17 2022 +0000

    upstream: refactor sshkey_from_private()
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: e5dbe7a3545930c50f70ee75c867a1e08b382b53

commit 262647c2e920492ca57f1b9320d74f4a0f6e482b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 00:39:29 2022 +0000

    upstream: factor out key generation
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: 5b4211bff4de8d9adb84bc72857a8c42c44e7ceb

commit 401c74e7dc15eab60540653d2f94d9306a927bab
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 00:38:58 2022 +0000

    upstream: refactor and simplify sshkey_read()
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: 0d93b7a56e31cd06a8bb0d2191d084ce254b0971

commit 591fed94e66a016acf87f4b7cd416ce812f2abe8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 00:37:24 2022 +0000

    upstream: factor out public key serialization
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: a3570c4b97290c5662890aea7328d87f55939033

commit 1e78844ae2b2dc01ba735d5ae740904c57e13685
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 00:36:31 2022 +0000

    upstream: factor out sshkey_equal_public()
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: 1368ba114cb37732fe6ec3d89c7e6d27ea6fdc94

commit 25de1c01a8b9a2c8ab9b1da22444a03e89c982de
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 00:35:40 2022 +0000

    upstream: begin big refactor of sshkey
    
    Move keytype data and some of the type-specific code (allocation,
    cleanup, etc) out into each key type's implementation. Subsequent
    commits will move more, with the goal of having each key-*.c file
    owning as much of its keytype's implementation as possible.
    
    lots of feedback + ok markus@
    
    OpenBSD-Commit-ID: 0f2b4334f73914344e9e5b3d33522d41762a57ec

commit 445363433ba20b8a3e655b113858c836da46a1cb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 24 22:43:36 2022 +0000

    upstream: Be more paranoid with host/domain names coming from the
    
    never write a name with bad characters to a known_hosts file.
    
    reported by David Leadbeater, ok deraadt@
    
    OpenBSD-Commit-ID: ba9b25fa8b5490b49398471e0c9657b0cbc7a5ad

commit 7190154de2c9fe135f0cc1ad349cb2fa45152b89
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 24 21:52:50 2022 +0000

    upstream: regress test for unmatched glob characters; fails before
    
    previous commit but passes now. bz3488; prodded by dtucker@
    
    OpenBSD-Regress-ID: 0cc5cc9ea4a6fd170dc61b9212f15badaafb3bbd

commit a4821a592456c3add3cd325db433110cdaaa3e5c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 24 21:51:55 2022 +0000

    upstream: when scp(1) is using the SFTP protocol for transport (the
    
    default), better match scp/rcp's handling of globs that don't match the
    globbed characters but do match literally (e.g. trying to transfer
    "foo.[1]").
    
    Previously scp(1) in SFTP mode would not match these pathnames but
    legacy scp/rcp mode would.
    
    Reported by Michael Yagliyan in bz3488; ok dtucker@
    
    OpenBSD-Commit-ID: d8a3773f53015ba811fddba7473769a2fd343e11

commit 18376847b8043ba967eabbe23692ef74c9a3fddc
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Thu Oct 13 09:09:28 2022 +0000

    upstream: use correct type with sizeof ok djm@
    
    OpenBSD-Commit-ID: d6c882c2e8a42ff831a5b3cbc2c961ecb2dd6143

commit 4a4883664d6b4e9e4e459a8cdc16bd8d4b735de9
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Oct 7 06:00:58 2022 +0000

    upstream: ssh-agent.1: - use Nm not Xr for self-ref - while here,
    
    wrap a long line
    
    ssh-agent.c:
    - add -O to usage()
    
    OpenBSD-Commit-ID: 855dac4695cef22e96d69c53436496bc408ca389

commit 9fd2441113fce2a83fc7470968c3b27809cc7f10
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 7 04:06:26 2022 +0000

    upstream: document "-O no-restrict-websafe"; spotted by Ross L
    
    Richardson
    
    OpenBSD-Commit-ID: fe9eaa50237693a14ebe5b5614bf32a02145fe8b

commit 614252b05d70f798a0929b1cd3d213030ad4d007
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 18 06:29:16 2022 +1100

    OpenSSL dev branch now identifies as 3.2.0.

commit 195e5a65fd793a738ea8451ebfdd1919db5aff3e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 17 09:41:47 2022 +1100

    revert c64b62338b4 and guard POLL* defines instead
    
    c64b62338b4 broke OSX builds, which do have poll.h but lack ppoll(2)
    Spotted by dtucker

commit bc2e480d99613bd59720edae244d1764636544c4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 14 14:52:22 2022 +1100

    undef _get{short,long} before redefining

commit 5eb796a369c64f18d55a6ae9b1fa9b35eea237fb
Author: Harmen Stoppels <harmenstoppels@gmail.com>
Date:   Thu Oct 13 16:08:46 2022 +0200

    Fix snprintf configure test for clang 15
    
    Clang 15 -Wimplicit-int defaults to an error in C99 mode and above.
    A handful of tests have "main(..." and not "int main(..." which caused
    the tests to produce incorrect results.

commit c64b62338b46ffa08839f05f21ad69fa6234dc17
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 10 12:32:43 2022 +1100

    skip bsd-poll.h if poll.h found; ok dtucker

commit 5ee2b8ccfcf4b606f450eb0ff2305e311f68b0be
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 6 22:42:37 2022 +0000

    upstream: honour user's umask if it is more restrictive then the ssh
    
    default (022); based on patch from Alex Henrie, ok dtucker@ deraadt@
    
    OpenBSD-Commit-ID: fe1b9e15fc9a4f49fc338e848ce14d8727abe82d

commit a75cffc2700cebd3e2dd9093f7f7388d2be95cb7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 7 03:54:56 2022 +1100

    Add LibreSSL 3.6.0 to test suite.
    
    While there, bump OpenSSL to latest 1.1.1q release.

commit fcc0f0c0e96a30076683fea9a7c9eedc72931742
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 6 21:18:16 2022 +1100

    Add 9.1 branch to CI status page.

commit ef211eee63821d894a8bf81f22bfba9f6899d0fe
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 4 23:20:23 2022 +1100

    Test commits to all branches of portable.
    
    Only test OpenBSD upstream on commits to master since that's what it
    tracks.

commit fe646de03cafb6593ff4e4954bca9ec4b4b753a8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 5 03:47:26 2022 +1100

    whitespace at EOL

commit a6e1852d10c63a830196e82168dadd957aaf28ec
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 5 03:40:01 2022 +1100

    mention libfido2 autodetection

commit 7360c2c206f33d309edbaf64036c96fadf74d640
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 5 03:37:36 2022 +1100

    remove mention of --with-security-key-builtin
    
    it is enabled by default when libfido2 is installed

commit 0ffb46f2ee2ffcc4daf45ee679e484da8fcf338c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 4 01:51:42 2022 +1100

    update .depend

commit 657e676ff696c7bb787bffb0e249ea1be3b474e1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 4 01:45:52 2022 +1100

    update release notes URL

commit f059da2b29840c0f048448809c317ce2ae014da7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 4 01:45:41 2022 +1100

    crank versions in RPM spec files

commit b51f3f172d87cbdb80ca4eb7b2149e56a7647557
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 26 22:18:40 2022 +0000

    upstream: openssh-9.1
    
    OpenBSD-Commit-ID: 5a467b2ee81da01a86adf1ad93b62b1728494e56

commit 4cf8d0c0f3030f594a238bab21a0695735515487
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Sep 21 22:26:50 2022 +0000

    upstream: Fix typo. From AlexanderStohr via github PR#343.
    
    OpenBSD-Commit-ID: a134c9b4039e48803fc6a87f955b0f4a03181497

commit 8179fed3264d5919899900ed8881d5f9bb57ca33
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 19 21:39:16 2022 +0000

    upstream: add RequiredRSASize to the list of keywords accepted by
    
    -o; spotted by jmc@
    
    OpenBSD-Commit-ID: fe871408cf6f9d3699afeda876f8adbac86a035e

commit 5f954929e9f173dd1e279e07d0e8b14fa845814d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 19 20:59:34 2022 +1000

    no need for glob.h here
    
    it also causes portability problems

commit 03d94a47207d58b3db37eba4f87eb6ae5a63168a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 19 20:59:04 2022 +1000

    avoid Wuninitialized false positive in gcc-12ish

commit 9d952529113831fb3071ab6e408d2726fd72e771
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 19 10:46:00 2022 +0000

    upstream: use users-groups-by-id@openssh.com sftp-server extension
    
    (when available) to fill in user/group names for directory listings.
    Implement a client-side cache of see uid/gid=>user/group names. ok markus@
    
    OpenBSD-Commit-ID: f239aeeadfa925a37ceee36ee8b256b8ccf4466e

commit 8ff680368b0bccf88ae85d4c99de69387fbad7a6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 19 10:43:12 2022 +0000

    upstream: sftp client library support for
    
    users-groups-by-id@openssh.com; ok markus@
    
    OpenBSD-Commit-ID: ddb2f33a2da6349a9a89a8b5bcb9ca7c999394de

commit 488f6e1c582212c2374a4bf8cd1b703d2e70fb8b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 19 10:41:58 2022 +0000

    upstream: extend sftp-common.c:extend ls_file() to support supplied
    
    user/group names; ok markus@
    
    OpenBSD-Commit-ID: c70c70498b1fdcf158531117e405b6245863bfb0

commit 74b77f7497dba3a58315c8f308883de448078057
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 19 10:40:52 2022 +0000

    upstream: sftp-server(8): add a "users-groups-by-id@openssh.com"
    
    extension request that allows the client to obtain user/group names that
    correspond to a set of uids/gids.
    
    Will be used to make directory listings more useful and consistent
    in sftp(1).
    
    ok markus@
    
    OpenBSD-Commit-ID: 7ebabde0bcb95ef949c4840fe89e697e30df47d3

commit 231a346c0c67cc7ca098360f9a554fa7d4f1eddb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 19 08:49:50 2022 +0000

    upstream: better debugging for connect_next()
    
    OpenBSD-Commit-ID: d16a307a0711499c971807f324484ed3a6036640

commit 1875042c52a3b950ae5963c9ca3774a4cc7f0380
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Sep 17 10:34:29 2022 +0000

    upstream: Add RequiredRSASize for sshd(8); RSA keys that fall
    
    beneath this limit will be ignored for user and host-based authentication.
    
    Feedback deraadt@ ok markus@
    
    OpenBSD-Commit-ID: 187931dfc19d51873df5930a04f2d972adf1f7f1

commit 54b333d12e55e6560b328c737d514ff3511f1afd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Sep 17 10:33:18 2022 +0000

    upstream: add a RequiredRSASize for checking RSA key length in
    
    ssh(1). User authentication keys that fall beneath this limit will be
    ignored. If a host presents a host key beneath this limit then the connection
    will be terminated (unfortunately there are no fallbacks in the protocol for
    host authentication).
    
    feedback deraadt, Dmitry Belyavskiy; ok markus@
    
    OpenBSD-Commit-ID: 430e339b2a79fa9ecc63f2837b06fdd88a7da13a

commit 07d8771bacfefbcfb37fa8a6dc6103bcc097e0ab
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Sep 17 10:30:45 2022 +0000

    upstream: Add a sshkey_check_rsa_length() call for checking the
    
    length of an RSA key; ok markus@
    
    OpenBSD-Commit-ID: de77cd5b11594297eda82edc594b0d32b8535134

commit 3991a0cf947cf3ae0f0373bcec5a90e86a7152f5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Sep 17 10:11:29 2022 +0000

    upstream: actually hook up restrict_websafe; the command-line flag
    
    was never actually used. Spotted by Matthew Garrett
    
    OpenBSD-Commit-ID: 0b363518ac4c2819dbaa3dfad4028633ab9cdff1

commit 30b2a7e4291fb9e357f80a237931ff008d686d3b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 16 06:55:37 2022 +0000

    upstream: correct error value
    
    OpenBSD-Commit-ID: 780efcbad76281f11f14b2a5ff04eb6db3dfdad4

commit ac1ec9545947d9f9657259f55d04cb49d3a94c8a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 16 03:33:14 2022 +0000

    upstream: sftp: Be a bit more clever about completions
    
    There are commands (e.g. "get" or "put") that accept two
    arguments, a local path and a remote path. However, the way
    current completion is written doesn't take this distinction into
    account and always completes remote or local paths.
    
    By expanding CMD struct and "cmds" array this distinction can be
    reflected and with small adjustment to completer code the correct
    path can be completed.
    
    By Michal Privoznik, ok dtucker@
    
    OpenBSD-Commit-ID: 1396d921c4eb1befd531f5c4a8ab47e7a74b610b

commit 590db83384f9d99fc51c84505792d26d1ef60df9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 16 03:13:34 2022 +0000

    upstream: sftp: Don't attempt to complete arguments for
    
    non-existent commands
    
    If user entered a non-existent command (e.g. because they made a
    typo) there is no point in trying to complete its arguments. Skip
    calling complete_match() if that's the case.
    
    From Michal Privoznik
    
    OpenBSD-Commit-ID: cf39c811a68cde2aeb98fc85addea4000ef6b07a

commit ff9809fdfd1d9a91067bb14a77d176002edb153c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 14 00:14:37 2022 +0000

    upstream: sk_enroll: never drop SSH_SK_USER_VERIFICATION_REQD flag
    
    from response
    
    Now that all FIDO signing calls attempt first without PIN and then
    fall back to trying PIN only if that attempt fails, we can remove the
    hack^wtrick that removed the UV flag from the keys returned during
    enroll.
    
    By Corinna Vinschen
    
    OpenBSD-Commit-ID: 684517608c8491503bf80cd175425f0178d91d7f

commit 940dc10729cb5a95b7ee82c10184e2b9621c8a1d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 14 00:13:13 2022 +0000

    upstream: a little extra debugging
    
    OpenBSD-Commit-ID: edf1601c1d0905f6da4c713f4d9cecc7d1c0295a

commit 4b5f91cb959358141181b934156513fcb8a6c1e3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 14 00:02:03 2022 +0000

    upstream: ssh-agent: attempt FIDO key signing without PIN and use
    
    the error to determine whether a PIN is required and prompt only if
    necessary. from Corinna Vinschen
    
    OpenBSD-Commit-ID: dd6be6a0b7148608e834ee737c3479b3270b00dd

commit 113523bf0bc33600b07ebb083572c8c346b6fdf4
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sun Sep 11 06:38:11 2022 +0000

    upstream: .Li -> .Vt where appropriate; from josiah frentsos,
    
    tweaked by schwarze
    
    ok schwarze
    
    OpenBSD-Commit-ID: 565046e3ce68b46c2f440a93d67c2a92726de8ed

commit 86af013b56cecb5ee58ae0bd9d495cd586fc5918
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Sat Sep 10 08:50:53 2022 +0000

    upstream: fix repeated words ok miod@ jmc@
    
    OpenBSD-Commit-ID: 6765daefe26a6b648cc15cadbbe337596af709b7

commit 0ba39b93b326a7d5dfab776cc9b9d326161a9b16
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 9 03:31:42 2022 +0000

    upstream: notifier_complete(NULL, ...) is a noop, so no need to test
    
    that ctx!=NULL; from Corinna Vinschen
    
    OpenBSD-Commit-ID: ade2f2e9cc519d01a586800c25621d910bce384a

commit be197635329feb839865fdc738e34e24afd1fca8
Author: Sam James <sam@gentoo.org>
Date:   Thu Sep 8 02:49:29 2022 +0100

    openbsd-compat/bsd-asprintf: add <stdio.h> include for vsnprintf
    
    Fixes the following build failure with Clang 15 on musl:
    ```
    bsd-asprintf.c:51:8: error: call to undeclared library function 'vsnprintf' with type 'int (char *, unsigned long, const char *, struct __va_list_tag *)'; ISO C99 and laterclang -O2 -pipe -fdiagnostics-color=always -frecord-gcc-switches -pipe -Wunknown-warning-option -Qunused-arguments -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-result -Wmisleading-indentation -Wbitwise-instead-of-logical -fno-strict-aliasing -mretpoline  -ftrapv -fzero-call-used-regs=all -fno-builtin-memset -fstack-protector-strong -fPIE   -I. -I.  -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -DSSHDIR=\"/etc/ssh\" -D_PATH_SSH_PROGRAM=\"/usr/bin/ssh\" -D_PATH_SSH_ASKPASS_DEFAULT=\"/usr/lib/misc/ssh-askpass\" -D_PATH_SFTP_SERVER=\"/usr/lib/misc/sftp-server\" -D_PATH_SSH_KEY_SIGN=\"/usr/lib/misc/ssh-keysign\" -D_PATH_SSH_PKCS11_HELPER=\"/usr/lib/misc/ssh-pkcs11-helper\" -D_PATH_SSH_SK_HELPER=\"/usr/lib/misc/ssh-sk-helper\" -D_PATH_SSH_PIDDIR=\"/run\" -D_PATH_PRIVSEP_CHROOT_DIR=\"/var/empty\" -DHAVE_CONFIG_H -c cipher-aes.c -o cipher-aes.o
     do not support
          implicit function declarations [-Wimplicit-function-declaration]
            ret = vsnprintf(string, INIT_SZ, fmt, ap2);
                  ^
    bsd-asprintf.c:51:8: note: include the header <stdio.h> or explicitly provide a declaration for 'vsnprintf'
    1 error generated.
    ```

commit 6cb6f660bb35f77a0456dd2581ddf39c29398a5e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 2 16:43:27 2022 +1000

    Remove DEF_WEAK, it's already in defines.h.

commit ce39e7d8b70c4726defde5d3bc4cb7d40d131153
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 2 14:28:14 2022 +1000

    Resync arc4random with OpenBSD.
    
    This brings us up to current, including djm's random-reseeding change,
    as prompted by logan at cyberstorm.mu in bz#3467.  It brings the
    platform-specific hooks from LibreSSL Portable, simplified to match our
    use case.  ok djm@.

commit beaddde26f30e2195b8aa4f3193970e140e17305
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 2 14:20:04 2022 +1000

    Move OPENBSD ORIGINAL marker.
    
    Putting this after the copyright statement (which doesn't change)
    instead of before the version identifier (which does) prevents merge
    conflicts when resyncing changes.

commit c83e467ead67a8cb48ef4bec8085d6fb880a2ff4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 2 14:17:28 2022 +1000

    Remove arc4random_uniform from arc4random.c
    
    This was previously moved into its own file (matching OpenBSD) which
    prematurely committed in commit 73541f2.

commit 5f45c2395c60865e59fa44152ff1d003a128c5bc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 2 04:20:02 2022 +0000

    upstream: sk-usbhid: fix key_lookup() on tokens with built-in UV
    
    explicitly test whether the token performs built-in UV (e.g. biometric
    tokens) and enable UV in that case. From Pedro Martelletto via GHPR#388
    
    OpenBSD-Commit-ID: 007eb7e387d27cf3029ab06b88224e03eca62ccd

commit 03277a4aa49b80af541a3e691f264c0c0d8f9cec
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Aug 31 20:26:30 2022 +1000

    Move sftp from valgrind-2 to 3 to rebalance.

commit fcf5365da69c516817321ba89c3a91df98d098df
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 31 02:56:40 2022 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: c2bcbf93610d3d62ed206cdf9bf9ff98c6aaf232

commit e60136a3d7a223dd8e84ba8a6895bc3142360993
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 29 13:27:45 2022 +1000

    additional keys

commit 2b02dcb505288c462d1b5dd1ac04e603d01340eb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 29 13:23:43 2022 +1000

    cross-sign allowed_signers with PGP key
    
    Provides continuity of trust from legacy PGP release key to
    the SSHSIG signing keys that we will use henceforth for git
    signing.

commit 51b345f177ae981b8755f6bdf8358b1cc5e83d67
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Aug 27 21:49:27 2022 +1000

    Add libcrypt-devel to cygwin-release deps.
    
    Based on feedback from vinschen at redhat.com.

commit 9f81736cf16dd8dda1c8942f1973a5f80b8cd78c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Aug 27 09:37:40 2022 +1000

    Add Windows 2022 test targets.

commit 85e1a69243f12be8520438ad6a3cfdc0b7fcbb2d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 26 16:26:06 2022 +1000

    Add cygwin-release test target.
    
    This also moves the cygwin package install from the workflow file to
    setup_ci.sh so that we can install different sets of Cygwin packages
    for different test configs.

commit 92382dbe8bf9ea1225b16858f9b9b208c15c7e8d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 26 08:16:27 2022 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: a5d015efbfd228dc598ffdef612d2da3a579e5d8

commit 70a5de0a50e84d7250eb4e4537f765599f64c4af
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 26 08:12:56 2022 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: d297e4387935d4aef091c5e9432578c2e513f538

commit 3a683a19fd116ea15ebf8aa13d02646cceb302a9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 26 14:23:55 2022 +1000

    initial list of allowed signers

commit 6851f4b8c3fc1b3e1114c56106e4dc31369c8513
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 19 17:22:18 2022 +1000

    Install Cygwin packages based on OS not config.

commit f96480906893ed93665df8cdf9065865c51c1475
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 19 06:07:47 2022 +0000

    upstream: attemp FIDO key signing without PIN and use the error
    
    code returned to fall back only if necessary. Avoids PIN prompts for FIDO
    tokens that don't require them; part of GHPR#302
    
    OpenBSD-Commit-ID: 4f752aaf9f2e7c28bcaaf3d4f8fc290131bd038e

commit 5453333b5d28e313284cb9aae82899704103f98d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 19 05:53:28 2022 +0000

    upstream: remove incorrect check that can break enrolling a
    
    resident key (introduced in r1.40)
    
    OpenBSD-Commit-ID: 4cab364d518470e29e624af3d3f9ffa9c92b6f01

commit ff89b1bed80721295555bd083b173247a9c0484e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Aug 19 04:02:46 2022 +0000

    upstream: Strictly enforce the maximum allowed SSH2 banner size in
    
    ssh-keyscan and prevent a one-byte buffer overflow.  Patch from Qualys, ok
    djm@
    
    OpenBSD-Commit-ID: 6ae664f9f4db6e8a0589425f74cd0bbf3aeef4e4

commit 1b470b9036639cef4f32fb303bb35ea0b711178d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 19 15:18:09 2022 +1000

    Fix cygwin conditional steps.

commit fd6ee741ab16714b7035d60aca924123ba28135a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 19 15:12:57 2022 +1000

    Add a bit more debug output.

commit a9305c4c739f4d91a3d3a92c0b6d4949404a36c5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 12 15:08:47 2022 +1000

    Add Cygwin (on windows-2019) test target.
    
    In addition to installing the requisite Cygwin packages, we also need to
    explicitly invoke "sh" for steps that run other scripts since the runner
    environment doesn't understand #! paths.

commit 5062ad48814b06162511c4f5924a33d97b6b2566
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 19 03:06:30 2022 +0000

    upstream: double free() in error path; from Eusgor via GHPR333
    
    OpenBSD-Commit-ID: 39f35e16ba878c8d02b4d01d8826d9b321be26d4

commit 5a5c580b48fc6006bdfa731fc2f6d4945c2c0e4e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Aug 18 21:36:39 2022 +1000

    Check for perms to run agent-getpeereid test.
    
    Ubuntu 22.04 defaults to private home dirs which prevents "nobody"
    running ssh-add during the agent-getpeereid test.  Check for this and
    add the necessary permissions.

commit cd06a76b7ccc706e2bb4f1cc4aa9e9796a28a812
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 17 16:04:16 2022 +1000

    on Cygwin, prefer WinHello FIDO device
    
    If no FIDO device was explictly specified, then prefer the
    windows://hello FIDO device. An exception to this is when
    probing resident FIDO keys, in which case hardware FIDO
    devices are preferred.

commit 47f72f534ac5cc2cd3027675a3df7b00a8f77575
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 17 06:01:57 2022 +0000

    upstream: add an extra flag to sk_probe() to indicate whether we're
    
    probing for a FIDO resident key or not. Unused here, but will make like
    easier for portable
    
    OpenBSD-Commit-ID: 432c8ff70e270378df9dbceb9bdeaa5b43b5a832

commit edb0bcb3c79b16031dc87a8e57aecc3c4a3414f0
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Aug 16 20:24:08 2022 +0000

    upstream: use .Cm for "sign"; from josiah frentsos
    
    OpenBSD-Commit-ID: 7f80a53d54857ac6ae49ea6ad93c5bd12231d1e4

commit cccb011e130cbbac538b1689d10e4a067298df8b
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Thu Aug 11 20:19:35 2022 +0200

    Revert "check_sk_options: add temporary WinHello workaround"
    
    Cygwin now comes with libfido2 1.11.0, so this workaround
    isn't required anymore.
    
    This reverts commit 242c044ab111a37aad3b0775727c36a4c5f0102c.
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

commit 9468cd7cf9d989dfa2ac20e2a0268ba6e93bfa5a
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Thu Aug 11 20:18:17 2022 +0200

    fido_dev_is_winhello: return 0, not "false"
    
    "false" is not used anywhere in OpenSSH, so return 0 like
    everywhere else.
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

commit 730a80609472ee0451c99482d75c9c41f3ebc42d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 12 05:20:28 2022 +0000

    upstream: sftp-server: support home-directory request
    
    Add support to the sftp-server for the home-directory extension defined
    in draft-ietf-secsh-filexfer-extensions-00. This overlaps a bit with the
    existing expand-path@openssh.com, but uses a more official protocol name,
    and so is a bit more likely to be implemented by non-OpenSSH clients.
    
    From Mike Frysinger, ok dtucker@
    
    OpenBSD-Commit-ID: bfc580d05cc0c817831ae7ecbac4a481c23566ab

commit 5e820bf79ce3ce99ef7e98b0ab642b0a0a4f396c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 12 14:56:55 2022 +1000

    Replace deprecated ubuntu-18.04 runners with 22.04

commit 87b0d9c1b789d3ff958ec45df2ac912e24461bae
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Aug 11 22:48:23 2022 +1000

    Add a timegm implementation from Heimdal via Samba.
    
    Fixes build on (at least Solaris 10).

commit d0c4fa58594577994921b593f10037c5282597ca
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Aug 11 14:23:58 2022 +1000

    Rerun tests if any .github config file changes.

commit 113fe6c77ab43769fc61e953d07cb619fd7ea54b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Aug 11 13:33:51 2022 +1000

    Skip hostbased during Valgrind tests.
    
    Valgrind doesn't let ssh exec ssh-keysign (because it's setuid) so skip
    it during the Valgrind based tests.
    
    See https://bugs.kde.org/show_bug.cgi?id=119404 for a discussion of this
    (ironically there the problematic binary was ssh(1) back when it could
    still be setuid).

commit b98a42afb69d60891eb0488935990df6ee571c4d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 11 01:57:50 2022 +0000

    upstream: add some tests for parse_absolute_time(), including cases
    
    where it is forced to the UTC timezone. bz3468 ok dtucker
    
    OpenBSD-Regress-ID: ea07ca31c2f3847a38df028ca632763ae44e8759

commit ec1ddb72a146fd66d18df9cd423517453a5d8044
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 11 01:56:51 2022 +0000

    upstream: allow certificate validity intervals, sshsig verification
    
    times and authorized_keys expiry-time options to accept dates in the UTC time
    zone in addition to the default of interpreting them in the system time zone.
    YYYYMMDD and YYMMDDHHMM[SS] dates/times will be interpreted as UTC if
    suffixed with a 'Z' character.
    
    Also allow certificate validity intervals to be specified in raw
    seconds-since-epoch as hex value, e.g. -V 0x1234:0x4567890. This
    is intended for use by regress tests and other tools that call
    ssh-keygen as part of a CA workflow.
    
    bz3468 ok dtucker
    
    OpenBSD-Commit-ID: 454db1cdffa9fa346aea5211223a2ce0588dfe13

commit 4df246ec75751da7eb925e1880498300d8bda187
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Aug 11 10:23:55 2022 +1000

    Fix conditional for running hostbased tests.

commit 2580916e48721802220c61ce9e0df1297c00bc07
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 11 08:58:28 2022 +1000

    fix SANDBOX_SECCOMP_FILTER_DEBUG

commit fdbd5bf507fc271ff813714fab8a72ff2c6cb5ca
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Aug 10 17:35:52 2022 +1000

    Test hostbased auth on github runners.

commit 7e2f51940ba48a1c0fae1107801ea643fa83c971
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Aug 10 17:25:24 2022 +1000

    Rename our getentropy to prevent possible loops.
    
    Since arc4random seeds from getentropy, and we use OpenSSL for that
    if enabled, there's the possibility that if we build on a system that
    does not have getentropy then run on a system that does have it, then
    OpenSSL could end up calling our getentropy and getting stuck in a loop.
    Pointed out by deraadt@, ok djm@

commit 7a01f61be8d0aca0e975e7417f26371495fe7674
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 8 12:17:04 2022 +1000

    Actually put HAVE_STDINT_H around the stdint.h.

commit 73541f29f0b50480da6c20dceb7a7191bd8ea7d3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 8 10:30:34 2022 +1000

    Give unused param a name.
    
    Fixes builds on platforms that do have fido2 but don't have
    fido_dev_is_winhello.

commit 2a108c0ea960381bd9b14ee0d84e818a23df4482
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 5 05:01:40 2022 +0000

    upstream: don't prompt for FIDO passphrase before attempting to enroll
    
    the credential, just let the enroll operating fail and we'll attempt to get a
    PIN anyway. Might avoid some unneccessary PIN prompts.
    
    Part of GHPR#302 from Corinna Vinschen; ok dtucker@
    
    OpenBSD-Commit-ID: bd5342ffc353ee37d39617906867c305564d1ce2

commit 2886975c0ad9244e60dc5e4be34fde3aa573a4b5
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Fri Feb 11 14:33:41 2022 +0100

    sk_sign: set FIDO2 uv attribute explicitely for WinHello
    
    WinHello via libfido2 performs user verification by default.
    However, if we stick to that, there's no way to differentiate
    between keys created with or without "-O  verify-required".
    Set FIDO2 uv attribute explicitely to FIDO_OPT_FALSE, then check
    if user verification has been requested.
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

commit 242c044ab111a37aad3b0775727c36a4c5f0102c
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Tue Feb 15 11:28:08 2022 +0100

    check_sk_options: add temporary WinHello workaround
    
    Up to libfido 1.10.0, WinHello advertises "clientPin" rather
    than "uv" capability.  This is fixed in 1.11.0.  For the time
    being, workaround it here.
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

commit 78774c08cc4b4997382975b0f414a86e06b6780c
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Thu Feb 10 18:19:29 2022 +0100

    compat code for fido_dev_is_winhello()
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

commit 3d3a932a019aedfb891e0779bb4990cd5008a390
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 5 13:12:27 2022 +1000

    Factor out getrnd() and rename to getentropy().
    
    Factor out the arc4random seeding into its own file and change the
    interface to match getentropy.  Use native getentropy if available.
    This will make it easier to resync OpenBSD changes to arc4random.
    Prompted by bz#3467, ok djm@.

commit 9385d277b787403be9dfcb229cf372202496d2f3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Aug 4 18:55:48 2022 +1000

    Include CHANNEL and FIDO2 libs in configure output

commit 141535b904b6fba01724444f38193a8599201f82
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 1 11:09:26 2022 +0000

    upstream: avoid double-free in error path introduced in r1.70; report
    
    and fix based on GHPR#332 by v-rzh ok dtucker@
    
    OpenBSD-Commit-ID: 3d21aa127b1f37cfc5bdc21461db369a663a951f

commit dba7099ffcba3ca07b3946f017ba6a4c3158d9b1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 27 18:40:12 2022 +1000

    Remove deprecated MacOS 10.15 runners.

commit 722a56439aa5972c830e4a9a724cf52aff4a950a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 27 18:31:14 2022 +1000

    Move stale-configure check as early as possible.
    
    We added a check in Makefile to catch the case where configure needs to
    be rebuilt, however this did not happen until a build was attempted in
    which case all of the work done by configure was wasted.  Move this check
     to the start of configure to catch it as early as possible.  ok djm@

commit 099d6b56288b421ba38531d26dc1bd6bb685e311
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 22 10:47:19 2022 +1000

    Move libcrypto into CHANNELLIBS.
    
    This will result in sftp, sftp-server and scp no longer being linked
    against libcrypto.  ok djm@

commit 1bdf86725b77733bb5f17c54888b88a10b2f6538
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 22 10:45:47 2022 +1000

    Remove seed_rng calls from scp, sftp, sftp-server.
    
    These binaries don't use OpenSSL's random functions.  The next step
    will be to stop linking them against libcrypto.  ok djm@

commit d73f77b8cb9b422f1ac4facee7890aa10ff2bc21
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 22 09:51:51 2022 +1000

    Group libcrypto and PRNGD checks together.
    
    They're related more than the libcrypt or libiaf checks which are
    currently between them.  ok djm@

commit f117e372b3f42f2fbdb0a578d063b2609ab58e1f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 22 09:24:45 2022 +1000

    Do not link scp, sftp and sftp-server w/ zlib.
    
    Some of our binaries (eg sftp, sftp-server, scp) do not interact with
    the channels code and thus do use libraries such as zlib and libcrypto
    although they are linked with them.  This adds a CHANNELLIBS and starts
    by moving zlib into it, which means the aformentioned binaries are no
    longer linked against zlib.  ok djm@

commit 800c2483e68db38bd1566ff69677124be974aceb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jul 25 21:49:04 2022 +1000

    Remove workarounds for OpenSSL missing AES-CTR.
    
    We have some compatibility hacks that were added to support OpenSSL
    versions that do not support AES CTR mode.  Since that time, however,
    the minimum OpenSSL version that we support has moved to 1.0.1 which
    *does* have CTR, so this is no longer needed.  ok djm@

commit b7c56b65c12f51fe0dbae798d19c8f58224a5d95
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jul 25 21:43:00 2022 +1000

    Remove workarounds for OpenSSL missing AES-GCM.
    
    We have some compatibility hacks that were added to support OpenSSL
    versions that do not support AES GCM mode.  Since that time, however,
    the minimum OpenSSL version that we support has moved to 1.0.1 which
    *does* have GCM, so this is no longer needed.  ok djm@

commit 5a4a9f7a968fbf92cc1eac519c65638e79ae9f1f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 25 07:12:45 2022 +0000

    upstream: Restore missing "!" in TEST_SSH_ELAPSED_TIMES test.
    
    OpenBSD-Regress-ID: 38783f9676ec348c5a792caecee9a16e354b37b0

commit 0ff886be132299386cc29d87c2aa16ff68a1aa08
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jul 24 23:29:10 2022 +0000

    upstream: Test TEST_SSH_ELAPSED_TIMES for empty string not
    
    executable.  No-op on most platforms but should prevent warnings in -portable
    on systems that don't have 'date %s'.
    
    OpenBSD-Regress-ID: e39d79867b8065e33d0c5926fa1a31f85659d2a4

commit f69319ad8ad1dd50f90bbcf5912e11cc8ed3e037
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 23 14:38:22 2022 +1000

    Convert "have_prog" function into "which".
    
    "which" and its behaviour is not standardized, so convert the existing
    have_prog function into "which" so we can rely on it being available
    and what its semantics are.  Add a have_prog wrapper that maintains the
    existing behaviour.

commit ea7ecc2c3ae39fdf5c6ad97b7bc0b47a98847f43
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 23 14:36:38 2022 +1000

    Skip scp3 test if there's no scp on remote path.
    
    scp -3 ends up using the scp that's in the remote path and will fail if
    one is not available.  Based on a patch from rapier at psc.edu.

commit c46f6fed419167c1671e4227459e108036c760f8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 20 13:39:14 2022 +1000

    crank SSH_SK_VERSION_MAJOR in sk-dummy.so

commit f208e3b9ffb5ee76cf9c95df7ff967adc7f51c7d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 20 03:33:22 2022 +0000

    upstream: ssh-keygen: fix touch prompt, pin retries;
    
    part of GHPR329 from Pedro Martelletto
    
    OpenBSD-Commit-ID: 75d1005bd2ef8f29fa834c90d2684e73556fffe8

commit 8638a2ce7e90c8a51d9af3143404282126c524f8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 20 03:31:42 2022 +0000

    upstream: sk-usbhid: preserve error code returned by key_lookup()
    
    it conveys useful information, such as the supplied pin being wrong.
    
    Part of GHPR329 from Pedro Martelletto
    
    OpenBSD-Commit-ID: c0647eb9290f793add363d81378439b273756c1b

commit 9ab929ca2d820520327b41929372bcb9e261534c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 20 03:29:14 2022 +0000

    upstream: when enrolling a resident key on a security token, check
    
    if a credential with matching application and user ID strings already exists.
    if so, prompt the user for confirmation before overwriting the credential.
    
    patch from Pedro Martelletto via GHPR329
    
    NB. cranks SSH_SK_VERSION_MAJOR, so any third-party FIDO middleware
    implementations will need to adjust
    
    OpenBSD-Commit-ID: e45e9f1bf2b2f32d9850669e7a8dbd64acc5fca4

commit 5bcfc788b38d5b64e4c347bdc04bd9a01bbc36da
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 20 03:13:04 2022 +0000

    upstream: pull passphrase reading and confirmation into a separate
    
    function so it can be used for FIDO2 PINs; no functional change
    
    OpenBSD-Commit-ID: bf34f76b8283cc1d3f54633e0d4f13613d87bb2f

commit eb679e2959bdb15454eb94751930eb4c9110da94
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 15 21:31:48 2022 +1000

    Move vmshutdown to first step.
    
    If a previous run on a physical runner has failed to clean up, the next
    run will fail because it'll try to check out the code to a broken
    directory mount.  Make cleanup the first step.

commit 46b91b70ff3cb9c147e2875ef5dc609fd64c0c96
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 15 20:25:27 2022 +1000

    Rename bbone test target to ARM.

commit 751d22cdeffed9fe921db78eedc32a29f9e80510
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 15 13:37:29 2022 +1000

    Add AUDIT_ARCH_PPC to supported seccomp arches.
    
    Patch from dries.deschout at dodeco.eu.

commit a061792a6e8d235fc40a9b5d4c22a1762bb75a7b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 14 19:20:24 2022 +1000

    Remove unintended changes.
    
    I inadvertently included a couple of local changes with the OpenSSL
    3.0.4 change.  Revert, anything that should be there will be committed
    separately.

commit 527cb43fa1b4e55df661feabbac51b8e608b6519
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 14 11:22:08 2022 +1000

    Return ERANGE from getcwd() if buffer size is 1.
    
    If getcwd() is supplied a buffer size of exactly 1 and a path of "/", it
    could result in a nul byte being written out of array bounds.  POSIX says
    it should return ERANGE if the path will not fit in the available buffer
    (with terminating nul). 1 byte cannot fit any possible path with its nul,
    so immediately return ERANGE in that case.
    
    OpenSSH never uses getcwd() with this buffer size, and all current
    (and even quite old) platforms that we are currently known to work
    on have a native getcwd() so this code is not used on those anyway.
    Reported by Qualys, ok djm@

commit 36857fefd8849c4b0e877cfd9d1eb22f79b76650
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 14 10:02:35 2022 +1000

    Split README.platform into its own line.
    
    README.platform has general platform-specific information, having it
    following text about FIDO2 on the same line could imply that it only
    has information about FIDO2.

commit 00a496c6c14f2d41f2a9365714d494dd5f3aac9f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 14 09:56:01 2022 +1000

    Clarify README.md text.
    
    Clarify the text about the implications of building without OpenSSL, and
    prefix the "configure --help" example command with a "./" so it's likely
    to work as-is in more shells.  From bz#3461.

commit f40b52f21fbc52eb513279168a49d3285c65256c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 12 19:48:44 2022 +1000

    Remove special casing of crypt().
    
    Configure goes to some lengths to pick crypt() from either libcrypt
    or OpenSSL's libcrypto because they can more or less featureful (eg
    supporting md5-style passwords).
    
    OpenSSL removed its crypt() interface in 2002:
    https://github.com/openssl/openssl/commit/69deec58 so these hijinks
    should no longer be necessary.  This also only links sshd with libcrypt
    which is the only thing that needs it.  ok djm@

commit 76f4e48631d7b09fb243b47d7b393d100d3741b7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 13 13:17:47 2022 +1000

    Only refuse to use OpenSSL 3.0.4 on x86_64.
    
    The potential RCE only impacts x86_64, so only refuse to use it if we're
    targetting a potentially impacted architecture.  ok djm@

commit e75bbc1d88491fa85e61b2cc8783d4bbd00cd131
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 12 14:37:15 2022 +1000

    Capture stderr output from configure.

commit d9eaea4bea6271bcee6a2b9428f1271faf2d033b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 12 12:54:49 2022 +1000

    Refuse to use OpenSSL 3.0.4 due to potential RCE.
    
    OpenSSL has a potential RCE in its RSA implementation (CVE-2022-2274)
    so refuse to use that specific version.

commit fb2f3a61bf3d28fff285524535f7ffcd177c9235
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 12 12:54:24 2022 +1000

    Move unset to before we set anything.

commit c483a5c0fb8e8b8915fad85c5f6113386a4341ca
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 6 11:52:54 2022 +1000

    Test against openssl-3.0.5.

commit 669a56bcfe73f8b985f2bba476ba834d55253acf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 5 18:35:53 2022 +1000

    Update sanitizer test targets:
    
     - remove clang-sanitize-memory for now.  It takes so long that the test
       times out.
     - add gcc sanitize-address and sanitize-undefined test targets.

commit 48cc68b69118b3ce8d07fd4f82e00d58667d5379
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 5 16:23:28 2022 +1000

    Add GCC address sanitizer build/test.

commit 55c60bdd39b82457e92efa77da8d16cfa6a49391
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 5 12:02:33 2022 +1000

    Move sanitizer logs into regress for collection.

commit 35ef2b3b6ef198f8574904a45780487ec2f17858
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 4 09:10:31 2022 +0000

    upstream: Add TEST_REGRESS_CACHE_DIR.
    
    If set, it is used to cache regress test names that have succeeded and
    skip those on a re-run.
    
    OpenBSD-Regress-ID: a7570dd29a58df59f2cca647c3c2ec989b49f247

commit 7394ed80c4de8b228a43c8956cf2fa1b9c6b2622
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jul 3 21:46:44 2022 +1000

    Add clang sanitizer tests.

commit bfce0e66b6017a9bfab450b9dc7d4b16f90de817
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jul 3 18:14:09 2022 +1000

    Skip all rlimit tests when sandboxing disabled.
    
    The rlimit tests can hang when being run with some compiler sanitizers
    so skip all of them if sandbox=no.

commit 6208d611520f9ea94d5369f9da404b709930029d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jul 3 17:54:49 2022 +1000

    Move checks for pollfd.fd and nfds_t.
    
    Move the checks for struct pollfd.fd and nfds_t to before the sandboxing
    checks.  This groups all the sandbox checks together so we can skip them
    all when sandboxing is disabled.

commit 322964f8f2e9c321e77ebae1e4d2cd0ccc5c5a0b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 1 05:08:23 2022 +0000

    upstream: Remove leftover line.
    
    Remove extra line leftover from merge conflict. ok djm@
    
    OpenBSD-Commit-ID: 460e2290875d7ae64971a7e669c244b1d1c0ae2e

commit 7ec81daad0e03a64e8d91c5590960c48c1a899a3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 1 04:45:50 2022 +0000

    upstream: use consistent field names (s/char/byte)
    
    in format description
    
    OpenBSD-Commit-ID: 3de33572733ee7fcfd7db33d37db23d2280254f0

commit 32e82a392d9f263485effdd606ff5862d289a4a0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 1 13:55:19 2022 +1000

    Skip select+rlimit check if sandboxing is disabled
    
    It's not needed in that case, and the test can fail when being built
    with some compiler memory sanitizer flags.  bz#3441

commit 4be7184ebe2a2ccef175983517a35ee06766e1b4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 1 03:52:57 2022 +0000

    upstream: bump up loglevel from debug to info when unable to open
    
    authorized keys/principals file for errno != ENOENT; bz2042 ok dtucker
    
    OpenBSD-Commit-ID: e79aa550d91ade6a80f081bda689da24c086d66b

commit 6c31ba10e97b6953c4f325f526f3e846dfea647a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 1 03:39:44 2022 +0000

    upstream: Don't leak the strings allocated by order_hostkeyalgs()
    
    and list_hostkey_types() that are passed to compat_pkalg_proposal(). Part of
    github PR#324 from ZoltanFridrich, ok djm@
    
    This is a roll-forward of the previous rollback now that the required
    changes in compat.c have been done.
    
    OpenBSD-Commit-ID: c7cd93730b3b9f53cdad3ae32462922834ef73eb

commit 486c4dc3b83b4b67d663fb0fa62bc24138ec3946
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 1 03:35:45 2022 +0000

    upstream: Always return allocated strings from the kex filtering so
    
    that we can free them later.  Fix one leak in compat_kex_proposal.  Based on
    github PR#324 from ZoltanFridrich with some simplications by me. ok djm@
    
    OpenBSD-Commit-ID: 9171616da3307612d0ede086fd511142f91246e4

commit 96faa0de6c673a2ce84736eba37fc9fb723d9e5c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 1 00:36:30 2022 +0000

    upstream: ignore SIGPIPE earlier in main(), specifically before
    
    muxclient() which performs operations that could cause one; Reported by Noam
    Lewis via bz3454, ok dtucker@
    
    OpenBSD-Commit-ID: 63d8e13276869eebac6d7a05d5a96307f9026e47

commit 33efac790f6b09d54894ba6c3e17dfb08b6fc7e1
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Jun 28 06:09:14 2022 +0000

    upstream: reflect the update to -D arg name in usage();
    
    OpenBSD-Commit-ID: abdcde4f92b1ef094ae44210ee99d3b0155aad9c

commit c71a1442d02f0a3586109dfe2cb366de36dee08e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jun 29 18:28:47 2022 +1000

    Update OpenSSL tests to the most recent releases.

commit 2a822f29300b2de7335fbff65f0b187a0c582304
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 27 21:41:55 2022 +0000

    upstream: allow arguments to sftp -D option, e.g. sftp -D
    
    "/usr/libexec/sftp-server -el debug3"
    
    ok markus@
    
    OpenBSD-Commit-ID: 5a002b9f3a7aef2731fc0ffa9c921cf15f38ecce

commit 2369a2810187e08f2af5d58b343956062fb96ee8
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 24 10:45:06 2022 +0000

    upstream: Roll back previous KEX changes as they aren't safe until
    
    compat_pkalg_proposal and friends always allocate their returned strings.
    Reported by Qualys.
    
    OpenBSD-Commit-ID: 1c7a88a0d5033f42f88ab9bec58ef1cf72c81ad0

commit 646686136c34c2dbf6a01296dfaa9ebee029386d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 24 04:37:00 2022 +0000

    upstream: Don't leak the strings allocated by order_hostkeyalgs()
    
    and list_hostkey_types() that are passed to compat_pkalg_proposal(). Part of
    github PR#324 from ZoltanFridrich, ok djm@
    
    OpenBSD-Commit-ID: b2f6e5f60f2bba293b831654328a8a0035ef4a1b

commit 193c6d8d905dde836b628fc07a7b9cf2d347e2a3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jun 25 12:16:15 2022 +1000

    Zero out LIBFIDO2 when SK support not usable.
    
    Prevents us from trying to link them into ssh-sk-helper and failing to
    build.

commit 40f5d849d25c60b4ae21261e78484d435f5cfd51
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jun 25 11:47:28 2022 +1000

    Disable SK support if FIDO libs not found.

commit 5fd922ade1b25880fe8a8249f5c0385e413108f9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 24 14:43:54 2022 +1000

    fix broken case statement in previous

commit f51423bdaf0008d46b6af082bcfd7a22a87375f0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 24 14:40:42 2022 +1000

    request 1.1x API compatibility for OpenSSL >=3.x
    
    idea/patch from Pedro Martelletto via GHPR#322; ok dtucker@

commit 455cee8d6c2e4c48c5af9faead3599c49948411e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 24 04:27:14 2022 +0000

    upstream: make it clear that RekeyLimit applies to both transmitted
    
    and received data. GHPR#328 from Jan Pazdziora
    
    OpenBSD-Commit-ID: d180a905fec9ff418a75c07bb96ea41c9308c3f9

commit 17904f05802988d0bb9ed3c8d1d37411e8f459c3
Author: tobhe@openbsd.org <tobhe@openbsd.org>
Date:   Tue Jun 21 14:52:13 2022 +0000

    upstream: Make sure not to fclose() the same fd twice in case of an
    
    error.
    
    ok dtucker@
    
    OpenBSD-Commit-ID: e384c4e05d5521e7866b3d53ca59acd2a86eef99

commit f29d6cf98c25bf044079032d22c1a57c63ab9d8e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jun 18 02:17:16 2022 +0000

    upstream: Don't attempt to fprintf a null identity comment. From
    
    Martin Vahlensieck via tech@.
    
    OpenBSD-Commit-ID: 4c54d20a8e8e4e9912c38a7b4ef5bfc5ca2e05c2

commit ad1762173bb38716a106e8979806149fd0f2753e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 17 01:00:03 2022 +0000

    upstream: Log an error if pipe() fails while accepting a
    
    connection.  bz#3447, from vincent-openssh at vinc17 net, ok djm@
    
    OpenBSD-Commit-ID: 9d59f19872b94900a5c79da2d57850241ac5df94

commit 9c59e7486cc8691401228b43b96a3edbb06e0412
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 24 14:20:43 2022 +1000

    automatically enable built-in FIDO support
    
    If libfido2 is found and usable, then enable the built-in
    security key support unless --without-security-key-builtin
    was requested.
    
    ok dtucker@

commit 7d25b37fb2a5ff4dadabcbdac6087a97479434f5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 24 13:46:39 2022 +1000

    fix possible NULL deref when built without FIDO
    
    Analysis/fix from kircher in bz3443; ok dtucker@

commit f5ba85daddfc2da6a8dab6038269e02c0695be44
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 15 16:08:25 2022 +0000

    upstream: make sure that UseDNS hostname lookup happens in the monitor
    
    and not in the pledge(2)'d unprivileged process; fixes regression caused by
    recent refactoring spotted by henning@
    
    OpenBSD-Commit-ID: a089870b95101cd8881a2dff65b2f1627d13e88d

commit acb2059febaddd71ee06c2ebf63dcf211d9ab9f2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 3 04:47:21 2022 +0000

    upstream: move auth_openprincipals() and auth_openkeyfile() over to
    
    auth2-pubkeyfile.c too; they make more sense there.
    
    OpenBSD-Commit-ID: 9970d99f900e1117fdaab13e9e910a621b7c60ee

commit 3d9b0845f34510111cc693bb99a667662ca50cd8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 3 04:31:54 2022 +0000

    upstream: test setenv in both client and server, test first-match-wins
    
    too
    
    OpenBSD-Regress-ID: 4c8804f9db38a02db480b9923317457b377fe34b

commit 22e1a3a71ad6d108ff0c5f07f93c3fcbd30f8b40
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 3 04:30:46 2022 +0000

    upstream: Make SetEnv directives first-match-wins in both
    
    sshd_config and sshd_config; previously if the same name was reused then the
    last would win (which is the opposite to how the config is supposed to work).
    
    While there, make the ssh_config parsing more like sshd_config.
    
    bz3438, ok dtucker
    
    OpenBSD-Commit-ID: 797909c1e0262c0d00e09280459d7ab00f18273b

commit 38ed6c57e9e592c08e020fa6e82b45b4e1040970
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 3 04:00:15 2022 +0000

    upstream: Add missing *-sk types to ssh-keyscan manpage. From
    
    skazi0 via github PR#294.
    
    OpenBSD-Commit-ID: fda2c869cdb871f3c90a89fb3f985370bb5d25c0

commit ea97ec98c41ec2b755dfab459347db674ff9a5de
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 3 03:21:09 2022 +0000

    upstream: Add period at end of "not known by any other names"
    
    message.  github PR#320 from jschauma, ok djm@
    
    OpenBSD-Commit-ID: bd60809803c4bfd3ebb7c5c4d918b10e275266f2

commit 88e376fcd67478ad1660d94bc73ab348ac9f4527
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 3 03:17:42 2022 +0000

    upstream: ssh-keygen -A: do not generate DSA keys by default.
    
    Based on github PR#303 from jsegitz with man page text from jmc@, ok markus@
    djm@
    
    OpenBSD-Commit-ID: 5c4c57bdd7063ff03381cfb6696659dd3f9f5b9f

commit 6b3fb624675082a1e5aa615d1b8479873d8b5731
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Tue May 31 14:05:12 2022 +0000

    upstream: ssh-keygen: implement "verify-required" certificate option.
    
    This was already documented when support for user-verified FIDO
    keys was added, but the ssh-keygen(1) code was missing.
    
    ok djm@
    
    OpenBSD-Commit-ID: f660f973391b593fea4b7b25913c9a15c3eb8a06

commit b7f86ffc301be105bba9a3e0618b6fab3ae379bd
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat May 28 05:57:56 2022 +0000

    upstream: keywords ref ssh_config.5;
    
    from caspar schutijser
    
    OpenBSD-Commit-ID: f146a19d7d5c9374c3b9c520da43b2732d7d1a4e

commit dc7bc52372f2744fa39191577be5306ee57aacd4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 30 09:29:09 2022 +1000

    fix some bugs in the fuzzer

commit 1781f507c113667613351c19898efaf1e311a865
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 27 18:19:48 2022 +1000

    Test against OpenSSL 1.1.1o and 3.0.3.

commit c53906e0c59e569691b4095d3e8db79cf78fa058
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 27 18:18:31 2022 +1000

    Test against LibreSSL 3.5.3.

commit 9b3ad432ad2f19319bcc089370e356c6315d682f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 27 17:00:43 2022 +1000

    fuzzer for authorized_keys parsing
    
    mostly redundant to authopt_fuzz, but it's sensitive code so IMO it
    makes sense to test this layer too

commit c83d8c4d6f3ccceef84d46de107f6b71cda06359
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 27 05:02:46 2022 +0000

    upstream: split the low-level file handling functions out from
    
    auth2-pubkey.c
    
    Put them in a new auth2-pubkeyfile.c to make it easier to refer to them
    (e.g. in unit/fuzz tests) without having to refer to everything else
    pubkey auth brings in.
    
    ok dtucker@
    
    OpenBSD-Commit-ID: 3fdca2c61ad97dc1b8d4a7346816f83dc4ce2217

commit 3b0b142d2a0767d8cd838e2f3aefde8a0aaa41e1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 27 05:01:25 2022 +0000

    upstream: refactor authorized_keys/principals handling
    
    remove "struct ssh *" from arguments - this was only used to pass the
    remote host/address. These can be passed in instead and the resulting
    code is less tightly coupled to ssh_api.[ch]
    
    ok dtucker@
    
    OpenBSD-Commit-ID: 9d4373d013edc4cc4b5c21a599e1837ac31dda0d

commit 2c334fd36f80cb91cc42e4b978b10aa35e0df236
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 27 04:29:40 2022 +0000

    upstream: f sshpkt functions fail, then password is not cleared
    
    with freezero. Unconditionally call freezero to guarantee that password is
    removed from RAM.
    
    From tobias@ and c3h2_ctf via github PR#286, ok djm@
    
    OpenBSD-Commit-ID: 6b093619c9515328e25b0f8093779c52402c89cd

commit 5d3a77f4c5ae774c6796387266503f52c7cdc7c2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 27 04:27:49 2022 +0000

    upstream: Avoid kill with -1 argument. The out_ctx label can be
    
    reached before fork has been called. If this happens, then kill -1 would be
    called, sending SIGTERM to all processes reachable by the current process.
    
    From tobias@ and c3h2_ctf via github PR#286, ok djm@
    
    OpenBSD-Commit-ID: 6277af1207d81202f5daffdccfeeaed4c763b1a8

commit 533b31cd08e4b97f455466f91c36915e2924c15a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 27 04:13:24 2022 +0000

    upstream: Note that ProxyJump also accepts the same tokens as
    
    ProxyCommand. From pallxk via github PR#305.
    
    OpenBSD-Commit-ID: 7115ac351b129205f1f1ffa6bbfd62abd76be7c5

commit 9d8c80f8a304babe61ca28f2e3fb5eb6dc9c39bf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 25 06:03:44 2022 +0000

    upstream: revert previous; it was broken (spotted by Theo)
    
    OpenBSD-Commit-ID: 457c79afaca2f89ec2606405c1059b98b30d8b0d

commit 9e0d02ef7ce88b67643bfb1c2272c9f5f04cc680
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 25 00:31:13 2022 +0000

    upstream: make SSHBUF_DBG/SSHBUF_TELL (off by default and only enabled
    
    via #define) dump to stderr rather than stdout
    
    OpenBSD-Commit-ID: 10298513ee32db8390aecb0397d782d68cb14318

commit 2487163630f28be28b7e2396b4bd6511b98f1d3e
Author: Tim Rice <tim@multitalents.net>
Date:   Tue May 24 10:21:25 2022 -0700

    configure.ac: Add missing AC_DEFINE for caph_cache_tzdata test causing
    HAVE_CAPH_CACHE_TZDATA to be missing from config.h.in.
    Spotted by Bryan Drewery

commit bedb93415b60db3dfd704a3d525e82adb14a2481
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 15 23:48:07 2022 +0000

    upstream: regress test for in-place transfers and clobbering larger
    
    files with smaller ones; would have caught last regression in scp(1)
    
    OpenBSD-Regress-ID: 19de4e88dd3a4f7e5c1618c9be3c32415bd93bc2

commit b4f0d719c2548cb74da509fb65f384dada4ebd37
Author: anton@openbsd.org <anton@openbsd.org>
Date:   Fri Apr 22 05:08:43 2022 +0000

    upstream: Only run agent-ptrace.sh if gdb is available as all
    
    architectures do not ship with gdb.
    
    OpenBSD-Regress-ID: ec53e928803e6b87f9ac142d38888ca79a45348d

commit 9b73345f80255a7f3048026462f2c0c6a241eeac
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 15 23:47:21 2022 +0000

    upstream: fix in-place copies; r1.163 incorrectly skipped truncation in
    
    all cases, not just at the start of a transfer. This could cause overwrites
    of larger files to leave junk at the end. Spotted by tb@
    
    OpenBSD-Commit-ID: b189f19cd68119548c8e24e39c79f61e115bf92c

commit 56a0697fe079ff3e1ba30a2d5c26b5e45f7b71f8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 13 06:31:50 2022 +0000

    upstream: arrange for scp, when in sftp mode, to not ftruncate(3) files
    
    early
    
    previous behavious of unconditionally truncating the destination file
    would cause "scp ~/foo localhost:" and "scp localhost:foo ~/" to
    delete all the contents of their destination.
    
    spotted by solene@ sthen@, also bz3431; ok dtucker@
    
    OpenBSD-Commit-ID: ca39fdd39e0ec1466b9666f15cbcfddea6aaa179

commit fbcef70c2832712f027bccea1aa9bc4b4103da93
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon May 9 08:25:27 2022 +0000

    upstream: Remove errant apostrophe. From haruyama at queen-ml org.
    
    OpenBSD-Commit-ID: dc6b294567cb84b384ad6ced9ca469f2bbf0bd10

commit 0086a286ea6bbd11ca9b664ac3bb12b27443d6eb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 9 03:09:53 2022 +0000

    upstream: Allow existing -U (use agent) flag to work with "-Y sign"
    
    operations, where it will be interpreted to require that the private keys is
    hosted in an agent; bz3429, suggested by Adam Szkoda; ok dtucker@
    
    OpenBSD-Commit-ID: a7bc69873b99c32c42c7628ed9ea91565ba08c2f

commit cb010744cc98f651b1029bb09efa986eb54e4ccf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 8 22:58:35 2022 +0000

    upstream: improve error message when 'ssh-keygen -Y sign' is unable to
    
    load a private key; bz3429, reported by Adam Szkoda ok dtucker@
    
    OpenBSD-Commit-ID: bb57b285e67bea536ef81b1055467be2fc380e74

commit aa61fc82c63d309a90c22ca74fb1da6c6f4372fd
Author: Tobias Heider <me@tobhe.de>
Date:   Mon May 9 02:00:01 2022 +0200

    Remove duplicate bcrypt_pbkdf.o from Makefile
    
    bcrypt_pbkdf.o is duplicated in the openbsd-compat Makefile's object
    file list.

commit deb506d00da8d11fb04c1e7b9b1e1cc379c1705c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 8 22:32:36 2022 +0000

    upstream: When performing operations that glob(3) a remote path, ensure
    
    that the implicit working directory used to construct that path escapes
    glob(3) characters.
    
    This prevents glob characters from being processed in places they
    shouldn't, e.g. "cd /tmp/a*/", "get *.txt" should have the get operation
    treat the path "/tmp/a*" literally and not attempt to expand it.
    
    Reported by Lusia Kundel; ok markus@
    
    OpenBSD-Commit-ID: 4f647f58482cbad3d58b1eab7f6a1691433deeef

commit f38cf74f20b5da113cfa823afd5bfb5c6ba65f3d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 6 14:50:18 2022 +1000

    Also retest OpenBSD upstream on .yml changes.

commit f87a132800ba3710ab130d703448a31ef1128d77
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 6 14:46:09 2022 +1000

    Note that, for now, we need variadic macros.

commit 217b518e0f7c52c4b909e935141a55344c61e644
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 6 14:39:34 2022 +1000

    Add ubsan minimal testcase on OpenBSD.
    
    As suggested by djm@.

commit 457dce2cfef6a48f5442591cd8b21c7e8cba13f8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 5 01:04:14 2022 +0000

    upstream: sshkey_unshield_private() contains a exact duplicate of
    
    the code in private2_check_padding(). Pull private2_check_padding() up so the
    code can be reused. From Martin Vahlensieck, ok deraadt@
    
    OpenBSD-Commit-ID: 876884c3f0e62e8fd8d1594bab06900f971c9c85

commit 0e44db4d9cb313e68a59a44d27884af66c02356e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 5 00:56:58 2022 +0000

    upstream: channel_new no longer frees remote_name. So update the
    
    comment accordingly.  As remote_name is not modified, it can be const as
    well. From Martin Vahlensieck
    
    OpenBSD-Commit-ID: e4e10dc8dc9f40c166ea5a8e991942bedc75a76a

commit 37b62fd5caf19c85a48241535277cefff65adace
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 5 00:55:11 2022 +0000

    upstream: mux.c: mark argument as const; from Martin Vahlensieck
    
    OpenBSD-Commit-ID: 69a1a93a55986c7c2ad9f733c093b46a47184341

commit f4e67c0ad259b4cf10177277a5827fa5545bac53
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed May 4 07:31:22 2022 +0000

    upstream: make sure stdout is non-blocking; ok djm@
    
    OpenBSD-Commit-ID: 64940fffbd1b882eda2d7c8c7a43c79368309c0d

commit e5c036d2092c00bef395e9161dc5ce42d4be9565
Author: florian@openbsd.org <florian@openbsd.org>
Date:   Tue May 3 07:42:27 2022 +0000

    upstream: Add FIDO AUTHENTICATOR section and explain a bit how FIDO
    
    works. The wording came mostly from the 8.2 OpenSSH release notes, addapted
    to fit the man page. Then move the -O bits into the new section as is already
    done for CERTIFICATES and MODULI GENERATION. Finally we can explain the
    trade-offs of resident keys. While here, consistently refer to the FIDO
    thingies as "FIDO authenticators", not "FIDO tokens".
    
    input & OK jmc, naddy
    
    OpenBSD-Commit-ID: dd98748d7644df048f78dcf793b3b63db9ab1d25

commit 575771bf79bef7127be6aaccddc46031ea15529e
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon May 2 05:40:37 2022 +0000

    upstream: remove an obsolete rsa1 format example from an example;
    
    from megan batty
    ok djm
    
    OpenBSD-Commit-ID: db2c89879c29bf083df996bd830abfb1e70d62bf

commit 0bc6b4c8f04e292577bdb44d5dc6b630d3448087
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 1 23:20:30 2022 +0000

    upstream: fix some integer overflows in sieve_large() that show up when
    
    trying to generate modp groups > 16k bits. Reported via GHPR#306 by Bertram
    Felgenhauer, but fixed in a different way. feedback/ok tb@
    
    OpenBSD-Commit-ID: 81cbc6dd3a21c57bd6fadea10e44afe37bca558e

commit a45615cb172bc827e21ec76750de39dfb30ecc05
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 29 04:55:07 2022 +0000

    upstream: be stricter in which characters will be accepted in
    
    specifying a mask length; allow only 0-9. From khaleesicodes via GHPR#278; ok
    dtucker@
    
    OpenBSD-Commit-ID: e267746c047ea86665cdeccef795a8a56082eeb2

commit 4835544d2dd31de6ffc7dba59f92093aea98155b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Apr 30 10:56:41 2022 +1000

    Add Mac OS X 12 test target.

commit 97a6a8b8c1f2da09712d0e72d0ef800e4edd34cd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 29 18:27:34 2022 +1000

    Only run tests when source files change.
    
    Also run tests on changes to V_9_0 branch.

commit 6d0392b9ff4b50a56ac5685d1b9392e2cd432ca3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 29 18:22:34 2022 +1000

    Remove now-empty int32_minmax.inc.

commit af59463553b5ad52d3b42c4455ee3c5600158bb7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 29 03:24:30 2022 +0000

    upstream: mention that the helpers are used by ssh(1), ssh-agent(1)
    
    and ssh-keygen(1). Previously only ssh(1) was mentioned. From Pedro
    Martelletto
    
    OpenBSD-Commit-ID: 30f880f989d4b329589c1c404315685960a5f153

commit 3e26b3a6eebcee27be177207cc0846fb844b7a56
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 29 03:16:48 2022 +0000

    upstream: Don't leak SK device. Patch from Pedro Martelletto via
    
    github PR#316. ok djm@
    
    OpenBSD-Commit-ID: 17d11327545022e727d95fd08b213171c5a4585d

commit 247082b5013f0d4fcae8f97453f2a2f01bcda811
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 29 03:13:32 2022 +0000

    upstream: fix memleak on session-bind path; from Pedro Martelletto, ok
    
    dtucker@
    
    OpenBSD-Commit-ID: e85899a26ba402b4c0717b531317e8fc258f0a7e

commit e05522008092ceb86a87bdd4ad7878424315db89
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 28 02:53:31 2022 +0000

    upstream: avoid printing hash algorithm twice; from lucas AT sexy.is
    
    OpenBSD-Commit-ID: 9d24671e10a84141b7c504396cabad600e47a941

commit 0979e29356915261d69a9517a1e0aaade7c9fc75
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Apr 27 11:08:55 2022 +0000

    upstream: Add authfd path to debug output. ok markus@
    
    OpenBSD-Commit-ID: f735a17d1a6f2bee63bfc609d76ef8db8c090890

commit 67b7c784769c74fd4d6b147d91e17e1ac1a8a96d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Apr 26 07:41:44 2022 +0000

    upstream: Check sshauthopt_new() for NULL. bz#3425, from
    
    tessgauthier at microsoft.com.  ok djm@
    
    OpenBSD-Commit-ID: af0315bc3e44aa406daa7e0ae7c2d719a974483f

commit d571314d14b919fbd7c84a61f9bf2065fc0a6841
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Wed Apr 20 16:00:25 2022 +0000

    upstream: Remove unnecessary includes: openssl/hmac.h and
    
    openssl/evp.h. From Martin Vahlensieck.
    
    OpenBSD-Commit-ID: a6debb5fb0c8a44e43e8d5ca7cc70ad2f3ea31c3

commit da8dddf8cc1f2516ff894b8183e83a7c5ba3ef80
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Wed Apr 20 15:59:18 2022 +0000

    upstream: Add missing includes of stdlib.h and stdint.h. We need
    
    stdlib.h for malloc(3) and stdint.h for SIZE_MAX. Unlike the other xmss
    files, ssh-xmss.c does not include xmss_commons.h so ssh-xmss.c must include
    those headers itself. From Martin Vahlensieck
    
    OpenBSD-Commit-ID: 70e28a9818cee3da1be2ef6503d4b396dd421e6b

commit fe9d87a6800a7a33be08f4d5ab662a758055ced2
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Wed Apr 20 15:56:49 2022 +0000

    upstream: Avoid an unnecessary xstrdup in rm_env() when matching
    
    patterns. Since match_pattern() doesn't modify its arguments (they are
    const), there is no need to make an extra copy of the strings in
    options->send_env. From Martin Vahlensieck
    
    OpenBSD-Commit-ID: 2c9db31e3f4d3403b49642c64ee048b2a0a39351

commit 7bf2eb958fbb551e7d61e75c176bb3200383285d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 26 23:30:59 2022 +1000

    Add debian-riscv64 test target.

commit 3913c935523902482974c4c503bcff20bd850a6a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 25 17:20:06 2022 +1000

    Update OpenSSL and LibreSSL versions in tests.

commit dcd8dca29bcdb193ff6be35b96fc55e6e30d37d9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Apr 23 20:40:28 2022 +1000

    Include stdlib.h for free() prototype.
    
    ... which is used inside the CUSTOM_SYS_AUTH_GET_LASTLOGIN_MSG block.

commit 4cc05de568e1c3edd7834ff3bd9d8214eb34861b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Apr 23 20:17:26 2022 +1000

    Cache timezone data in capsicum sandbox.
    
    From emaste at freebsd.org, originally part of FreeBSD commit r339216
    / fc3c19a9 with autoconf bits added by me.

commit c31404426d212e2964ff9e5e58e1d0fce3d83f27
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Apr 21 01:36:46 2022 +0000

    upstream: It looks like we can't completely avoid
    
    waiting for processes to exit so retrieve the pid via controlmaster and
    use that.
    
    OpenBSD-Regress-ID: 8246f00f22b14e49d2ff1744c94897ead33d457b

commit d19b21afab5c8e2f3df6bd8aee9766bdad3d8c58
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Apr 20 13:25:55 2022 +0000

    upstream: Use ssh -f and ControlPersist ..
    
    to start up test forwards and ssh -O stop to shut them down intead of
    sleep loops.  This speeds up the test by an order of magnitude.
    
    OpenBSD-Regress-ID: eb3db5f805100919b092a3b2579c611fba3e83e7

commit 5f76286a126721fa005de6edf3d1c7a265555f19
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Apr 20 05:24:13 2022 +0000

    upstream: Simplify forward-control test.
    
    Since we no longer need to support SSH1 we don't need to run shell
    commands on the other end of the connection and can use ssh -N instead.
    This also makes the test less racy.
    
    OpenBSD-Regress-ID: 32e94ce272820cc398f30b848b2b0f080d10302c

commit 687bbf23572d8bdf25cbbcdf8ac583514e1ba710
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Mar 31 03:07:33 2022 +0000

    upstream: regression test for sftp cp command
    
    OpenBSD-Regress-ID: c96bea9edde3a384b254785e7f9b2b24a81cdf82

commit f1233f19a6a9fe58f52946f50df4772f5b136761
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Apr 20 01:13:47 2022 +0000

    upstream: Import regenerated moduli
    
    OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0

commit fec014785de198b9a325d1b94e324bb958c5fe7b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 20 04:19:11 2022 +0000

    upstream: Try to continue running local I/O for channels in state
    
    OPEN during SSH transport rekeying. The most visible benefit is that it
    should make ~-escapes work in the client (e.g. to exit) if the connection
    happened to have stalled during a rekey event. Based work by and ok dtucker@
    
    OpenBSD-Commit-ID: a66e8f254e92edd4ce09c9f750883ec8f1ea5f45

commit e68154b0d4f0f5085a050ea896955da1b1be6e30
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Apr 20 01:13:47 2022 +0000

    upstream: Import regenerated moduli
    
    OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0

commit 69928b106d8f0fa15b88cf3850d992ed81c44ae0
Author: tj@openbsd.org <tj@openbsd.org>
Date:   Sat Apr 16 00:22:31 2022 +0000

    upstream: list the correct version number
    
    for when usage of the sftp protocol became default and fix a typo
    from ed maste
    
    OpenBSD-Commit-ID: 24e1795ed2283fdeacf16413c2f07503bcdebb31

commit 21042a05c0b304c16f655efeec97438249d2e2cc
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Apr 12 05:09:49 2022 +0000

    upstream: Correct path for system known hosts file in description
    
    of IgnoreUserKnownHosts.  Patch from Martin Vahlensieck via tech@
    
    OpenBSD-Commit-ID: 9b7784f054fa5aa4d63cb36bd563889477127215

commit 53f4aff60a7c1a08a23917bd47496f8901c471f5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Apr 16 14:33:20 2022 +1000

    Resync moduli.5 with upstream.
    
    1.18: remove duplicate publication year; carsten dot kunze at arcor dot de
    1.19: ssh-keygen's -G/-T have been replaced with -M generate/screen.

commit d2b888762b9844eb0d8eb59909cdf5af5159f810
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Apr 16 14:31:13 2022 +1000

    Retire fbsd6 test VM.
    
    It's long since out of support, relatively slow (it's i686) and the
    compiler has trouble with PIE.

commit cd1f70009860a154b51230d367c55ea5f9a4504e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Apr 11 22:52:08 2022 +0000

    upstream: clear io_want/io_ready flags at start of poll() cycle;
    
    avoids plausible spin during rekeying if channel io_want flags are reused
    across cycles. ok markus@ deraadt@
    
    OpenBSD-Commit-ID: 91034f855b7c73cd2591657c49ac30f10322b967

commit aa1920302778273f7f94c2091319aba199068ca0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 8 05:43:39 2022 +0000

    upstream: Note that curve25519-sha256 was later published in
    
    RFC8731.  ok djm@
    
    OpenBSD-Commit-ID: 2ac2b5d642d4cf5918eaec8653cad9a4460b2743

commit 4673fa8f2be983f2f88d5afd754adb1a2a39ec9e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 8 04:40:40 2022 +0000

    upstream: two defensive changes from Tobias Stoeckmann via GHPR287
    
    enforce stricter invarient for sshbuf_set_parent() - never allow
    a buffer to have a previously-set parent changed.
    
    In sshbuf_reset(), if the reallocation fails, then zero the entire
    buffer and not the (potentially smaller) default initial alloc size.
    
    OpenBSD-Commit-ID: 14583203aa5d50ad38d2e209ae10abaf8955e6a9

commit 26eef015e2d2254375e13afaaf753b78932b1bf5
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 11 16:07:09 2022 +1000

    Revert "update build-aux files to match autoconf-2.71"
    
    This reverts commit 0a8ca39fac6ad19096b6c263436f8b2dd51606f2.
    
    It turns out that the checked-in copies of these files are actually newer
    than autoconf-2.71's copies, so this was effectively a downgrade.
    Spotted by Bo Anderson via github

commit 0a8ca39fac6ad19096b6c263436f8b2dd51606f2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 8 14:48:58 2022 +1000

    update build-aux files to match autoconf-2.71
    
    i.e. config.guess, config.sub and install-sh

commit 94eb6858efecc1b4f02d8a6bd35e149f55c814c8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 6 10:47:48 2022 +1000

    update version numbers for release

commit 8e4a8eadf4fe74e65e6492f34250f8cf7d67e8da
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Apr 4 22:45:25 2022 +0000

    upstream: openssh-9.0
    
    OpenBSD-Commit-ID: 0dfb461188f4513ec024c1534da8c1ce14c20b64

commit a9f23ea2e3227f406880c2634d066f6f50fa5eaa
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Thu Mar 31 17:58:44 2022 +0000

    upstream: ssh: document sntrup761x25519-sha512@openssh.com as
    
    default KEX
    
    OpenBSD-Commit-ID: 12545bfa10bcbf552d04d9d9520d0f4e98b0e171

commit 9ec2713d122af79d66ebb9c1d6d9ae8621a8945f
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Thu Mar 31 17:27:27 2022 +0000

    upstream: man pages: add missing commas between subordinate and
    
    main clauses
    
    jmc@ dislikes a comma before "then" in a conditional, so leave those
    untouched.
    
    ok jmc@
    
    OpenBSD-Commit-ID: 9520801729bebcb3c9fe43ad7f9776ab4dd05ea3

commit 3741df98ffaaff92b474ee70d8ef276b5882f85a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 4 23:52:11 2022 +1000

    Disable security key on fbsd6 test host.

commit 32c12236f27ae83bfe6d2983b67c9bc67a83a417
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 4 15:16:51 2022 +1000

    Specify TEST_SHELL=bash on AIX.
    
    The system shells cause the agent-restrict test to fail due to some
    quoting so explicitly specify bash until we can get configure to
    autmatically work around that.

commit 90452c8b69d065b7c7c285ff78b81418a75bcd76
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 1 23:38:44 2022 +1100

    Only return events from ppoll that were requested.
    
    If the underlying system's select() returns bits that were not in the
    request set, our ppoll() implementation can return revents for events
    not requested, which can apparently cause a hang.  Only return revents
    for activity in the requested event set.  bz#3416, analysis and fix by
    yaroslav.kuzmin at vmssoftware com, ok djm@

commit 6c49eb5fabc56f4865164ed818aa5112d09c31a8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 1 23:21:40 2022 +1100

    Only run regression tests on slow VMs.

commit f67e47903977b42cb6abcd5565a61bd7293e4dc3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 1 23:21:06 2022 +1100

    Increase test timeout to allow slow VMs to finish

commit 02488c1b54065ddc4f25835dbd2618b2a2fe21f5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 1 16:27:38 2022 +1100

    Use bash or ksh if available for SH in Makefile.

commit 34c7018c316af4773e432066de28d0ef9d0888cd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 1 14:56:54 2022 +1100

    Set Makefile SHELL as determined by configure.
    
    This should improve compatibility for users with non-POSIX shells.  If
    using Makefile.in directly (eg make -f Makefile.in distprep) then SHELL
    will need to be specified on the command line (along with MANFMT in that
    particular case).  ok djm@

commit 5b054d76402faab38c48377efd112426469553a0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 1 13:16:47 2022 +1100

    Skip slow tests on (very) slow test targets.

commit b275818065b31a865142c48c2acf6a7c1655c542
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 31 14:11:36 2022 +1100

    depend

commit 3fa539c3ffaabd6211995512d33e29150f88c5c5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Mar 31 03:07:03 2022 +0000

    upstream: add a sftp client "cp" command that supports server-side
    
    copying of files. Useful for this task and for testing the copy-data
    extension. Patch from Mike Frysinger; ok dtucker@
    
    OpenBSD-Commit-ID: 1bb1b950af0d49f0d5425b1f267e197aa1b57444

commit 7988bfc4b701c4b3fe9b36c8561a3d1c5d4c9a74
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Mar 31 03:05:49 2022 +0000

    upstream: add support for the "corp-data" protocol extension to
    
    allow server-side copies to be performed without having to go via the client.
    Patch by Mike Frysinger, ok dtucker@
    
    OpenBSD-Commit-ID: 00aa510940fedd66dab1843b58682de4eb7156d5

commit 32dc1c29a4ac9c592ddfef0a4895eb36c1f567ba
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 30 21:13:23 2022 +0000

    upstream: select post-quantum KEX
    
    sntrup761x25519-sha512@openssh.com as the default; ok markus@
    
    OpenBSD-Commit-ID: f02d99cbfce22dffec2e2ab1b60905fbddf48fb9

commit d6556de1db0822c76ba2745cf5c097d9472adf7c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 30 21:10:25 2022 +0000

    upstream: fix poll() spin when a channel's output fd closes without
    
    data in the channel buffer. Introduce more exact packing of channel fds into
    the pollfd array. fixes bz3405 and bz3411; ok deraadt@ markus@
    
    OpenBSD-Commit-ID: 06740737849c9047785622ad5d472cb6a3907d10

commit 8a74a96d25ca4d32fbf298f6c0ac5a148501777d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 30 04:33:09 2022 +0000

    upstream: ssh is almost out of getopt() characters; note the
    
    remaining remaining available ones in a comment
    
    OpenBSD-Commit-ID: 48d38cef59d6bc8e84c6c066f6d601875d3253fd

commit 6d4fc51adb9d8a42f67b5474f02f877422379de6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 30 04:27:51 2022 +0000

    upstream: avoid NULL deref via ssh-keygen -Y find-principals.
    
    bz3409, reported by Mateusz Adamowski
    
    OpenBSD-Commit-ID: a3b2c02438052ee858e0ee18e5a288586b5df2c5

commit e937514920335b92b543fd9be79cd6481d1eb0b6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 28 17:51:03 2022 +1100

    Add AIX 5.1 test target.

commit 4bbe815ba974b4fd89cc3fc3e3ef1be847a0befe
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 26 22:01:31 2022 +1100

    Drop leading "v" from release version identifier.
    
    It's present in the git tags but not in the release tarball names.
    Also drop extra "/" from URL path.

commit f5cdd3b3c275dffaebfca91df782dca29975e9ac
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 26 16:28:04 2022 +1100

    Use tarballs when testing LibreSSL releases.
    
    This means they'll still work when the combination of -portable and
    openbsd github repos no longer match.

commit 24dc37d198f35a7cf71bf4d5384363c7ef4209d4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 26 15:02:45 2022 +1100

    Remove now-unused passwd variable.

commit 5b467ceef2c356f0a77f5e8ab4eb0fac367e4d24
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 26 13:15:44 2022 +1100

    Missing semicolon.

commit 2923d026e55998133c0f6e5186dca2a3c0fa5ff5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 26 12:49:50 2022 +1100

    Factor out platform-specific locked account check.
    
    Also fixes an incorrect free on platforms with both libiaf and shadow
    passwords (probably only Unixware).  Prompted by github PR#284,
    originally from @c3h2_ctf and stoeckmann@.

commit d23efe4b12886ffe416be10bc0a7da6ca8aa72d1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 26 08:13:46 2022 +1100

    Add OpenWRT mips and mipsel test targets.

commit 16ea8b85838dd7a4dbeba4e51ac4f43fd68b1e5b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Mar 20 08:52:17 2022 +0000

    upstream: don't leak argument list; bz3404, reported by Balu
    
    Gajjala ok dtucker@
    
    OpenBSD-Commit-ID: fddc32d74e5dd5cff1a49ddd6297b0867eae56a6

commit a72bde294fe0518c9a44ba63864093a1ef2425e3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Mar 20 08:51:21 2022 +0000

    upstream: make addargs() and replacearg() a little more robust and
    
    improve error reporting
    
    make freeargs(NULL) a noop like the other free functions
    
    ok dtucker as part of bz3403
    
    OpenBSD-Commit-ID: 15f86da83176978b4d1d288caa24c766dfa2983d

commit 731087d2619fa7f01e675b23f57af10d745e8af2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 18 04:04:11 2022 +0000

    upstream: don't try to resolve ListenAddress directives in the sshd
    
    re-exec path - we're never going to use the result and if the operation fails
    then it can prevent connections from being accepted. Reported by Aaron
    Poffenberger; with / ok dtucker@
    
    OpenBSD-Commit-ID: 44c53a43909a328e2f5ab26070fdef3594eded60

commit 1c83c082128694ddd11ac05fdf31d70312ff1763
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 18 02:50:21 2022 +0000

    upstream: remove blank line
    
    OpenBSD-Commit-ID: d5e0182965b2fbfb03ad5f256d1a1ce5706bcddf

commit 807be68684da7a1fe969c399ddce2fafb7997dcb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 18 02:32:22 2022 +0000

    upstream: helpful comment
    
    OpenBSD-Commit-ID: e3315a45cb04e7feeb614d76ec80a9fe4ca0e8c7

commit a0b5816f8f1f645acdf74f7bc11b34455ec30bac
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 18 02:31:25 2022 +0000

    upstream: ssh-keygen -Y check-novalidate requires namespace or SEGV
    
    will ensue. Patch from Mateusz Adamowski via GHPR#307
    
    OpenBSD-Commit-ID: 99e8ec38f9feb38bce6de240335be34aedeba5fd

commit 5a252d54a63be30d5ba4be76210942d754a531c0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 15 05:27:37 2022 +0000

    upstream: improve DEBUG_CHANNEL_POLL debugging message
    
    OpenBSD-Commit-ID: 2275eb7bc4707d019b1a0194b9c92c0b78da848f

commit ce324cf58ba2840e31afeb996935800780c8fa4b
Author: cheloha@openbsd.org <cheloha@openbsd.org>
Date:   Sun Mar 13 23:27:54 2022 +0000

    upstream: ssh: xstrdup(): use memcpy(3)
    
    Copying the given string into the buffer with strlcpy(3) confers no
    benefit in this context because we have already determined the
    string's length with strlen(3) in order to allocate that buffer.
    
    Thread: https://marc.info/?l=openbsd-tech&m=164687525802691&w=2
    
    ok dtucker@ millert@
    
    OpenBSD-Commit-ID: f8bfc082e36e2d2dc4e1feece02fe274155ca11a

commit 2893c5e764557f48f9d6a929e224ed49c59545db
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Mar 11 18:43:58 2022 +1100

    Resync fmt_scaled. with OpenBSD.
    
    Fixes underflow reported in bz#3401.

commit 5ae31a0fdd27855af29f48ff027491629fff5979
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Mar 9 09:41:56 2022 +1100

    Provide killpg implementation.
    
    Based on github PR#301 for Tandem NonStop.

commit c41c84b439f4cd74d4fe44298a4b4037ddd7d2ae
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Mar 9 09:29:30 2022 +1100

    Check for missing ftruncate prototype.
    
    From github PR#301 in conjunction with rsbeckerca.

commit 8cf5275452a950869cb90eeac7d220b01f77b12e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 8 20:04:06 2022 +1100

    Default to not using sandbox when cross compiling.
    
    On most systems poll(2) does not work when the number of FDs is reduced
    with setrlimit, so assume it doesn't when cross compiling and we can't
    run the test.  bz#3398.

commit 379b30120da53d7c84aa8299c26b18c51c2a0dac
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 1 01:59:19 2022 +0000

    upstream: pack pollfd array before server_accept_loop() ppoll()
    
    call, and terminate sshd if ppoll() returns errno==EINVAL
    
    avoids spin in ppoll when MaxStartups > RLIMIT_NOFILE, reported by
    Daniel Micay
    
    feedback/ok deraadt
    
    OpenBSD-Commit-ID: dbab1c24993ac977ec24d83283b8b7528f7c2c15

commit eceafbe0bdbbd9bd2f3cf024ccb350666a9934dd
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sun Feb 27 01:33:59 2022 +0000

    upstream: include rejected signature algorithm in error message and
    
    not the (useless) key type; ok djm@
    
    OpenBSD-Commit-ID: d0c0f552a4d9161203e07e95d58a76eb602a76ff

commit f2f3269423618a83157e18902385e720f9776007
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 25 09:46:24 2022 +0000

    upstream: Remove the char * casts from arguments to do_lstat,
    
    do_readdir and do_stat paths since the underlying functions now take a const
    char *. Patch from vapier at gentoo.org.
    
    OpenBSD-Commit-ID: 9e4d964dbfb0ed683a2a2900711b88e7f1c0297b

commit 4a66dac052c5ff5047161853f36904607649e4f9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 25 02:09:27 2022 +0000

    upstream: save an unneccessary alloc/free, based on patch from
    
    Martin Vahlensieck; ok dtucker@
    
    OpenBSD-Commit-ID: 90ffbf1f837e509742f2c31a1fbf2c0fd376fd5f

commit 6f117cb151efe138ac57bdd8e26165f350328f5f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 1 09:02:06 2022 +1100

    Remove unused ivbits argument from chacha_keysetup

commit 15974235dd528aeab0ec67fb92a0a1d733f62be2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 1 09:00:20 2022 +1100

    Add OPENBSD ORIGINAL marker.

commit f2ff669347d320532e7c1b63cdf5c62f46e73150
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 28 22:21:36 2022 +1100

    No unused param warnings for clang-12 and gcc-11.
    
    These have too many false positives in -Werror tests on the github CI
    since we often provide empty stub functions for functionality not needed
    for particular configurations.

commit 96558ecd87adac62efa9a2b5479f686ab86b0be1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 26 14:10:41 2022 +1100

    Add debian-i386 test target.

commit 284b6e5394652d519e31782e3b3cdfd7b21d1a81
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 26 14:06:14 2022 +1100

    Allow ppoll_time64 in seccomp sandbox.
    
    Should fix sandbox violations on (some? at least i386 and armhf) 32bit
    Linux platforms.  Patch from chutzpahu at gentoo.org and cjwatson at
    debian.org via bz#3396.

commit 0132056efabc5edb85c3c7105d2fb6dee41843c6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 25 19:47:48 2022 +1100

    Improve handling of _getshort and _getlong.
    
    If the system native ones are exactly as required then use them,
    otherwise use the local versions mapped to another name to prevent
    name collisions.

commit 8e206e0dd6b9f757b07979e48f53ad5bf9b7b52b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 25 15:14:22 2022 +1100

    Constify utimes in compat library to match specs.
    
    Patch from vapier at chromium.org.

commit 1b2920e3b63db2eddebeec7330ffe8b723055573
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 25 13:50:56 2022 +1100

    ANSIfy getshort and getlong.
    
    These functions appear to have come from OpenBSD's lib/libc/net/res_comp.c
    which made this change in 2005.

commit 54a86f4f6e1c43a2ca2be23ef799ab8910d4af70
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 25 13:23:04 2022 +1100

    Use PICFLAG instead of hard coding -fPIC.

commit 3016ba47035ac3561aabd48e2be70167fe157d6a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 25 11:37:11 2022 +1100

    Add tests for latest releases of {Libre,Open}SSL.

commit f107467179428a0e3ea9e4aa9738ac12ff02822d
Author: Colin Watson <cjwatson@debian.org>
Date:   Thu Feb 24 16:04:18 2022 +0000

    Improve detection of -fzero-call-used-regs=all support
    
    GCC doesn't tell us whether this option is supported unless it runs into
    the situation where it would need to emit corresponding code.

commit 3383b2cac0e9275bc93c4b4760e6e048f537e1d6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 23 21:21:49 2022 +0000

    upstream: free(3) wants stdlib.h
    
    OpenBSD-Commit-ID: 227a8c70a95b4428c49e46863c9ef4bd318a3b8a

commit a4537e79ab4ac6db4493c5158744b9ebde5efcb0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 23 21:21:16 2022 +0000

    upstream: put back the scp manpage changes for SFTP mode too
    
    OpenBSD-Commit-ID: 05dc53921f927e1b5e5694e1f3aa314549f2e768

commit 449bcb8403adfb9724805d02a51aea76046de185
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed Feb 23 19:01:00 2022 +0000

    upstream: and we go back to testing sftp-scp after the 8.9
    
    release...
    
    OpenBSD-Commit-ID: a80440168258adca543a4607b871327a279c569c

commit 166456cedad3962b83b848b1e9caf80794831f0f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 23 22:31:11 2022 +1100

    makedepend

commit 32ebaa0dbca5d0bb86e384e72bebc153f48413e4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 23 11:18:13 2022 +0000

    upstream: avoid integer overflow of auth attempts (harmless, caught
    
    by monitor)
    
    OpenBSD-Commit-ID: 488ad570b003b21e0cd9e7a00349cfc1003b4d86

commit 6e0258c64c901753df695e06498b26f9f4812ea6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 23 11:17:10 2022 +0000

    upstream: randomise the password used in fakepw
    
    OpenBSD-Commit-ID: 34e159f73b1fbf0a924a9c042d8d61edde293947

commit bf114d6f0a9df0b8369823d9a0daa6c72b0c4cc9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 23 11:15:57 2022 +0000

    upstream: use asprintf to construct .rhosts paths
    
    OpenBSD-Commit-ID: 8286e8d3d2c6ff916ff13d041d1713073f738a8b

commit c07e154fbdc7285e9ec54e78d8a31f7325d43537
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 23 11:07:09 2022 +0000

    upstream: openssh-8.9
    
    OpenBSD-Commit-ID: 5c5f791c87c483cdab6d9266b43acdd9ca7bde0e

commit bc16667b4a1c3cad7029304853c143a32ae04bd4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 22 15:29:22 2022 +1100

    Extend select+rlimit sanbox test to include poll.
    
    POSIX specifies that poll() shall fail if "nfds argument is greater
    than {OPEN_MAX}".  The setrlimit sandbox sets this to effectively zero
    so this causes poll() to fail in the preauth privsep process.
    
    This is likely the underlying cause for the previously observed similar
    behaviour of select() on plaforms where it is implement in userspace on
    top of poll().

commit 6520c488de95366be031d49287ed243620399e23
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 22 13:08:59 2022 +1100

    Add Alpine Linux test VM.

commit a4b325a3fc82d11e0f5d61f62e7fde29415f7afb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 22 12:27:07 2022 +1100

    Include sys/param.h if present.
    
    Needed for howmany() on MUSL systems such as Alpine.

commit 5a102e9cb287a43bd7dfe594b775a89a8e94697c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 22 12:25:52 2022 +1100

    Only include sys/poll.h if we don't have poll.h.
    
    Prevents warnings on MUSL based systems such as Alpine.

commit 7c0d4ce911d5c58b6166b2db754a4e91f352adf5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 22 11:14:51 2022 +1100

    disable agent-restrict test on minix3
    
    Minix seems to have a platform-wide limit on the number of
    select(2) syscalls that can be concurrently issued. This test
    seems to exceed this limit.
    
    Refer to:
    
    https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L114
    https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L30-L31

commit 81d33d8e3cf7ea5ce3a5653c6102b623e019428a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 21 21:27:20 2022 +1100

    Skip agent-getpeereid when running as root.

commit fbd772570a25436a33924d91c164d2b24021f010
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 20 03:47:26 2022 +0000

    upstream: Aproximate realpath on the expected output by deduping
    
    leading slashes. Fixes test failure when user's home dir is / which is
    possible in some portable configurations.
    
    OpenBSD-Regress-ID: 53b8c53734f8893806961475c7106397f98d9f63

commit 336685d223a59f893faeedf0a562e053fd84058e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 20 13:30:52 2022 +1100

    Really move DSA to end of list.
    
    In commit ad16a84e syncing from OpenBSD, RSA was accidentally moved to
    the end of the list instead of DSA.  Spotted by andrew at fyfe.gb.net.

commit 63bf4f49ed2fdf2da6f97136c9df0c8168546eb3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 18 12:12:21 2022 +1100

    Add test configs for MUSL C library.

commit f7fc6a43f1173e8b2c38770bf6cee485a562d03b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 17 22:54:19 2022 +1100

    minix needs BROKEN_POLL too; chokes on /dev/null

commit 667fec5d4fe4406745750a32f69b5d2e1a75e94b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 17 10:58:27 2022 +0000

    upstream: check for EINTR/EAGAIN failures in the rfd fast-path; caught
    
    by dtucker's minix3 vm :) ok dtucker@
    
    OpenBSD-Commit-ID: 2e2c895a3e82ef347aa6694394a76a438be91361

commit 41417dbda9fb55a0af49a8236e3ef9d50d862644
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 17 22:05:29 2022 +1100

    Comment hurd test, the VM is currently broken.

commit b2aee35a1f0dc798339b3fcf96136da71b7e3f6d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 17 21:15:16 2022 +1100

    find sk-dummy.so when build_dir != src_dir
    
    spotted by Corinna Vinschen; feedback & ok dtucker@

commit 62a2d4e50b2e89f2ef04576931895d5139a5d037
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 16 16:26:17 2022 +1100

    update versions in preparation for 8.9 release

commit dd6d3dded721ac653ea73c017325e5bfeeec837f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 15 05:13:36 2022 +0000

    upstream: document the unbound/host-bound options to
    
    PubkeyAuthentication; spotted by HARUYAMA Seigo
    
    OpenBSD-Commit-ID: 298f681b66a9ecd498f0700082c7a6c46e948981

commit df93529dd727fdf2fb290700cd4f1adb0c3c084b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 14 14:19:40 2022 +1100

    Test if sshd accidentally acquires controlling tty
    
    When SSHD_ACQUIRES_CTTY is defined, test for the problematic behaviour
    in the STREAMS code before activating the workaround.  ok djm@

commit 766176cfdbfd7ec38bb6118dde6e4daa0df34888
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 12 10:24:56 2022 +1100

    Add cygwin-release test config.
    
    This tests the flags used to build the cygwin release binaries.

commit b30698662b862f5397116d23688aac0764e0886e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 11 21:00:35 2022 +1100

    Move SSHD_ACQUIRES_CTTY workaround into compat.
    
    On some (most? all?) SysV based systems with STREAMS based ptys,
    sshd could acquire a controlling terminal during pty setup when
    it pushed the "ptem" module, due to what is probably a bug in
    the STREAMS driver that's old enough to vote.  Because it was the
    privileged sshd's controlling terminal, it was not available for
    the user's session, which ended up without one.  This is known to
    affect at least Solaris <=10, derivatives such as OpenIndiana and
    several other SysV systems.  See bz#245 for the backstory.
    
    In the we past worked around that by not calling setsid in the
    privileged sshd child, which meant it was not a session or process
    group leader.  This solved controlling terminal problem because sshd
    was not eligble to acquire one, but had other side effects such as
    not cleaning up helper subprocesses in the SIGALRM handler since it
    was not PG leader.  Recent cleanups in the signal handler uncovered
    this, resulting in the LoginGraceTime timer not cleaning up privsep
    unprivileged processes.
    
    This change moves the workaround into the STREAMS pty allocation code,
    by allocating a sacrificial pty to act as sshd's controlling terminal
    before allocating user ptys, so those are still available for users'
    sessions.
    
    On the down side:
     - this will waste a pty per ssh connection on affected platforms.
    
    On the up side:
     - it makes the process group behaviour consistent between platforms.
    
     - it puts the workaround nearest the code that actually causes the
       problem and competely out of the mainline code.
    
     - the workaround is only activated if you use the STREAMS code.  If,
       say, Solaris 11 has the bug but also a working openpty() it doesn't
       matter that we defined SSHD_ACQUIRES_CTTY.
    
     - the workaround is only activated when the fist pty is allocated,
       ie in the post-auth privsep monitor.  This means there's no risk
       of fd leaks to the unprivileged processes, and there's no effect on
       sessions that do not allocate a pty.
    
    Based on analysis and work by djm@, ok djm@

commit cd00b48cf10f3565936a418c1e6d7e48b5c36140
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 11 20:09:32 2022 +1100

    Simplify handling of --with-ssl-dir.
    
    ok djm@

commit ea13fc830fc0e0dce2459f1fab2ec5099f73bdf0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 11 13:39:29 2022 +1100

    Stop testing OpenBSD HEAD on 6.9 and 7.0.
    
    HEAD is not guaranteed to work on previous stable branches, and at the
    moment is broken due to libfido API changes.

commit 50b9e4a4514697ffb9592200e722de6b427cb9ff
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 11 00:43:56 2022 +0000

    upstream: Always initialize delim before passing to hpdelim2 which
    
    might not set it. Found by the Valgrind tests on github, ok deraadt@
    
    OpenBSD-Commit-ID: c830c0db185ca43beff3f41c19943c724b4f636d

commit 6ee53064f476cf163acd5521da45b11b7c57321b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 11 10:03:06 2022 +1100

    Fix helper include path and remove excess code.
    
    Looks like test_hpdelim.c was imported twice into the same file.
    Spotted by kevin.brott at gmail com and chris at cataclysmal org.

commit 9fa63a19f68bc87452d3cf5c577cafad2921b7a4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 10 23:27:02 2022 +1100

    Put poll.h inside ifdef.

commit 3ac00dfeb54b252c15dcbf1971582e9e3b946de6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 10 22:17:31 2022 +1100

    We now support POLLPRI so actually define it.

commit 25bd659cc72268f2858c5415740c442ee950049f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 6 22:58:33 2022 +0000

    upstream: Add test for empty hostname with port.
    
    OpenBSD-Regress-ID: e19e89d3c432b68997667efea44cf015bbe2a7e3

commit a29af853cff41c0635f0378c00fe91bf9c91dea4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 4 07:53:44 2022 +0000

    upstream: Add unit tests for hpdelim.
    
    OpenBSD-Regress-ID: be97b85c19895e6a1ce13c639765a3b48fd95018

commit 9699151b039ecc5fad9ac6c6c02e9afdbd26f15f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 10 04:12:38 2022 +0000

    upstream: revert for imminent OpenSSH release, which wil ship with
    
    scp in RCP mode.
    
    > revision 1.106
    > date: 2021/10/15 14:46:46;  author: deraadt;  state: Exp;  lines: +13 -9;  commitid: w5n9B2RE38tFfggl;
    > openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
    > protocol for copying.  Let's get back to testing the SFTP protocol.
    
    This will be put back once the OpenSSH release is done.
    
    OpenBSD-Commit-ID: 0c725481a78210aceecff1537322c0b2df03e768

commit 45279abceb37c3cbfac8ba36dde8b2c8cdd63d32
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Feb 8 08:59:12 2022 +0000

    upstream: Switch hpdelim interface to accept only ":" as delimiter.
    
    Historicallly, hpdelim accepted ":" or "/" as a port delimiter between
    hosts (or addresses) and ports.  These days most of the uses for "/"
    are no longer accepted, so there are several places where it checks the
    delimiter to disallow it.  Make hpdelim accept only ":" and use hpdelim2
    in the other cases.  ok djm@
    
    OpenBSD-Commit-ID: 7e6420bd1be87590b6840973f5ad5305804e3102

commit a1bcbf04a7c2d81944141db7ecd0ba292d175a66
Author: pedro martelletto <pedro@yubico.com>
Date:   Mon Feb 7 09:09:59 2022 +0100

    fix typos in previous

commit 56192518e329b39f063487bc2dc4d796f791eca0
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 7 12:53:47 2022 +1100

    compat code for fido_assert_set_clientdata()

commit d6b5aa08fdcf9b527f8b8f932432941d5b76b7ab
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 7 01:25:12 2022 +0000

    upstream: use libfido2 1.8.0+ fido_assert_set_clientdata() instead
    
    of manually hashing data outselves. Saves a fair bit of code and makes life
    easier for some -portable platforms.
    
    OpenBSD-Commit-ID: 351dfaaa5ab1ee928c0e623041fca28078cff0e0

commit 86cc93fd3c26b2e0c7663c6394995fb04ebfbf3b
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Sun Feb 6 00:29:03 2022 +0000

    upstream: remove please from manual pages ok jmc@ sthen@ millert@
    
    OpenBSD-Commit-ID: 6543acb00f4f38a23472538e1685c013ca1a99aa

commit ad16a84e64a8cf1c69c63de3fb9008320a37009c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 4 02:49:17 2022 +0000

    upstream: Since they are deprecated, move DSA to the end of the
    
    default list of public keys so that they will be tried last.  From github
    PR#295 from "ProBackup-nl", ok djm@
    
    OpenBSD-Commit-ID: 7e5d575cf4971d4e2de92e0b6d6efaba53598bf0

commit 253de42753de85dde266e061b6fec12ca6589f7d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 2 16:52:07 2022 +1100

    portable-specific string array constification
    
    from Mike Frysinger

commit dfdcc2220cf359c492d5d34eb723370e8bd8a19e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 1 23:37:15 2022 +0000

    upstream: test 'ssh-keygen -Y find-principals' with wildcard
    
    principals; from Fabian Stelzer
    
    OpenBSD-Regress-ID: fbe4da5f0032e7ab496527a5bf0010fd700f8f40

commit 968e508967ef42480cebad8cf3172465883baa77
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 21 02:54:41 2022 +0000

    upstream: Enable all supported ciphers and macs in the server
    
    before trying to benchmark them.  Increase the data file size to get more
    signal.
    
    OpenBSD-Regress-ID: dc3697d9f7defdfc51c608782c8e750128e46eb6

commit 15b7199a1fd37eff4c695e09d573f3db9f4274b7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 1 23:34:47 2022 +0000

    upstream: allow 'ssh-keygen -Y find-principals' to match wildcard
    
    principals in allowed_signers files; from Fabian Stelzer
    
    OpenBSD-Commit-ID: 1e970b9c025b80717dddff5018fe5e6f470c5098

commit 541667fe6dc26d7881e55f0bb3a4baa6f3171645
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 1 23:32:51 2022 +0000

    upstream: mark const string array contents const too, i.e. static
    
    const char *array => static const char * const array from Mike Frysinger
    
    OpenBSD-Commit-ID: a664e31ea6a795d7c81153274a5f47b22bdc9bc1

commit 8cfa73f8a2bde4c98773f33f974c650bdb40dd3c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 1 23:11:11 2022 +0000

    upstream: better match legacy scp behaviour: show un-expanded paths
    
    in error messages. Spotted by and ok tb@
    
    OpenBSD-Commit-ID: 866c8ffac5bd7d38ecbfc3357c8adfa58af637b7

commit 4e62c13ab419b4b224c8bc6a761e91fcf048012d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Feb 1 07:57:32 2022 +0000

    upstream: Remove explicit kill of privsep preauth child's PID in
    
    SIGALRM handler. It's no longer needed since the child will get terminated by
    the SIGTERM to the process group that cleans up any auth helpers, it
    simplifies the signal handler and removes the risk of a race when updating
    the PID. Based on analysis by HerrSpace in github PR#289, ok djm@
    
    OpenBSD-Commit-ID: 2be1ffa28b4051ad9e33bb4371e2ec8a31d6d663

commit 2a7ccd2ec4022917b745af7186f514f365b7ebe9
Author: guenther@openbsd.org <guenther@openbsd.org>
Date:   Fri Jan 28 06:18:42 2022 +0000

    upstream: When it's the possessive of 'it', it's spelled "its",
    
    without the apostrophe.
    
    OpenBSD-Commit-ID: fb6ab9c65bd31de831da1eb4631ddac018c5fae7

commit 8a0848cdd3b25c049332cd56034186b7853ae754
Author: Alex James <theracermaster@gmail.com>
Date:   Sun Jan 30 16:13:36 2022 -0600

    sandbox-seccomp-filter: allow gettid
    
    Some allocators (such as Scudo) use gettid while tracing allocations [1].
    Allow gettid in preauth to prevent sshd from crashing with Scudo.
    
    [1]: https://github.com/llvm/llvm-project/blob/llvmorg-13.0.0/compiler-rt/lib/gwp_asan/common.cpp#L46

commit b30d32159dc3c7052f4bfdf36357996c905af739
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 22 00:49:34 2022 +0000

    upstream: add a ssh_packet_process_read() function that reads from
    
    a fd directly into the transport input buffer.
    
    Use this in the client and server mainloops to avoid unnecessary
    copying. It also lets us use a more greedy read size without penalty.
    
    Yields a 2-3% performance gain on cipher-speed.sh (in a fairly
    unscientific test tbf)
    
    feedback dtucker@ ok markus@
    
    OpenBSD-Commit-ID: df4112125bf79d8e38e79a77113e1b373078e632

commit a1a8efeaaa9cccb15cdc0a2bd7c347a149a3a7e3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 22 00:45:31 2022 +0000

    upstream: Use sshbuf_read() to read directly into the channel input
    
    buffer rather than into a stack buffer that needs to be copied again;
    Improves performance by about 1% on cipher-speed.sh feedback dtucker@ ok
    markus@
    
    OpenBSD-Commit-ID: bf5e6e3c821ac3546dc8241d8a94e70d47716572

commit 29a76994e21623a1f84d68ebb9dc5a3c909fa3a7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 25 11:52:34 2022 +1100

    depend

commit 754e0d5c7712296a7a3a83ace863812604c7bc4f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 22 00:43:43 2022 +0000

    upstream: Add a sshbuf_read() that attempts to read(2) directly in
    
    to a sshbuf; ok markus@
    
    OpenBSD-Commit-ID: 2d8f249040a4279f3bc23c018947384de8d4a45b

commit c7964fb9829d9ae2ece8b51a76e4a02e8449338d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 21 07:04:19 2022 +0000

    upstream: add a helper for writing an error message to the
    
    stderr_buf and setting quit_pending; no functional change but saves a bunch
    of boilerplate
    
    OpenBSD-Commit-ID: 0747657cad6b9eabd514a6732adad537568e232d

commit d23b4f7fdb1bd87e2cd7a9ae7c198ae99d347916
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 21 06:58:06 2022 +0000

    upstream: correct comment and use local variable instead of long
    
    indirection; spotted by dtucker@
    
    OpenBSD-Commit-ID: 5f65f5f69db2b7d80a0a81b08f390a63f8845965

commit d069b020a02b6e3935080204ee44d233e8158ebb
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Jan 21 00:53:40 2022 +0000

    upstream: When poll(2) returns -1, for some error conditions
    
    pfd[].revents is not cleared.  There are subtle errors in various programs.
    In this particular case, the program should error out. ok djm millert
    
    OpenBSD-Commit-ID: 00f839b16861f7fb2adcf122e95e8a82fa6a375c

commit e204b34337a965feb439826157c191919fd9ecf8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 22 11:38:21 2022 +1100

    restore tty force-read hack
    
    This portable-specific hack fixes a hang on exit for ttyful sessions
    on Linux and some SysVish Unix variants. It was accidentally disabled
    in commit 5c79952dfe1a (a precursor to the mainloop poll(2) conversion).
    
    Spotted by John in bz3383

commit 68085066b6bad43643b43f5957fcc5fd34782ccd
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Fri Jan 21 03:22:56 2022 +1100

    Fix signedness bug in Cygwin code
    
    The Cygwin-specific pattern match code has a bug.  It checks
    the size_t value returned by mbstowcs for being < 0.  The right
    thing to do is to check against (size_t) -1.  Fix that.
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

commit 2e5cfed513e84444483baf1d8b31c40072b05103
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 20 13:26:27 2022 +1100

    Improve compatibility of early exit trap handling.
    
    Dash (as used by the github runners) has some differences in its trap
    builtin:
     - it doesn't have -p (which is fine, that's not in posix).
     - it doesn't work in a subshell (which turns out to be in compliance
       with posix, which means bash isn't).
     - it doesn't work in a pipeline, ie "trap|cat" produces no output.

commit 3fe6800b6027add478e648934cbb29d684e51943
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 20 00:49:57 2022 +1100

    Move more tests out of valgrind-1 runner.

commit 20da6ed136dd76e6a0b229ca3036ef9c7c7ef798
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jan 19 15:37:39 2022 +1100

    Invoke EXIT handler early when using Valgrind.
    
    When using Valgrind, we need to wait for all invoked programs to
    complete before checking their valgrind logs.  Some tests, notably
    agent-restrict, set an EXIT trap handler to clean up things like
    ssh-agent, but those do not get invoked until test-exec.sh exits.
    This causes the Valgrind wait to deadlock, so if present invoke
    the EXIT handler before checking the Valgrind logs.

commit ad2e0580c87b0714cf166bca9d926a95ddeee1c8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jan 18 12:55:21 2022 +1100

    Remove line leftover from upstream sync.

commit d1051c0f11a6b749027e26bbeb61b07df4b67e15
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 17 22:56:04 2022 +0000

    upstream: when decompressing zlib compressed packets, use
    
    Z_SYNC_FLUSH instead of Z_PARTIAL_FLUSH as the latter is not actually
    specified as a valid mode for inflate(). There should be no practical change
    in behaviour as the compression side ensures a flush that should make all
    data available to the receiver in all cases.
    
    repoted by lamm AT ibm.com via bz3372; ok markus
    
    OpenBSD-Commit-ID: 67cfc1fa8261feae6d2cc0c554711c97867cc81b

commit d5981b1883746b1ae178a46229c26b53af99e37a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 17 21:41:04 2022 +0000

    upstream: make most of the sftp errors more idiomatic, following
    
    the general form of "[local/remote] operation path: error message"; ok markus
    
    OpenBSD-Commit-ID: 61364cd5f3a9fecaf8d63b4c38a42c0c91f8b571

commit ac7c9ec894ed0825d04ef69c55babb49bab1d32e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 17 21:39:51 2022 +0000

    upstream: when transferring multiple files in SFTP mode, create the
    
    destination directory if it doesn't already exist to match olde-scp(1)
    behaviour. noticed by deraadt@ ok markus@
    
    OpenBSD-Commit-ID: cf44dfa231d4112f697c24ff39d7ecf2e6311407

commit 39d17e189f8e72c34c722579d8d4e701fa5132da
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 14 03:43:48 2022 +0000

    upstream: allow pin-required FIDO keys to be added to ssh-agent(1).
    
    ssh-askpass will be used to request the PIN at authentication time.
    
    From Pedro Martelletto, ok djm
    
    OpenBSD-Commit-ID: de8189fcd35b45f632484864523c1655550e2950

commit 52423f64e13db2bdc31a51b32e999cb1bfcf1263
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 14 03:35:10 2022 +0000

    upstream: ssh-sk: free a resident key's user id
    
    From Pedro Martelletto; ok dtucker & me
    
    OpenBSD-Commit-ID: 47be40d602b7a6458c4c71114df9b53d149fc2e9

commit 014e2f147a2788bfb3cc58d1b170dcf2bf2ee493
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 14 03:34:00 2022 +0000

    upstream: sshsk_load_resident: don't preallocate resp
    
    resp is allocated by client_converse(), at which point we lose
    the original pointer.
    
    From Pedro Martelletto; ok dtucker & me
    
    OpenBSD-Commit-ID: 1f1b5ea3282017d6584dfed4f8370dc1db1f44b1

commit c88265f207dfe0e8bdbaf9f0eda63ed6b33781cf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 14 03:32:52 2022 +0000

    upstream: sshsk_sign: trim call to sshkey_fingerprint()
    
    the resulting fingerprint doesn't appear to be used for anything,
    and we end up leaking it.
    
    from Pedro Martelletto; ok dtucker & me
    
    OpenBSD-Commit-ID: 5625cf6c68f082bc2cbbd348e69a3ed731d2f9b7

commit 1cd1b2eac39661b849d5a4b4b56363e22bb5f61e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 14 03:31:52 2022 +0000

    upstream: use status error message to communicate ~user expansion
    
    failures; provides better experience for scp in sftp mode, where ~user paths
    are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg &
    markus
    
    (forgot to include this file in previous commit)
    
    OpenBSD-Commit-ID: d37cc4c8c861ce48cd6ea9899e96aaac3476847b

commit a1d42a6ce0398da3833bedf374ef2571af7fea50
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 14 13:49:32 2022 +1100

    fix edge case in poll(2) wrapper
    
    Correct handling of select(2) exceptfds. These should only be consulted
    for POLLPRI flagged pfds and not unconditionally converted to POLLERR.
    
    with and ok dtucker@

commit 976b9588b4b5babcaceec4767a241c11a67a5ccb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jan 14 13:46:35 2022 +1100

    Wrap OpenSSL includes in unit tests in ifdef.
    
    Fixes unit test on systems that do not have OpenSSL headers installed.

commit c171879374b2e8b07157503f5639ed0bce59ce89
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 13 15:53:33 2022 +1100

    Remove sort wrapper.
    
    agent-restrict now takes care of this itself.

commit 9cc2654403f1a686bb26c07a6ac790edf334cef5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 13 04:53:16 2022 +0000

    upstream: Set LC_ALL in both local and remote shells so that sorted
    
    output matches regardless of what the user's shell sets it to.  ok djm@
    
    OpenBSD-Regress-ID: 4e97dd69a68b05872033175a4c2315345d01837f

commit 7a75f748cb2dd2f771bf70ea72698aa027996ab1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 13 04:22:10 2022 +0000

    upstream: Avoid %'s in commands (not used in OpenBSD, but used in
    
    -portable's Valgrind test) being interpretted as printf format strings.
    
    OpenBSD-Regress-ID: dc8655db27ac4acd2c386c4681bf42a10d80b043

commit 6c435bd4994d71442192001483a1cdb846e5ffcd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jan 12 16:58:13 2022 +1100

    Stop on first test failure to minimize logs.

commit 4bc2ba6095620a4484b708ece12842afd8c7685b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jan 12 07:18:37 2022 +0000

    upstream: Use egrep when searching for an anchored string.
    
    OpenBSD-Regress-ID: dd114a2ac27ac4b06f9e4a586d3f6320c54aeeb4

commit 6bf2efa2679da1e8e60731f41677b2081dedae2c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jan 12 18:25:06 2022 +1100

    Add "rev" command replacement if needed.

commit 72bcd7993dadaf967bb3d8564ee31cbf38132b5d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jan 12 03:30:32 2022 +0000

    upstream: Don't log NULL hostname in restricted agent code,
    
    printf("%s", NULL) is not safe on all platforms.  with & ok djm
    
    OpenBSD-Commit-ID: faf10cdae4adde00cdd668cd1f6e05d0a0e32a02

commit acabefe3f8fb58c867c99fed9bbf84dfa1771727
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 11 22:33:16 2022 +0000

    upstream: remove hardcoded domain and use window.location.host, so this
    
    can be run anywhere
    
    OpenBSD-Regress-ID: 2ac2ade3b6227d9c547351d3ccdfe671e62b7f92

commit 96da0946e44f34adc0397eb7caa6ec35a3e79891
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jan 11 02:56:19 2022 +0000

    upstream: "void" functions should not return anything. From Tim Rice
    
    via -portable.
    
    OpenBSD-Commit-ID: ce6616304f4c9881b46413e616b226c306830e2a

commit a882a09722c9f086c9edb65d0c4022fd965ec1ed
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 11 01:26:47 2022 +0000

    upstream: suppress "Connection to xxx closed" messages at LogLevel >=
    
    error bz3378; ok dtucker@
    
    OpenBSD-Commit-ID: d5bf457d5d2eb927b81d0663f45248a31028265c

commit 61a1a6af22e17fc94999a5d1294f27346e6c4668
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 12 08:57:49 2022 +1100

    OS X poll(2) is broken; use compat replacement
    
    Darwin's poll(2) implementation is broken. For character-special
    devices like /dev/null, it returns POLLNVAL when polled with
    POLLIN.
    
    Apparently this is Apple bug 3710161, which is AFAIK not public,
    but a websearch will find other OSS projects rediscovering it
    periodically since it was first identified in 2005 (!!)

commit 613a6545fc5a9542753b503cbe5906538a640b60
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jan 11 20:56:01 2022 +1100

    libhardended_malloc.so moved into out dir.

commit 61761340be5e11046556623f8f5412b236cefa95
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Jan 10 11:07:04 2022 -0800

    Make USL compilers happy
    UX:acomp: ERROR: "sftp-server.c", line 567: void function cannot return value

commit 3ef403f351e80a59b6f7e9d43cb82c181855483c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jan 10 21:07:38 2022 +1100

    Add wrapper for "sort" to set LC_ALL=C.
    
    Found by djm, this should make sorts stable and reduce test flakiness.

commit bd69e29f5716090181dbe0b8272eb7eab1a383bb
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jan 8 07:55:26 2022 +0000

    upstream: Remove errant "set -x" left over from debugging.
    
    OpenBSD-Regress-ID: cd989268e034264cec5df97be7581549032c87dc

commit 1a7c88e26fd673813dc5f61c4ac278564845e004
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jan 8 07:01:13 2022 +0000

    upstream: Enable all supported hostkey algorithms (but no others).
    
    Allows hostbased test to pass when built without OpenSSL.
    
    OpenBSD-Regress-ID: 5ddd677a68b672517e1e78460dc6ca2ccc0a9562

commit 12b457c2a42ff271e7967d9bedd068cebb048db9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 8 07:37:32 2022 +0000

    upstream: use status error message to communicate ~user expansion
    
    failures; provides better experience for scp in sftp mode, where ~user paths
    are more likely to be used; spotted jsg, feedback jsg & deraadt ok jsg &
    markus
    
    OpenBSD-Commit-ID: fc610ce00ca0cdc2ecdabbd49ce7cb82033f905f

commit 63670d4e9030bcee490d5a9cce561373ac5b3b23
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 8 07:36:11 2022 +0000

    upstream: fix some corner-case bugs in scp sftp-mode handling of
    
    ~-prefixed paths; spotted by jsg; feedback jsg & deraadt, ok jsg & markus
    
    OpenBSD-Commit-ID: d1697dbaaa9f0f5649d69be897eab25c7d37c222

commit e14940bbec57fc7d3ce0644dbefa35f5a8ec97d0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 8 07:34:57 2022 +0000

    upstream: more idiomatic error messages; spotted by jsg & deraadt
    
    ok jsg & markus
    
    OpenBSD-Commit-ID: 43618c692f3951747b4151c477c7df22afe2bcc8

commit 9acddcd5918c623f7ebf454520ffe946a8f15e90
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 8 07:33:54 2022 +0000

    upstream: add a variant of send_status() that allows overriding the
    
    default, generic error message. feedback/ok markus & jsg
    
    OpenBSD-Commit-ID: 81f251e975d759994131b717ee7c0b439659c40f

commit 961411337719d4cd78f1ab33e4ac549f3fa22f50
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 8 07:32:45 2022 +0000

    upstream: refactor tilde_expand_filename() and make it handle ~user
    
    paths with no trailing slash; feedback/ok markus and jsg
    
    OpenBSD-Commit-ID: a2ab365598a902f0f14ba6a4f8fb2d07a9b5d51d

commit dc38236ab6827dec575064cac65c8e7035768773
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 6 22:14:25 2022 +0000

    upstream: Don't explicitly set HostbasedAuthentication in
    
    sshd_config. It defaults to "no", and not explicitly setting it allows us to
    enable it for the (optional) hostbased test.
    
    OpenBSD-Regress-ID: aa8e3548eb5793721641d26e56c29f363b767c0c

commit e12d912ddf1c873cb72e5de9a197afbe0b6622d2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 6 21:46:56 2022 +0000

    upstream: Add test for hostbased auth. It requires some external
    
    setup (see comments at the top) and thus is disabled unless
    TEST_SSH_HOSTBASED_AUTH and SUDO are set.
    
    OpenBSD-Regress-ID: 3ec8ba3750c5b595fc63e7845d13483065a4827a

commit a48533a8da6a0f4f05ecd055dc8048047e53569e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 7 09:24:26 2022 +1100

    depend

commit d9dbb5d9a0326e252d3c7bc13beb9c2434f59409
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 6 22:06:51 2022 +0000

    upstream: allow hostbased auth to select RSA keys when only
    
    RSA/SHA2 are configured (this is the default case); ok markus@
    
    OpenBSD-Commit-ID: 411c18c7bde40c60cc6dfb7017968577b4d4a827

commit fdb1d58d0d3888b042e5a500f6ce524486aaf782
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 6 22:05:42 2022 +0000

    upstream: add a helper function to match a key type to a list of
    
    signature algorithms. RSA keys can make signatures with multiple algorithms,
    so some special handling is required. ok markus@
    
    OpenBSD-Commit-ID: 03b41b2bda06fa4cd9c84cef6095033b9e49b6ff

commit 11e8c4309a5086a45fbbbc87d0af5323c6152914
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 6 22:04:20 2022 +0000

    upstream: log some details on hostkeys that ssh loads for
    
    hostbased authn ok markus@
    
    OpenBSD-Commit-ID: da17061fa1f0e58cb31b88478a40643e18233e38

commit c6706f661739514a34125aa3136532a958929510
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 6 22:03:59 2022 +0000

    upstream: log signature algorithm during verification by monitor;
    
    ok markus
    
    OpenBSD-Commit-ID: 02b92bb42c4d4bf05a051702a56eb915151d9ecc

commit 8832402bd500d1661ccc80a476fd563335ef6cdc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 6 22:02:52 2022 +0000

    upstream: piece of UpdateHostkeys client strictification: when
    
    updating known_hosts with new keys, ignore NULL keys (forgot to include in
    prior commit)
    
    OpenBSD-Commit-ID: 49d2eda6379490e1ceec40c3b670b973f63dea08

commit c2d9ced1da0276961d86690b3bd7ebdaca7fdbf7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 6 22:01:14 2022 +0000

    upstream: include rejected signature algorithm in error message
    
    and not the (useless) key type; ok markus
    
    OpenBSD-Commit-ID: 4180b5ec7ab347b43f84e00b1972515296dab023

commit 7aa7b096cf2bafe2777085abdeed5ce00581f641
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 6 22:00:18 2022 +0000

    upstream: make ssh-keysign use the requested signature algorithm
    
    and not the default for the keytype. Part of unbreaking hostbased auth for
    RSA/SHA2 keys. ok markus@
    
    OpenBSD-Commit-ID: b5639a14462948970da3a8020dc06f9a80ecccdc

commit 291721bc7c840d113a49518f3fca70e86248b8e8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 6 21:57:28 2022 +0000

    upstream: stricter UpdateHostkey signature verification logic on
    
    the client- side. Require RSA/SHA2 signatures for RSA hostkeys except when
    RSA/SHA1 was explicitly negotiated during initial KEX; bz3375
    
    ok markus@
    
    OpenBSD-Commit-ID: 46e75e8dfa2c813781805b842580dcfbd888cf29

commit 0fa33683223c76289470a954404047bc762be84c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 6 21:55:23 2022 +0000

    upstream: Fix signature algorithm selection logic for
    
    UpdateHostkeys on the server side. The previous code tried to prefer RSA/SHA2
    for hostkey proofs of RSA keys, but missed some cases. This will use RSA/SHA2
    signatures for RSA keys if the client proposed these algorithms in initial
    KEX. bz3375
    
    Mostly by Dmitry Belyavskiy with some tweaks by me.
    
    ok markus@
    
    OpenBSD-Commit-ID: c17ba0c3236340d2c6a248158ebed042ac6a8029

commit 17877bc81db3846e6e7d4cfb124d966bb9c9296b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 6 21:48:38 2022 +0000

    upstream: convert ssh, sshd mainloops from select() to poll();
    
    feedback & ok deraadt@ and markus@ has been in snaps for a few months
    
    OpenBSD-Commit-ID: a77e16a667d5b194dcdb3b76308b8bba7fa7239c

commit 5c79952dfe1aa36105c93b3f383ce9be04dee384
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 6 21:46:23 2022 +0000

    upstream: prepare for conversion of ssh, sshd mainloop from
    
    select() to poll() by moving FD_SET construction out of channel handlers into
    separate functions. ok markus
    
    OpenBSD-Commit-ID: 937fbf2a4de12b19fb9d5168424e206124807027

commit 24c5187edfef4651a625b7d5d692c8c7e794f71f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 5 21:54:37 2022 +0000

    upstream: add a comment so I don't make this mistake again
    
    OpenBSD-Commit-ID: 69c7f2362f9de913bb29b6318580c5a1b52c921e

commit 7369900441929058263a17f56aa67e05ff7ec628
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 5 21:50:00 2022 +0000

    upstream: fix cut-and-pasto in error message
    
    OpenBSD-Commit-ID: 4cc5c619e4b456cd2e9bb760d17e3a9c84659198

commit 294c11b1c7d56d3fb61e329603a782315ed70c62
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 5 08:25:05 2022 +0000

    upstream: select all RSA hostkey algorithms for UpdateHostkeys tests,
    
    not just RSA-SHA1
    
    OpenBSD-Regress-ID: b40e62b65863f2702a0c10aca583b2fe76772bd8

commit 2ea1108c30e3edb6f872dfc1e6da10b041ddf2c0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 5 04:56:15 2022 +0000

    upstream: regress test both sshsig message hash algorithms, possible
    
    now because the algorithm is controllable via the CLI
    
    OpenBSD-Regress-ID: 0196fa87acc3544b2b4fd98de844a571cb09a39f

commit 2327c306b5d4a2b7e71178e5a4d139af9902c2b0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 5 04:50:11 2022 +0000

    upstream: allow selection of hash at sshsig signing time; code
    
    already supported either sha512 (default) or sha256, but plumbing wasn't
    there mostly by Linus Nordberg
    
    OpenBSD-Commit-ID: 1b536404b9da74a84b3a1c8d0b05fd564cdc96cd

commit 56e941d0a00d6d8bae88317717d5e1b7395c9529
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 5 04:27:54 2022 +0000

    upstream: add missing -O option to usage() for ssh-keygen -Y sign;
    
    from Linus Nordberg
    
    OpenBSD-Commit-ID: 4e78feb4aa830727ab76bb2e3d940440ae1d7af0

commit 141a14ec9b0924709c98df2dd8013bde5d8d12c7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 5 04:27:01 2022 +0000

    upstream: move sig_process_opts() to before sig_sign(); no
    
    functional code change
    
    OpenBSD-Commit-ID: da02d61f5464f72b4e8b299f83e93c3b657932f9

commit 37a14249ec993599a9051731e4fb0ac5e976aec1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 5 04:10:39 2022 +0000

    upstream: regression test for find-principals NULL deref; from Fabian
    
    Stelzer
    
    OpenBSD-Regress-ID: f845a8632a5a7d5ae26978004c93e796270fd3e5

commit eb1f042142fdaba93f6c9560cf6c91ae25f6884a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 5 04:02:42 2022 +0000

    upstream: NULL deref when using find-principals when matching an
    
    allowed_signers line that contains a namespace restriction, but no
    restriction specified on the command-line; report and fix from Fabian Stelzer
    
    OpenBSD-Commit-ID: 4a201b86afb668c908d1a559c6af456a61f4b145

commit 8f3b18030579f395eca2181da31a5f945af12a59
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jan 4 08:38:53 2022 +0000

    upstream: Log command invocation while debugging.
    
    This will aid in manually reproducing failing commands.
    
    OpenBSD-Regress-ID: b4aba8d5ac5675ceebeeeefa3261ce344e67333a

commit bbf285164df535f0d38c36237f007551bbdae27f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Dec 26 10:31:15 2021 +1100

    Always save config.h as build artifact.
    
    Should allow better comparison between failing and succeeding test
    platforms.

commit 03bd4ed0db699687c5cd83405d26f81d2dc28d22
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Dec 25 16:42:51 2021 +1100

    Add OpenBSD 7.0 target.  Retire 6.8.

commit c45a752f0de611afd87755c2887c8a24816d08ee
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Sat Jan 1 05:55:06 2022 +0000

    upstream: spelling
    
    OpenBSD-Commit-ID: c63e43087a64d0727af13409c708938e05147b62

commit c672f83a89a756564db0d3af9934ba0e1cf8fa3e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 4 07:20:33 2022 +0000

    upstream: unbreak test: was picking up system ssh-add instead of the
    
    one supposedly being tested. Spotted by dtucker and using his VM zoo (which
    includes some systems old enough to lack ed25519 key support)
    
    OpenBSD-Regress-ID: 7976eb3df11cc2ca3af91030a6a8c0cef1590bb5

commit a23698c3082ffe661abed14b020eac9b0c25eb9f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 1 04:18:06 2022 +0000

    upstream: fix memleak in process_extension(); oss-fuzz issue #42719
    
    OpenBSD-Commit-ID: d8d49f840162fb7b8949e3a5adb8107444b6de1e

commit cb885178f36b83d0f14cfe9f345d2068103feed0
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Sat Jan 1 01:55:30 2022 +0000

    upstream: spelling ok dtucker@
    
    OpenBSD-Commit-ID: bfc7ba74c22c928de2e257328b3f1274a3dfdf19

commit 6b977f8080a32c5b3cbb9edb634b9d5789fb79be
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 26 23:34:41 2021 +0000

    upstream: split method list search functionality from
    
    authmethod_lookup() into a separate authmethod_byname(), for cases where we
    don't need to check whether a method is enabled, etc.
    
    use this to fix the "none" authentication method regression reported
    by Nam Nguyen via bugs@
    
    ok deraadt@
    
    OpenBSD-Commit-ID: 8cd188dc3a83aa8abe5b7693e762975cd8ea8a17

commit 0074aa2c8d605ee7587279a22cdad4270b4ddd07
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Dec 22 06:56:41 2021 +0000

    upstream: sort -H and -h in SYNOPSIS/usage(); tweak the -H text;
    
    ok djm
    
    OpenBSD-Commit-ID: 90721643e41e9e09deb5b776aaa0443456ab0965

commit 1c9853a68b2319f2e5f929179735e8fbb9988a67
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Dec 22 19:33:10 2021 +1100

    Use SHA.*_HMAC_BLOCK_SIZE if needed.
    
    If the platform has a native SHA2, does not define SHA.*_BLOCK_LENGTH
    but does define SHA.*_HMAC_BLOCK_SIZE (eg Solaris) then use the latter.
    Should fix --without-openssl build on Solaris.

commit 715c892f0a5295b391ae92c26ef4d6a86ea96e8e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 22 09:02:50 2021 +1100

    remove sys/param.h in -portable, after upstream

commit 7a7c69d8b4022b1e5c0afb169c416af8ce70f3e8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 20 13:05:20 2021 +1100

    add agent-restrict.sh file, missed in last commit

commit f539136ca51a4976644db5d0be8158cc1914c72a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:20:12 2021 +0000

    upstream: regression test for destination restrictions in ssh-agent
    
    OpenBSD-Regress-ID: 3c799d91e736b1753b4a42d80c42fc40de5ad33d

commit 6e4980eb8ef94c04874a79dd380c3f568e8416d6
Author: anton@openbsd.org <anton@openbsd.org>
Date:   Sat Dec 18 06:53:59 2021 +0000

    upstream: Make use of ntests variable, pointed out by clang 13.
    
    OpenBSD-Regress-ID: 4241a3d21bdfa1630ed429b6d4fee51038d1be72

commit 3eead8158393b697f663ec4301e3c7b6f24580b1
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Tue Dec 14 21:25:27 2021 +0000

    upstream: sys/param.h cleanup, mostly using MINIMUM() and
    
    <limits.h> ok dtucker
    
    OpenBSD-Regress-ID: 172a4c45d3bcf92fa6cdf6c4b9db3f1b3abe4db0

commit 266678e19eb0e86fdf865b431b6e172e7a95bf48
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:15:42 2021 +0000

    upstream: document host-bound publickey authentication
    
    OpenBSD-Commit-ID: ea6ed91779a81f06d961e30ecc49316b3d71961b

commit 3d00024b3b156aa9bbd05d105f1deb9cb088f6f7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:15:21 2021 +0000

    upstream: document agent protocol extensions
    
    OpenBSD-Commit-ID: 09e8bb391bbaf24c409b75a4af44e0cac65405a7

commit c385abf76511451bcba78568167b1cd9e90587d5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:14:47 2021 +0000

    upstream: PubkeyAuthentication=yes|no|unbound|host-bound
    
    Allow control over which pubkey methods are used. Added out of
    concern that some hardware devices may have difficulty signing
    the longer pubkey authentication challenges. This provides a
    way for them to disable the extension. It's also handy for
    testing.
    
    feedback / ok markus@
    
    OpenBSD-Commit-ID: ee52580db95c355cf6d563ba89974c210e603b1a

commit 34b1e9cc7654f41cd4c5b1cc290b999dcf6579bb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:14:12 2021 +0000

    upstream: document destination-constrained keys
    
    feedback / ok markus@
    
    OpenBSD-Commit-ID: cd8c526c77268f6d91c06adbee66b014d22d672e

commit a6d7677c4abcfba268053e5867f2acabe3aa371b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:13:55 2021 +0000

    upstream: Use hostkey parsed from hostbound userauth request
    
    Require host-bound userauth requests for forwarded SSH connections.
    
    The hostkey parsed from the host-bound userauth request is now checked
    against the most recently bound session ID / hostkey on the agent socket
    and the signature refused if they do not match.
    
    ok markus@
    
    OpenBSD-Commit-ID: d69877c9a3bd8d1189a5dbdeceefa432044dae02

commit baaff0ff4357cc5a079621ba6e2d7e247b765061
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:13:33 2021 +0000

    upstream: agent support for parsing hostkey-bound signatures
    
    Allow parse_userauth_request() to work with blobs from
    publickey-hostbound-v00@openssh.com userauth attempts.
    
    Extract hostkey from these blobs.
    
    ok markus@
    
    OpenBSD-Commit-ID: 81c064255634c1109477dc65c3e983581d336df8

commit 3e16365a79cdeb2d758cf1da6051b1c5266ceed7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:13:12 2021 +0000

    upstream: EXT_INFO negotiation of hostbound pubkey auth
    
    the EXT_INFO packet gets a new publickey-hostbound@openssh.com to
    advertise the hostbound public key method.
    
    Client side support to parse this feature flag and set the kex->flags
    indicator if the expected version is offered (currently "0").
    
    ok markus@
    
    OpenBSD-Commit-ID: 4cdb2ca5017ec1ed7a9d33bda95c1d6a97b583b0

commit 94ae0c6f0e35903b695e033bf4beacea1d376bb1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:12:54 2021 +0000

    upstream: client side of host-bound pubkey authentication
    
    Add kex->flags member to enable the publickey-hostbound-v00@openssh.com
    authentication method.
    
    Use the new hostbound method in client if the kex->flags flag was set,
    and include the inital KEX hostkey in the userauth request.
    
    Note: nothing in kex.c actually sets the new flag yet
    
    ok markus@
    
    OpenBSD-Commit-ID: 5a6fce8c6c8a77a80ee1526dc467d91036a5910d

commit 288fd0218dbfdcb05d9fbd1885904bed9b6d42e6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:12:30 2021 +0000

    upstream: sshd side of hostbound public key auth
    
    This is identical to the standard "publickey" method, but it also includes
    the initial server hostkey in the message signed by the client.
    
    feedback / ok markus@
    
    OpenBSD-Commit-ID: 7ea01bb7238a560c1bfb426fda0c10a8aac07862

commit dbb339f015c33d63484261d140c84ad875a9e548
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:12:07 2021 +0000

    upstream: prepare for multiple names for authmethods
    
    allow authentication methods to have one additional name beyond their
    primary name.
    
    allow lookup by this synonym
    
    Use primary name for authentication decisions, e.g. for
    PermitRootLogin=publickey
    
    Pass actual invoked name to the authmethods, so they can tell whether they
    were requested via the their primary name or synonym.
    
    ok markus@
    
    OpenBSD-Commit-ID: 9e613fcb44b8168823195602ed3d09ffd7994559

commit 39f00dcf44915f20684160f0a88d3ef8a3278351
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:11:39 2021 +0000

    upstream: ssh-agent side of destination constraints
    
    Gives ssh-agent the ability to parse restrict-destination-v00@openssh.com
    constraints and to apply them to keys.
    
    Check constraints against the hostkeys recorded for a SocketEntry when
    attempting a signature, adding, listing or deleting keys. Note that
    the "delete all keys" request will remove constrained keys regardless of
    location.
    
    feedback Jann Horn & markus@
    ok markus@
    
    OpenBSD-Commit-ID: 84a7fb81106c2d609a6ac17469436df16d196319

commit ce943912df812c573a33d00bf9e5435b7fcca3f7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:11:06 2021 +0000

    upstream: ssh-add side of destination constraints
    
    Have ssh-add accept a list of "destination constraints" that allow
    restricting where keys may be used in conjunction with a ssh-agent/ssh
    that supports session ID/hostkey binding.
    
    Constraints are specified as either "[user@]host-pattern" or
    "host-pattern>[user@]host-pattern".
    
    The first form permits a key to be used to authenticate as the
    specified user to the specified host.
    
    The second form permits a key that has previously been permitted
    for use at a host to be available via a forwarded agent to an
    additional host.
    
    For example, constraining a key with "user1@host_a" and
    "host_a>host_b". Would permit authentication as "user1" at
    "host_a", and allow the key to be available on an agent forwarded
    to "host_a" only for authentication to "host_b". The key would not
    be visible on agent forwarded to other hosts or usable for
    authentication there.
    
    Internally, destination constraints use host keys to identify hosts.
    The host patterns are used to obtain lists of host keys for that
    destination that are communicated to the agent. The user/hostkeys are
    encoded using a new restrict-destination-v00@openssh.com key
    constraint.
    
    host keys are looked up in the default client user/system known_hosts
    files. It is possible to override this set on the command-line.
    
    feedback Jann Horn & markus@
    ok markus@
    
    OpenBSD-Commit-ID: 6b52cd2b637f3d29ef543f0ce532a2bce6d86af5

commit 5e950d765727ee0b20fc3d2cbb0c790b21ac2425
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:10:24 2021 +0000

    upstream: ssh-add side of destination constraints
    
    Have ssh-add accept a list of "destination constraints" that allow
    restricting where keys may be used in conjunction with a ssh-agent/ssh
    that supports session ID/hostkey binding.
    
    Constraints are specified as either "[user@]host-pattern" or
    "host-pattern>[user@]host-pattern".
    
    The first form permits a key to be used to authenticate as the
    specified user to the specified host.
    
    The second form permits a key that has previously been permitted
    for use at a host to be available via a forwarded agent to an
    additional host.
    
    For example, constraining a key with "user1@host_a" and
    "host_a>host_b". Would permit authentication as "user1" at
    "host_a", and allow the key to be available on an agent forwarded
    to "host_a" only for authentication to "host_b". The key would not
    be visible on agent forwarded to other hosts or usable for
    authentication there.
    
    Internally, destination constraints use host keys to identify hosts.
    The host patterns are used to obtain lists of host keys for that
    destination that are communicated to the agent. The user/hostkeys are
    encoded using a new restrict-destination-v00@openssh.com key
    constraint.
    
    host keys are looked up in the default client user/system known_hosts
    files. It is possible to override this set on the command-line.
    
    feedback Jann Horn & markus@
    ok markus@
    
    OpenBSD-Commit-ID: ef47fa9ec0e3c2a82e30d37ef616e245df73163e

commit 4c1e3ce85e183a9d0c955c88589fed18e4d6a058
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:09:23 2021 +0000

    upstream: ssh-agent side of binding
    
    record session ID/hostkey/forwarding status for each active socket.
    
    Attempt to parse data-to-be-signed at signature request time and extract
    session ID from the blob if it is a pubkey userauth request.
    
    ok markus@
    
    OpenBSD-Commit-ID: a80fd41e292b18b67508362129e9fed549abd318

commit e9497ecf73f3c16667288bce48d4e3d7e746fea1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:08:48 2021 +0000

    upstream: ssh client side of binding
    
    send session ID, hostkey, signature and a flag indicating whether the
    agent connection is being forwarded to ssh agent each time a connection
    is opened via a new "session-bind@openssh.com" agent extension.
    
    ok markus@
    
    OpenBSD-Commit-ID: 2f154844fe13167d3ab063f830d7455fcaa99135

commit b42c61d6840d16ef392ed0f365e8c000734669aa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 19 22:08:06 2021 +0000

    upstream: Record session ID, host key and sig at intital KEX
    
    These will be used later for agent session ID / hostkey binding
    
    ok markus@
    
    OpenBSD-Commit-ID: a9af29e33772b18e3e867c6fa8ab35e1694a81fe

commit 26ca33d186473d58a32d812e19273ce078b6ffff
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 7 22:06:45 2021 +0000

    upstream: better error message for FIDO keys when we can't match
    
    them to a token
    
    OpenBSD-Commit-ID: 58255c2a1980088f4ed144db67d879ada2607650

commit adb0ea006d7668190f0c42aafe3a2864d352e34a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Dec 15 10:50:33 2021 +1100

    Correct value for IPTOS_DSCP_LE.
    
    It needs to allow for the preceeding two ECN bits.  From daisuke.higashi
    at gmail.com via OpenSSH bz#3373, ok claudio@, job@, djm@.

commit 3dafd3fe220bd9046f11fcf5191a79ec8800819f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Dec 10 11:57:30 2021 +1100

    Increase timeout for test step.

commit 5aefb05cd5b843e975b191d6ebb7ddf8de35c112
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Dec 10 10:27:27 2021 +1100

    Update the list of tests that don't work on Minix.
    
    While there, remove CC (configure will now find clang) and make the test
    list easier to update via cut and paste.

commit 1c09bb1b2e207d091cec299c49416c23d24a1b31
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Dec 10 10:12:57 2021 +1100

    Add minix host tuple.
    
    Define SETEUID_BREAKS_SETUID for it which should make privsep work.

commit a2188579032cf080213a78255373263466cb90cc
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Sun Dec 5 12:28:27 2021 +0000

    upstream: fix unintended sizeof pointer in debug path ok markus@
    
    OpenBSD-Commit-ID: b9c0481ffc0cd801e0840e342e6a282a85aac93c

commit da40355234068c82f1a36196f2d18dd2d81aaafd
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sat Dec 4 00:05:39 2021 +0000

    upstream: RSA/SHA-1 is not used by default anymore on the server
    
    OpenBSD-Commit-ID: 64abef6cfc3e53088225f6b8a1dcd86d52dc8353

commit e9c71498a083a8b502aa831ea931ce294228eda0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 2 23:45:36 2021 +0000

    upstream: hash full host:port when asked to hash output, fixes hashes
    
    for non- default ports. bz3367 ok dtucker@
    
    OpenBSD-Commit-ID: 096021cc847da7318ac408742f2d0813ebe9aa73

commit b5601202145a03106012c22cb8980bcac2949f0b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 2 23:23:13 2021 +0000

    upstream: improve the testing of credentials against inserted FIDO
    
    keys a little more: ask the token whether a particular key belongs to it in
    cases where the token support on-token user- verification (e.g. biometrics)
    rather than just assuming that it will accept it.
    
    Will reduce spurious "Confirm user presence" notifications for key
    handles that relate to FIDO keys that are not currently inserted in at
    least some cases.
    
    Motivated by bz3366; by Pedro Martelletto
    
    OpenBSD-Commit-ID: ffac7f3215842397800e1ae2e20229671a55a63d

commit ca709e27c41c90f4565b17282c48dca7756e083c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 2 22:40:05 2021 +0000

    upstream: move check_sk_options() up so we can use it earlier
    
    OpenBSD-Commit-ID: 67fe98ba1c846d22035279782c4664c1865763b4

commit b711bc01a7ec76bb6a285730990cbce9b8ca5773
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Dec 2 22:35:05 2021 +0000

    upstream: ssh-rsa is no longer in the default for
    
    PubkeyAcceptedAlgorithms.
    
    OpenBSD-Commit-ID: 34a9e1bc30966fdcc922934ae00f09f2596cd73c

commit dc91ceea33cd4a9f05be953e8d8062f732db5c8a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 2 02:44:44 2021 +0000

    upstream: don't put the tty into raw mode when SessionType=none, avoids
    
    ^c being unable to kill such a session. bz3360; ok dtucker@
    
    OpenBSD-Commit-ID: 83960c433052303b643b4c380ae2f799ac896f65

commit e6e7d2654a13ba10141da7b42ea683ea4eeb1f38
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 29 14:11:03 2021 +1100

    previous commit broke bcrypt_pbkdf()
    
    Accidentally reverted part of the conversion to use SHA512 from SUPERCOP
    instead of OpenBSD-style libc SHA512.

commit c0459588b8d00b73e506c6095958ecfe62a4a7ba
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 29 14:03:19 2021 +1100

    Fix typo in Neils' name.

commit 158bf854e2a22cf09064305f4a4e442670562685
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 29 12:30:22 2021 +1100

    sync bcrypt-related files with OpenBSD
    
    The main change is that Niels Provos kindly agreed to rescind the
    BSD license advertising clause, shifting them to the 3-term BSD
    license.
    
    This was the last thing in OpenSSH that used the advertising clause.

commit e8976d92a42883ff6b8991438f07df60c2c0d82d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 29 12:29:29 2021 +1100

    depend

commit 8249afeec013e557fe7491a72ca3285de03e25b1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 28 07:21:26 2021 +0000

    upstream: sshsig: return "key not found" when searching empty files
    
    rather than "internal error"
    
    OpenBSD-Commit-ID: e2ccae554c78d7a7cd33fc5d217f35be7e2507ed

commit 9e3227d4dbb5ad9c9091b4c14982cab4bba87b4d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 28 07:15:10 2021 +0000

    upstream: ssh-keygen -Y match-principals doesn't accept any -O
    
    options at present, so don't say otherwise in SYNOPSIS; spotted jmc@
    
    OpenBSD-Commit-ID: 9cc43a18f4091010741930b48b3db2f2e4f1d35c

commit 56db1f4a4cf5039fc3b42e84c4b16291fdff32b1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 28 07:14:29 2021 +0000

    upstream: fix indenting in last commit
    
    OpenBSD-Commit-ID: 8b9ba989815d0dec1fdf5427a4a4b58eb9cac4d2

commit 50bea24a9a9bdebad327c76e700def3261f5694e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 28 07:10:18 2021 +0000

    upstream: missing initialisation for oerrno
    
    OpenBSD-Commit-ID: 05d646bba238080259bec821c831a6f0b48d2a95

commit 5a0f4619041d09cd29f3a08da41db5040372bdd1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 28 15:31:37 2021 +1100

    Correct ifdef to activate poll() only if needed.

commit d4035c81a71237f690edd7eda32bef7d63fd9528
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Nov 27 07:23:35 2021 +0000

    upstream: whitespac e
    
    OpenBSD-Regress-ID: b9511d41568056bda489e13524390167889908f8

commit a443491e6782ef0f5a8bb87a5536c8ee4ff233a1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Nov 27 07:20:58 2021 +0000

    upstream: regression test for match-principals. Mostly by Fabian
    
    Stelzer
    
    OpenBSD-Regress-ID: ced0bec89af90935103438986bbbc4ad1df9cfa7

commit 78230b3ec8cbabc1e7de68732dc5cbd4837c6675
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Nov 27 07:14:46 2021 +0000

    upstream: Add ssh-keygen -Y match-principals operation to perform
    
    matching of principals names against an allowed signers file.
    
    Requested by and mostly written by Fabian Stelzer, towards a TOFU
    model for SSH signatures in git. Some tweaks by me.
    
    "doesn't bother me" deraadt@
    
    OpenBSD-Commit-ID: 8d1b71f5a4127bc5e10a880c8ea6053394465247

commit 15db86611baaafb24c40632784dabf82e3ddb1a7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 25 23:02:24 2021 +0000

    upstream: debug("func: ...") -> debug_f("...")
    
    OpenBSD-Commit-ID: d58494dc05c985326a895adfbe16fbd5bcc54347

commit b7ffbb17e37f59249c31f1ff59d6c5d80888f689
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 19 18:53:46 2021 +1100

    Allow for fd = -1 in compat ppoll overflow check.
    
    Fixes tests on at least FreeBSD 6, possibly others.

commit 04b172da5b96a51b0d55c905b423ababff9f4e0b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 19 16:01:51 2021 +1100

    Don't auto-enable Capsicum sandbox on FreeBSD 9/10.
    
    Since we changed from select() to ppoll() tests have been failing.
    This seems to be because FreeBSD 10 (and presumably 9) do not allow
    ppoll() in the privsep process and sshd will fail with "Not permitted in
    capability mode".  Setting CAP_EVENT on the FDs doesn't help, but weirdly,
    poll() works without that.  Those versions are EOL so this situation is
    unlikely to change.

commit a823f39986e7b879f26412e64c15630e1cfa0dc5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 18 03:53:48 2021 +0000

    upstream: regression test for ssh-keygen -Y find-principals fix; from
    
    Fabian Stelzer ok djm markus
    
    OpenBSD-Regress-ID: 34fe4088854c1a2eb4c0c51cc4676ba24096bac4

commit 199c4df66c0e39dd5c3333b162af274678c0501d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 18 21:32:11 2021 +0000

    upstream: less confusing debug message; bz#3365
    
    OpenBSD-Commit-ID: 836268d3642c2cdc84d39b98d65837f5241e4a50

commit 97f9b6e61316c97a32dad94b7a37daa9b5f6b836
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 18 21:11:01 2021 +0000

    upstream: avoid xmalloc(0) for PKCS#11 keyid for ECDSA keys (we
    
    already did this for RSA keys). Avoids fatal errors for PKCS#11 libraries
    that return empty keyid, e.g. Microchip ATECC608B "cryptoauthlib"; bz#3364
    
    OpenBSD-Commit-ID: 054d4dc1d6a99a2e6f8eebc48207b534057c154d

commit c74aa0eb73bd1edf79947d92d9c618fc3424c4a6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 18 03:50:41 2021 +0000

    upstream: ssh-keygen -Y find-principals was verifying key validity
    
    when using ca certs but not with simple key lifetimes within the allowed
    signers file.
    
    Since it returns the first keys principal it finds this could
    result in a principal with an expired key even though a valid
    one is just below.
    
    patch from Fabian Stelzer; feedback/ok djm markus
    
    OpenBSD-Commit-ID: b108ed0a76b813226baf683ab468dc1cc79e0905

commit d902d728dfd81622454260e23bc09d5e5a9a795e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 18 23:44:07 2021 +1100

    Correct calculation of tv_nsec in poll().

commit 21dd5a9a3fb35e8299a1fbcf8d506f1f6b752b85
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 18 23:11:37 2021 +1100

    Add compat implementation of ppoll using pselect.

commit b544ce1ad4afb7ee2b09f714aa63efffc73fa93a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 18 23:05:34 2021 +1100

    Put poll.h inside ifdef HAVE_POLL_H.

commit 875408270c5a7dd69ed5449e5d85bd7120c88f70
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 18 03:31:44 2021 +0000

    upstream: check for POLLHUP wherever we check for POLLIN
    
    OpenBSD-Commit-ID: 6aa6f3ec6b17c3bd9bfec672a917f003a76d93e5

commit 36b5e37030d35bbaa18ba56825b1af55971d18a0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 18 03:07:59 2021 +0000

    upstream: fd leak in sshd listen loop error path; from Gleb
    
    Smirnoff
    
    OpenBSD-Commit-ID: a7a2be27a690a74bf2381bc16cea38e265657412

commit b99498d0c93f1edd04857b318308a66b28316bd8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 18 03:07:20 2021 +0000

    upstream: check for POLLHUP as well as POLLIN in sshd listen loop;
    
    ok deraadt millert
    
    OpenBSD-Commit-ID: a4f1244c5a9c2b08dac4f3b1dc22e9d1dc60c587

commit 1f3055d788e8cf80851eb1728b535d57eb0dba6a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 18 03:06:03 2021 +0000

    upstream: check for POLLHUP as well as POLLIN, handle transient IO
    
    errors as well as half-close on the output side; ok deraadt millert
    
    OpenBSD-Commit-ID: de5c5b9939a37476d256328cbb96305bdecf511e

commit 9778a15fa6dbdac6a95bf15865c2688b4bd6944e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 18 10:16:55 2021 +1100

    adjust seccomp filter for select->poll conversion
    
    Needed to add ppoll syscall but also to relax the fallback rlimit
    sandbox. Linux poll() fails with EINVAL if npfds > RLIMIT_NOFILE,
    so we have to allow a single fd in the rlimit.

commit fcd8d895bbb849c64f0aed934e3303d37f696f5d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 18 10:16:44 2021 +1100

    update depends

commit 76292787a1e93e668f10e36b4bf59ce0ae28e156
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 18 09:26:20 2021 +1100

    compat for timespecsub() and friends

commit fd7e7de4ddb4399c7e929b44f2bbfc118eddfcf8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 17 21:06:39 2021 +0000

    upstream: set num_listen_socks to 0 on close-all instead of -1,
    
    which interferes with the new poll()-based listen loop; spotted and debugged
    by anton@+deraadt@
    
    OpenBSD-Commit-ID: f7ab8ab124f615a2e0c45fee14c38d2f2abbabbd

commit fd9343579afac30a971f06643a669733d9acb407
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sun Nov 14 18:47:43 2021 +0000

    upstream: use ppoll() instead of pselect() with djm
    
    OpenBSD-Commit-ID: 980f87c9564d5d2ad55722b7a6f44f21284cd215

commit 092d29b232ef1a19609a5316ed7e4d896bb2e696
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sun Nov 14 06:15:36 2021 +0000

    upstream: match .events with .fd better
    
    OpenBSD-Commit-ID: 77eef212ca0add905949532af390164489c5984b

commit 8d642c9a90fa4ed5a3effd785fb3591e14de00cd
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sun Nov 14 03:25:10 2021 +0000

    upstream: convert select() to poll() ok djm
    
    OpenBSD-Commit-ID: b53e4940ff10dd24f8d16e8db8ef1970015d7ead

commit 6582a31c388968f4073af2bd8621880735c3d42b
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sat Nov 13 21:14:13 2021 +0000

    upstream: replace select() with ppoll(), including converting
    
    timeval's to timespec's to make things easier. back and forth and ok; djm
    
    OpenBSD-Commit-ID: 89d3b23c60875da919e7820f9de6213286ffbec9

commit 7c025c005550c86a40200a2bcdd355d09413d61a
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sat Nov 13 17:26:13 2021 +0000

    upstream: It really looks like pledge "stdio dns" is possible
    
    earlier. Discussed with mestre
    
    OpenBSD-Commit-ID: 610873de63a593e0ac7bbbcb7a0f2894d36f4c01

commit 06acb04c20ee483fe4757bd12aec870cc4bb1076
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Nov 12 05:23:49 2021 +0000

    upstream: aggressively pre-fill the pollfd array with fd=-1
    
    OpenBSD-Commit-ID: c2a525de8f83c1a04405bd79122c424140552a5b

commit 7eec76793dec06e8f06b6cf71f9473141c69d109
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Thu Nov 11 15:32:32 2021 +0000

    upstream: Convert from select() to ppoll(). Along the way, I
    
    observed that the select() code was using exceptfds incorrectly.. ok millert
    
    OpenBSD-Commit-ID: 548e05bfc31b2af02319eb3d051286d4128dec96

commit e665ed2d0c24fe11d5470ce72fa1e187377d3fc4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 12 22:55:27 2021 +1100

    Switch from LibreSSL 3.4.0 to 3.4.1.
    
    The LibreSSL 3.4.0 release has an OPENBSD_BRANCH that points to
    "master" and that branch no longer has the files LibreSSL expects
    and thus it will no longer build, breaking the test.

commit 21b6b5a06c8c53c548d25e6074c5240e88e2ef34
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 10 06:29:25 2021 +0000

    upstream: add the sntrup761x25519-sha512@openssh.com hybrid
    
    ECDH/x25519 + Streamlined NTRU Prime post-quantum KEX to the default
    KEXAlgorithms list (after the ECDH methods but before the prime-group DH
    ones).
    
    ok markus@
    
    OpenBSD-Commit-ID: 22b77e27a04e497a10e22f138107579652854210

commit 239da797cbf07a640d7b1ea02d3f99ace3ef792d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 10 06:25:08 2021 +0000

    upstream: fix ssh-keysign for KEX algorithms that use SHA384/512
    
    exchange hashes; feedback/ok markus@
    
    OpenBSD-Commit-ID: 09a8fda1c081f5de1e3128df64f28b7bdadee239

commit 6997a592ecb1013df0c6d7f8df3e6517827aef11
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 8 21:32:49 2021 +0000

    upstream: improve error message when trying to expand a ~user path
    
    for a user that doesn't exist; better matches what the shell does
    
    ok deraadt@
    
    OpenBSD-Commit-ID: 1ddefa3c3a78b69ce13d1b8f67bc9f2cefd23ad6

commit 10b899a15c88eb40eb5f73cd0fa84ef0966f79c9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 10 12:34:25 2021 +1100

    Don't trust closefrom() on Linux.
    
    glibc's closefrom implementation does not work in a chroot when the kernel
    does not have close_range.  It tries to read from /proc/self/fd and when
    that fails dies with an assertion of sorts.  Instead, call close_range
    ourselves from our compat code and fall back if that fails.  bz#3349,
    with william.wilson at canonical.com and fweimer at redhat.com.

commit eb1f63195a9a38b519536a5b398d9939261ec081
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Nov 6 10:13:39 2021 +0000

    upstream: Plug a couple of minor mem leaks. From beldmit at
    
    gmail.com via github PR#283, ok markus@
    
    OpenBSD-Commit-ID: ec1fa7d305d46226861c3ca6fb9c9beb2ada2892

commit e4f501bf1d3b53f1cc23d9521fd7c5163307b760
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 5 03:10:58 2021 +0000

    upstream: move cert_filter_principals() to earlier in the file for
    
    reuse; no code change
    
    OpenBSD-Commit-ID: 598fa9528b656b2f38bcc3cf5b6f3869a8c115cf

commit 59c60f96fee321c7f38f00372826d37f289534af
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed Nov 3 22:00:56 2021 +0000

    upstream: Many downstreams expect ssh to compile as non-C99...
    
    OpenBSD-Commit-ID: e6aa3e08bda68e5fb838fc8a49b1d2dfc38ee783

commit 7a78fe63b0b28ef7231913dfefe9d08f9bc41c61
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Nov 6 21:07:03 2021 +1100

    Skip getline() on HP-UX 10.x.
    
    HP-UX 10.x has a getline() implementation in libc that does not behave
    as we expect so don't use it.  With correction from Thorsten Glaser and
    typo fix from Larkin Nickle.

commit 343ae252ebb35c6ecae26b447bf1551a7666720e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 3 12:08:21 2021 +1100

    basic SECURITY.md (refers people to the website)

commit ed45a0168638319e0a710633f6085b96b9cec656
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 2 22:57:27 2021 +0000

    upstream: crank SSH_SK_VERSION_MAJOR to match recent change in
    
    usr/bin/ssh
    
    OpenBSD-Regress-ID: 113d181c7e3305e138db9b688cdb8b0a0019e552

commit f3c34df860c4c1ebddacb973954e58167d9dbade
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 2 22:56:40 2021 +0000

    upstream: Better handle FIDO keys on tokens that provide user
    
    verification (UV) on the device itself, including biometric keys.
    
    Query the token during key creation to determine whether it supports
    on-token UV and, if so, clear the SSH_SK_USER_VERIFICATION_REQD flag
    in the key so that ssh(1) doesn't automatically prompty for PIN later.
    
    When making signatures with the key, query the token's capabilities
    again and check whether the token is able (right now) to perform user-
    verification without a PIN. If it is then the PIN prompt is bypassed
    and user verification delegated to the token. If not (e.g. the token
    is biometric capable, but no biometric are enrolled), then fall back
    to user verification via the usual PIN prompt.
    
    Work by Pedro Martelletto; ok myself and markus@
    
    NB. cranks SSH_SK_VERSION_MAJOR
    
    OpenBSD-Commit-ID: e318a8c258d9833a0b7eb0236cdb68b5143b2f27

commit 0328a081f38c09d2d4d650e94461a47fb5eef536
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 29 03:03:06 2021 +0000

    upstream: sshsig: add tests for signing key validity and
    
    find-principals
    
    - adds generic find-principals tests (this command had none before)
    - tests certs with a timeboxed validity both with and without a
     restriced lifetime for the CA
    - test for a revoked CA cert
    
    by Fabian Stelzer
    
    OpenBSD-Regress-ID: 9704b2c6df5b8ccfbdf2c06c5431f5f8cad280c9

commit ccd358e1e25e25c13f0825996283cbf7a1647a3b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 29 02:48:19 2021 +0000

    upstream: avoid signedness warning; spotted in -portable
    
    OpenBSD-Regress-ID: 4cacc126086487c0ea7f3d86b42dec458cf0d0c6

commit 2741f52beb11490d7033a25e56ed0496f0c78006
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 29 03:20:46 2021 +0000

    upstream: ssh-keygen: make verify-time argument parsing optional
    
    From Fabian Stelzer
    
    OpenBSD-Commit-ID: 1ff35e4c366a45a073663df90381be6a8ef4d370

commit a1217d363b88b32cfe54c4f02c6c1cf4bdefdd23
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 29 13:48:34 2021 +1100

    unbreak fuzz harness for recent changes

commit 68e522ed8183587c9367fa3842c5b75f64f3d12b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 29 13:32:24 2021 +1100

    Use -Wbitwise-instead-of-logical if supported.

commit be28b23012aa3fa323be7ec84863cf238927c078
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 28 16:24:53 2021 +1100

    use -Wmisleading-indentation cflag if available
    
    ok dtucker@

commit 2e6f5f24dd2f9217f4ab8b737ed428d5d5278f91
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 28 16:24:44 2021 +1100

    depend

commit a5ab4882348d26addc9830a44e053238dfa2cb58
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 6 10:08:30 2021 +1000

    remove built-in support for md5crypt()
    
    Users of MD5-hashed password should arrange for ./configure to link
    against libxcrypt or similar. Though it would be better to avoid use
    of MD5 password hashing entirely, it's arguably worse than DEScrypt.
    
    feedback and ok dtucker@

commit c5de1fffa6328b8246b87da28fa9df05813f76a3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 28 02:55:30 2021 +0000

    upstream: increment SSH_SK_VERSION_MAJOR to match last change
    
    OpenBSD-Regress-ID: 17873814d1cbda97f49c8528d7b5ac9cadf6ddc0

commit 0001d04e55802d5bd9d6dece1081a99aa4ba2828
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 28 02:54:18 2021 +0000

    upstream: When downloading resident keys from a FIDO token, pass
    
    back the user ID that was used when the key was created and append it to the
    filename the key is written to (if it is not the default).
    
    Avoids keys being clobbered if the user created multiple
    resident keys with the same application string but different
    user IDs.
    
    feedback Pedro Martelletto; ok markus
    
    NB. increments SSH_SK_VERSION_MAJOR
    
    OpenBSD-Commit-ID: dbd658b5950f583106d945641a634bc6562dd3a3

commit d4bed5445646e605c383a4374fa962e23bf9e3a3
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sun Oct 24 21:24:17 2021 +0000

    upstream: For open/openat, if the flags parameter does not contain
    
    O_CREAT, the 3rd (variadic) mode_t parameter is irrelevant.  Many developers
    in the past have passed mode_t (0, 044, 0644, or such), which might lead
    future people to copy this broken idiom, and perhaps even believe this
    parameter has some meaning or implication or application. Delete them all.
    This comes out of a conversation where tb@ noticed that a strange (but
    intentional) pledge behaviour is to always knock-out high-bits from mode_t on
    a number of system calls as a safety factor, and his bewilderment that this
    appeared to be happening against valid modes (at least visually), but no
    sorry, they are all irrelevant junk.  They could all be 0xdeafbeef. ok
    millert
    
    OpenBSD-Commit-ID: 503d11633497115688c0c6952686524f01f53121

commit d575cf44895104e0fcb0629920fb645207218129
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 22 23:27:41 2021 +1100

    kitchensink test target now needs krb5.

commit 4ae39cada214e955bcfd3448ff28f0ed18886706
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 22 22:54:33 2021 +1100

    Test both MIT KRB5 and Heimdal.

commit 22b2681d88619e5247dc53c9f112058a7e248d48
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Oct 22 10:51:57 2021 +0000

    upstream: Plug mem addrinfo mem leaks.
    
    Prevent mem leaks in the (unlikely) event that getaddrinfo returns
    no addresses.  ALso, remove an unneeded NULL check in addr_ntop. From
    khaleesicodes via github PR#281, ok deraadt@
    
    OpenBSD-Commit-ID: e8a5afc686376637c355c5f7e122dc4b080b9c1a

commit 27c8c343b610263f83ac2328735feeb881c6c92f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Oct 22 09:22:04 2021 +0000

    upstream: Remove unnecessary semicolons
    
    ... in case statements. From khaleesicodes via github PR#280.
    
    OpenBSD-Commit-ID: e1e89360b65775cff83e77ce040b342015caf4ed

commit e7eb73b8d1fe1008d92433ea949491ce654bfaba
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Oct 22 09:19:34 2021 +0000

    upstream: Fix typos in comments.
    
    From khaleesicodes via github PR#280.
    
    OpenBSD-Commit-ID: 26fdd83652c40f098bf7c685e8ebb9eb72cc45fc

commit 052a9d8494175e24312daa6c132665e58c17fe6e
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Oct 15 14:46:46 2021 +0000

    upstream: switch scp(1) back to sftp protocol.
    
    openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
    protocol for copying.  Let's get back to testing the SFTP protocol.
    
    OpenBSD-Commit-ID: 9eaa35d95fd547b78b0a043b3f518e135f151f30

commit a07664646bf6d293f5bbd45a5de54f3c36bb85da
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 22 14:00:05 2021 +1100

    Source configs script so setup_ci can use settings

commit 34df52c201c6b47e5a46b50c215e4d98a8bf6587
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 22 09:42:14 2021 +1100

    Install libedit and pam based on config flags.

commit 8c626cc563e8d21d844d06f9971a9ee01de6aa2a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 21 16:53:39 2021 +1100

    Don't use 'here string", it's not POSIX.

commit 086a4b5977472aefa3de918b88efad0faf83b2b1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 21 15:33:27 2021 +1100

    Remove -Werror from compiler package to install.

commit 5a7a4687507d057f9b5e7497f3d3f82e64753c02
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 21 15:00:53 2021 +1100

    Build with -Werror on most recent gcc and clang.

commit 4d2cbdb525d673acf941d48a7044fcf03125611a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 15 12:59:06 2021 +1100

    Include string.h and stdio.h for strerror.

commit fff13aaa262b7b3ec83ed21e29674cbf331780a7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 15 12:43:36 2021 +1100

    Include error reason if trace disabling fails.

commit d4b38144c02f3faa5271e5fb35df93507e06f1b4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 12 22:55:51 2021 +1100

    Add tcmalloc test target.

commit 002d65b0a30063c6e49bf8a53e709d8d5a0d45c1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Oct 9 10:52:42 2021 +0000

    upstream: Document that CASignatureAlgorithms, ExposeAuthInfo and
    
    PubkeyAuthOptions can be used in a Match block.  Patch from eehakkin via
    github PR#277.
    
    OpenBSD-Commit-ID: c0a63f5f52e918645967ac022b28392da4b866aa

commit 40bd3709dddaae3a1b6113748bec3faa6a607531
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 7 15:55:49 2021 +1100

    Skip SK unit tests when built without security-key

commit 482f73be10f10b93f818df19fcc8a912c0c371fc
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 7 15:55:04 2021 +1100

    Include relevant env vars on command line.
    
    Makes it easier to reproduce a build by cut/pasting the configure line.

commit ef5916b8acd9b1d2f39fad4951dae03b00dbe390
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 7 14:28:02 2021 +1100

    Only enable sk-* key types if ENABLE_SK is defined

commit 52d4232b493a9858fe616e28a8bbcc89afa2ad4d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Oct 6 18:14:37 2021 +1100

    Disable security key on minix3.
    
    The test doesn't work so disable.

commit 7cd062c3a29669b8d7dc2a97e6575f4dcb7d35a2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Oct 6 17:45:28 2021 +1100

    Add USE_LIBC_SHA2 for (at least) NetBSD 9.

commit 639c440f6c3c2a8216a5eb9455ef13bf4204089c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Oct 6 17:09:31 2021 +1100

    Define OPENSSL_NO_SHA including OpenSSL from test.
    
    We don't use SHA256 from OpenSSL in the sk-dummy module and the
    definitions can conflict with system sha2.h (eg on NetBSD) so define
    OPENSSL_NO_SHA so we don't attempt to redefine them.

commit 8f4be526a338d06624f146fa26007bb9dd3a4f7b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Oct 6 15:40:58 2021 +1100

    Disable security key on NetBSD4 test.
    
    sk-dummy used for the security key test includes both sha2.h and OpenSSL
    causing the definitions conflict so disable security key support on this
    platform.

commit 3b353ae58aa07a1cbbeb1da3ace21fc0dcccd66a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 6 15:07:01 2021 +1100

    clean regress/misc/sk-dummy in cleandir target

commit 57680a2ab43518c5ccbd8242c40482106cde6ac1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Oct 2 03:17:01 2021 +0000

    upstream: Dynamically allocate encoded HashKnownHosts and free as
    
    appropriate. Saves 1k of static storage and prevents snprintf "possible
    truncation" warnings from newer compilers (although in this case it's false
    positive since the actual sizes are limited by the output size of the SHA1).
    ok djm@
    
    OpenBSD-Commit-ID: e254ae723f7e3dce352c7d5abc4b6d87faf61bf4

commit e3e62deb549fde215b777d95276c304f84bf00c6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 6 03:35:13 2021 +0000

    upstream: use libc SHA256 functions; make this work when compiled
    
    !WITH_OPENSSL
    
    OpenBSD-Regress-ID: fda0764c1097cd42f979ace29b07eb3481259890

commit 12937d867019469ebce83c2ff614cdc6688fc2d8
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Oct 1 05:20:20 2021 +0000

    upstream: Add test for ssh hashed known_hosts handling.
    
    OpenBSD-Regress-ID: bcef3b3cd5a1ad9899327b4b2183de2541aaf9cf

commit 5a37cc118f464416d08cd0291a9b1611d8de9943
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 6 13:16:21 2021 +1100

    fix broken OPENSSL_HAS_ECC test
    
    spotted by dtucker

commit 16a25414f303cd6790eb967aeb962040e32c9c7a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 1 22:40:06 2021 +1000

    make sk-dummy.so work without libcrypto installed

commit dee22129bbc61e25b1003adfa2bc584c5406ef2d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 1 16:35:49 2021 +1000

    make OPENSSL_HAS_ECC checks more thorough
    
    ok dtucker

commit 872595572b6c9a584ed754165e8b7c4c9e7e1d61
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 1 16:35:05 2021 +1000

    fix FIDO key support for !OPENSSL_HAS_ECC case
    
    ok dtucker

commit 489741dc68366940d369ac670b210b4834a6c272
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 1 14:51:37 2021 +1000

    enable security key support for --without-openssl

commit c978565c8589acfe4ea37ab5099d39c84158c713
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 1 13:27:50 2021 +1000

    need stdlib.h for free(3)

commit 76a398edfb51951b2d65d522d7b02c72304db300
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Sep 30 05:26:26 2021 +0000

    upstream: Fix up whitespace left by previous
    
    change removing privsep.  No other changes.
    
    OpenBSD-Regress-ID: 87adec225d8afaee4d6a91b2b71203f52bf14b15

commit ddcb53b7a7b29be65d57562302b2d5f41733e8dd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Sep 30 05:20:08 2021 +0000

    upstream: Remove references to privsep.
    
    This removes several do..while loops but does not change the
    indentation of the now-shallower loops, which will be done in a separate
    whitespace-only commit to keep changes of style and substance separate.
    
    OpenBSD-Regress-ID: 4bed1a0249df7b4a87c965066ce689e79472a8f7

commit ece2fbe486164860de8df3f8b943cccca3085eff
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Sep 30 04:22:50 2021 +0000

    upstream: Use "skip" instead of "fatal"
    
    if SUDO isn't set for the *-command tests. This means running "make tests"
    without SUDO set will perform all of the tests that it can instead of
    failing on the ones it cannot run.
    
    OpenBSD-Regress-ID: bd4dbbb02f34b2e8c890558ad4a696248def763a

commit bb754b470c360e787a99fb4e88e2668198e97b41
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 1 04:50:36 2021 +0000

    upstream: unbreak FIDO sk-ed25519 key enrollment for OPENSSL=no builds;
    
    ok dtucker@
    
    OpenBSD-Commit-ID: 6323a5241728626cbb2bf0452cf6a5bcbd7ff709

commit 207648d7a6415dc915260ca75850404dbf9f0a0b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 29 20:03:58 2021 +1000

    Include stdlib.h for arc4random_uniform prototype.

commit 696aadc854582c164d5fc04933d2f3e212dc0e06
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 29 20:00:30 2021 +1000

    Look for clang after cc and gcc.

commit a3c6375555026d85dbf811fab566b9f76f196144
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 29 19:30:59 2021 +1000

    Use backticks instead of $(..) for portability.
    
    Older shells (eg /bin/sh on Solaris 10) don't support $() syntax.

commit 958aaa0387133d51f84fe9c8f30bca03025f2867
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 29 18:53:32 2021 +1000

    Skip file-based tests by default on Mac OS.
    
    The file-based tests need OpenSSL so skip them.

commit 55c8bdf6e9afb0f9fa8e4f10c25c7f0081b48fd0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 29 18:42:47 2021 +1000

    Build without OpenSSL on Mac OS.
    
    Modern versions don't ship enough libcrypto to build against.

commit c9172193ea975415facf0afb356d87df21535f88
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 29 18:33:38 2021 +1000

    Remove TEST_SSH_ECC.
    
    Convert the only remaining user of it to runtime detection using ssh -Q.

commit 5e6d28b7874b0deae95d2c68947c45212d32e599
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 29 17:48:09 2021 +1000

    Split c89 test openssl setting out.

commit c4ac7f98e230e83c015678dc958b1ffe828564ad
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 29 17:40:50 2021 +1000

    Expand TEST_SHELL consistently with other vars.

commit cfe5f7b0eb7621bfb0a756222de0431315c2ab8b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 29 17:26:50 2021 +1000

    Replace `pwd` with make variable in regress cmd.

commit 899be59da5fbc3372444bd0fbe74af48313bed33
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 29 17:14:33 2021 +1000

    Get BUILDDIR from autoconf.
    
    Use this to replace `pwd`s in regress test command line.

commit c8d92d3d4f7d560146f2f936156ec4dac3fc5811
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 29 13:28:56 2021 +1000

    Add make clean step to tests.

commit 360fb41ef8359619ab90b0d131c914494e55d3dd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 29 11:36:13 2021 +1000

    Test all available clang and gcc versions.

commit 4fb49899d7da22952d35a4bc4c9bdb2311087893
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 29 01:32:21 2021 +0000

    upstream: Test certificate hostkeys held in ssh-agent too. Would have
    
    caught regression fixed in sshd r1.575
    
    ok markus@
    
    OpenBSD-Regress-ID: 1f164d7bd89f83762db823eec4ddf2d2556145ed

commit ce4854e12e749a05646e5775e9deb8cfaf49a755
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 29 01:33:32 2021 +0000

    upstream: add some debug output showing how many key file/command lines
    
    were processed. Useful to see whether a file or command actually has keys
    present
    
    OpenBSD-Commit-ID: 0bd9ff94e84e03a22df8e6c12f6074a95d27f23c

commit 15abdd523501c349b703d9a27e2bb4252ad921ef
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Sep 28 11:14:50 2021 +0000

    upstream: Make prototype for rijndaelEncrypt match function
    
    including the bounds. Fixes error in portable where GCC>=11 takes notice of
    the bounds. ok deraadt@
    
    OpenBSD-Commit-ID: cdd2f05fd1549e1786a70871e513cf9e9cf099a6

commit d1d29ea1d1ef1a1a54b209f062ec1dcc8399cf03
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Sep 28 11:10:05 2021 +0000

    upstream: Import regenerated moduli.
    
    OpenBSD-Commit-ID: 4bec5db13b736b64b06a0fca704cbecc2874c8e1

commit 39f2111b1d5f00206446257377dcce58cc72369f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 29 10:53:55 2021 +1000

    Add new compiler hardening flags.
    
    Add -fzero-call-used-regs and -ftrivial-auto-var-init to the list of
    compiler hardening flags that configure checks for.  These are supported
    by clang and gcc, and make ROP gadgets less useful and mitigate
    stack-based infoleaks respectively.  ok djm@

commit bf944e3794eff5413f2df1ef37cddf96918c6bde
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 27 00:03:19 2021 +1000

    initgroups needs grp.h

commit 8c5b5655149bd76ea21026d7fe73ab387dbc3bc7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Sep 26 14:01:11 2021 +0000

    upstream: openssh-8.8
    
    OpenBSD-Commit-ID: 12357794602ac979eb7312a1fb190c453f492ec4

commit f3cbe43e28fe71427d41cfe3a17125b972710455
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Sep 26 14:01:03 2021 +0000

    upstream: need initgroups() before setresgid(); reported by anton@,
    
    ok deraadt@
    
    OpenBSD-Commit-ID: 6aa003ee658b316960d94078f2a16edbc25087ce

commit 8acaff41f7518be40774c626334157b1b1c5583c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 26 22:16:36 2021 +1000

    update version numbers for release

commit d39039ddc0010baa91c70a0fa0753a2699bbf435
Author: kn@openbsd.org <kn@openbsd.org>
Date:   Sat Sep 25 09:40:33 2021 +0000

    upstream: RSA/SHA-1 is not used by default anymore
    
    OK dtucker deraadt djm
    
    OpenBSD-Commit-ID: 055c51a221c3f099dd75c95362f902da1b8678c6

commit 9b2ee74e3aa8c461eb5552a6ebf260449bb06f7e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 24 11:08:03 2021 +1000

    Move the fgrep replacement to hostkey-rotate.sh.
    
    The fgrep replacement for buggy greps doesn't work in the sftp-glob test
    so move it to just where we know it's needed.

commit f7039541570d4b66d76e6f574544db176d8d5c02
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 24 08:04:14 2021 +1000

    Replacement function for buggy fgrep.
    
    GNU (f)grep <=2.18, as shipped by FreeBSD<=12 and NetBSD<=9 will
    occasionally fail to find ssh host keys in the hostkey-rotate test.
    If we have those versions, use awk instead.

commit f6a660e5bf28a01962af87568e118a2d2e79eaa0
Author: David Manouchehri <david.manouchehri@riseup.net>
Date:   Thu Sep 23 17:03:18 2021 -0400

    Don't prompt for yes/no questions.

commit 7ed1a3117c09f8c3f1add35aad77d3ebe1b85b4d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 20 06:53:56 2021 +0000

    upstream: fix missing -s in SYNOPSYS and usage() as well as a
    
    capitalisation mistake; spotted by jmc@
    
    OpenBSD-Commit-ID: 0ed8ee085c7503c60578941d8b45f3a61d4c9710

commit 8c07170135dde82a26886b600a8bf6fb290b633d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Sep 20 04:02:13 2021 +0000

    upstream: Fix "Allocated port" debug message
    
    for unix domain sockets. From peder.stray at gmail.com via github PR#272,
    ok deraadt@
    
    OpenBSD-Commit-ID: 8d5ef3fbdcdd29ebb0792b5022a4942db03f017e

commit 277d3c6adfb128b4129db08e3d65195d94b55fe7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 20 01:55:42 2021 +0000

    upstream: Switch scp back to use the old protocol by default, ahead of
    
    release. We'll wait a little longer for people to pick up sftp-server(8) that
    supports the extension that scp needs for ~user paths to continue working in
    SFTP protocol mode. Discussed with deraadt@
    
    OpenBSD-Commit-ID: f281f603a705fba317ff076e7b11bcf2df941871

commit ace19b34cc15bea3482be90450c1ed0cd0dd0669
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Sep 18 02:03:25 2021 +0000

    upstream: better error message for ~user failures when the
    
    sftp-server lacks the expand-path extension; ok deraadt@
    
    OpenBSD-Commit-ID: 9c1d965d389411f7e86f0a445158bf09b8f9e4bc

commit 6b1238ba971ee722a310d95037b498ede5539c03
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 16 15:22:22 2021 +0000

    upstream: make some more scp-in-SFTP mode better match Unix idioms
    
    suggested by deraadt@
    
    OpenBSD-Commit-ID: 0f2439404ed4cf0b0be8bf49a1ee734836e1ac87

commit e694f8ac4409931e67d08ac44ed251b20b10a957
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 16 15:11:19 2021 +0000

    upstream: allow log_stderr==2 to prefix log messages with argv[0]
    
    use this to make scp's SFTP mode error messages more scp-like
    
    prompted by and ok deraadt@
    
    OpenBSD-Commit-ID: 0e821dbde423fc2280e47414bdc22aaa5b4e0733

commit 8a7a06ee505cb833e613f74a07392e9296286c30
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 17 13:03:31 2021 +1000

    Test against LibreSSL 3.2.6, 3.3.4, 3.4.0.

commit c25c84074a47f700dd6534995b4af4b456927150
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 16 05:36:03 2021 +0000

    upstream: missing space character in ssh -G output broke the
    
    t-sshcfgparse regression test; spotted by anton@
    
    OpenBSD-Commit-ID: bcc36fae2f233caac4baa8e58482da4aa350eed0

commit a4bee1934bf5e5575fea486628f4123d6a29dff8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 15 06:56:01 2021 +0000

    upstream: allow CanonicalizePermittedCNAMEs=none in ssh_config; ok
    
    markus@
    
    OpenBSD-Commit-ID: 668a82ba8e56d731b26ffc5703213bfe071df623

commit d0fffc88c8fe90c1815c6f4097bc8cbcabc0f3dd
Author: mbuhl@openbsd.org <mbuhl@openbsd.org>
Date:   Tue Sep 14 11:04:21 2021 +0000

    upstream: put back the mux_ctx memleak fix for SSH_CHANNEL_MUX_CLIENT
    
    OK mfriedl@
    
    OpenBSD-Commit-ID: 1aba1da828956cacaadb81a637338734697d9798

commit 19b3d846f06697c85957ab79a63454f57f8e22d6
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Sat Sep 11 09:05:50 2021 +0000

    upstream: Do not ignore SIGINT while waiting for input if editline(3)
    
    is not used. Instead, in non-interactive mode, exit sftp(1), like for other
    serious errors. As pointed out by dtucker@, when compiled without editline(3)
    support in portable OpenSSH, the el == NULL branch is also used for
    interactive mode. In that case, discard the input line and provide a fresh
    prompt to the user just like in the case where editline(3) is used. OK djm@
    
    OpenBSD-Commit-ID: 7d06f4d3ebba62115527fafacf38370d09dfb393

commit ba61123eef9c6356d438c90c1199a57a0d7bcb0a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Sep 11 00:40:24 2021 +0000

    upstream: when using SFTP protocol, continue transferring files after a
    
    transfer error occurs. This matches original scp/rcp behaviour. ok dtucker@
    
    OpenBSD-Commit-ID: dfe4558d71dd09707e9b5d6e7d2e53b793da69fa

commit b0ec59a708b493c6f3940336b1a537bcb64dd2a7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 10 11:38:38 2021 +0000

    upstream: Document that non-interactive commands are run via the user's
    
    shell using the -c flag.  ok jmc@
    
    OpenBSD-Commit-ID: 4f0d912077732eead10423afd1acf4fc0ceec477

commit 66a658b5d9e009ea11f8a0ca6e69c7feb2d851ea
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 10 10:26:02 2021 +0000

    upstream: Document behaviour of arguments following non-interactive
    
    commands. Prompted by github PR#139 from EvanTheB, feedback & ok djm@ jmc@
    
    OpenBSD-Commit-ID: fc758d1fe0471dfab4304fcad6cd4ecc3d79162a

commit 1d47e28e407d1f95fdf8f799be23f48dcfa5206b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 10 07:11:11 2021 +0000

    upstream: Clarify which file's attributes -p preserves, and that
    
    it's specifically the file mode bits. bz#3340 from calestyo at scientia.net,
    ok djm@ jmc@
    
    OpenBSD-Commit-ID: f09e6098ed1c4be00c730873049825f8ee7cb884

commit b344db7a413478e4c21e4cadba4a970ad3e6128a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 10 05:46:09 2021 +0000

    upstream: openssh-7.4 was incorrectly listed twice; spotted by
    
    Dmitry Belyavskiy, ok dtucker@
    
    OpenBSD-Commit-ID: 4b823ae448f6e899927ce7b04225ac9e489f58ef

commit 9136d6239ad7a4a293e0418a49b69e70c76d58b8
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Sep 9 06:17:39 2021 +0000

    upstream: - move CAVEATS to its correct order - use the term
    
    "legacy" protocol rather than "original", as the latter made the text
    misleading - uppercase SCP
    
    ok djm
    
    OpenBSD-Commit-ID: 8479255746d5fa76a358ee59e7340fecf4245ff0

commit 2d678c5e3bdc2f5c99f7af5122e9d054925d560d
Author: David Carlier <devnexen@gmail.com>
Date:   Wed Sep 8 19:49:54 2021 +0100

    Disable tracing on FreeBSD using procctl.
    
    Placed at the start of platform_disable_tracing() to prevent declaration
    after code errors from strict C89 compilers (in the unlikely event that
    more than one method is enabled).

commit 73050fa38fb36ae3326d768b574806352b97002d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 8 23:31:39 2021 +0000

    upstream: Use the SFTP protocol by default. The original scp/rcp
    
    protocol remains available via the -O flag.
    
    Note that ~user/ prefixed paths in SFTP mode require a protocol extension
    that was first shipped in OpenSSH 8.7.
    
    ok deraadt, after baking in snaps for a while without incident
    
    OpenBSD-Commit-ID: 23588976e28c281ff5988da0848cb821fec9213c

commit c4565e69ffa2485cff715aa842ea7a350296bfb6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 8 21:09:49 2021 +1000

    Really fix test on OpenSSL 1.1.1 stable.

commit 79f1bb5f56cef3ae9276207316345b8309248478
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 8 18:51:39 2021 +1000

    Correct OpenSSL 1.1.1 stable identifier.

commit b6255593ed5ccbe5e7d3d4b26b2ad31ad4afc232
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 8 18:39:44 2021 +1000

    Increment nfds when coming from startup_pipe.
    
    If we have to increase nfds because startup_pipe[0] is above any of the
    descriptors passed in the fd_sets, we also need to add 1 to nfds since
    select takes highest FD number plus one.  bz#3345 from yaroslav.kuzmin
    at vmssoftware.com.

commit a3e92a6794817df6012ac8546aea19652cc91b61
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Sep 8 13:45:10 2021 +1000

    Tests for OpenSSL 3.0.0 release & 1.1.1 branch.

commit 4afe431da98ec1cf6a2933fe5658f4fd68dee9e2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 8 03:23:44 2021 +0000

    upstream: correct my mistake in previous fix; spotted by halex
    
    OpenBSD-Commit-ID: 3cc62d92e3f70006bf02468fc146bfc36fffa183

commit ca0e455b9331213ff9505a21b94c38e34faa2bba
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 7 06:03:51 2021 +0000

    upstream: avoid NULL deref in -Y find-principals. Report and fix
    
    from Carlo Marcelo Arenas Belón
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: 6238486f8ecc888d6ccafcd9ad99e621bb41f1e0

commit 37616807f150fb46610bbd5031c31af4857ad1e9
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Mon Sep 6 00:36:01 2021 +0000

    upstream: revision 1.381 neglected to remove
    
    sChallengeResponseAuthentication from the enum.  Noticed by
    christos@zoulas.com.  OK dtucker@
    
    OpenBSD-Commit-ID: b533283a4dd6d04a867da411a4c7a8fbc90e34ff

commit 7acb3578cdfec0b3d34501408071f7a96c1684ea
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Sep 5 20:45:42 2021 +1000

    Correct version_num for OpenSSL dev branch.

commit 65bb01111320dfd0d25e21e1fd4d3f2b77532669
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Sep 5 19:37:39 2021 +1000

    Test against OpenSSL 3 branch as well as dev.
    
    Now that OpenSSL development has moved to 3.1, test against the most
    recent version of the openssl-3.0 branch too.

commit 864ed0d5e04a503b97202c776b7cf3f163f3eeaa
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Sep 5 19:33:22 2021 +1000

    OpenSSL development is now 3.1.*

commit a60209a586a928f92ab323bf23bd07f57093342e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 3 07:43:23 2021 +0000

    upstream: Use .Cm instead of .Dq in StrictHostKeyChecking list for
    
    consistency. Patch from scop via github PR#257, ok jmc@
    
    OpenBSD-Commit-ID: 3652a91564570779431802c31224fb4a9cf39872

commit 8d1d9eb6de37331e872700e9e399a3190cca1242
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 3 07:27:03 2021 +0000

    upstream: Mention using ssh -i for specifying the public key file
    
    in the case where the private key is loaded into ssh-agent but is not present
    locally.  Based on patch from rafork via github PR#215, ok jmc@
    
    OpenBSD-Commit-ID: 2282e83b0ff78d2efbe705883b67240745fa5bb2

commit eb4362e5e3aa7ac26138b11e44d8c191910aff64
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 3 05:25:50 2021 +0000

    upstream: Refer to KEX "algorithms" instead of "methods" to match
    
    other references and improve consistency.  Patch from scop via github PR#241,
    ok djm@
    
    OpenBSD-Commit-ID: 840bc94ff6861b28d8603c8e8c16499bfb65e32c

commit b3318946ce5725da43c4bf7eeea1b73129c47d2a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 3 05:12:25 2021 +0000

    upstream: Remove redundant attrib_clear in upload_dir_internal.
    
    The subsequent call to stat_to_attrib clears the struct as its first step
    anyway. From pmeinhardt via github PR#220, ok djm@
    
    OpenBSD-Commit-ID: f5234fc6d7425b607e179acb3383f21716f3029e

commit 7cc3fe28896e653956a6a2eed0a25d551b83a029
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 3 04:11:13 2021 +0000

    upstream: Add test for client termination status on signal.
    
    Based on patch from Alexxz via github PR#235 with some tweaks, to
    match patch in bz#3281.
    
    OpenBSD-Regress-ID: d87c7446fb8b5f8b45894fbbd6875df326e729e2

commit 5428b0d239f6b516c81d1dd15aa9fe9e60af75d4
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Thu Sep 2 21:03:54 2021 +0000

    upstream: sys/param.h is not needed for any visible reason
    
    OpenBSD-Commit-ID: 8bdea2d0c75692e4c5777670ac039d4b01c1f368

commit 1ff38f34b4c4545eb28106629cafa1e0496bc726
Author: Shchelkunov Artem <a.shchelkunov@ideco.ru>
Date:   Wed Aug 11 18:07:58 2021 +0500

    Fix memory leak in error path.
    
    *info is allocated via xstrdup but was leaked in the PAM_AUTH_ERR path.
    From github PR#266.

commit cb37e2f0c0ca4fef844ed7edc5d0e3b7d0e83f6a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Sep 1 03:16:06 2021 +0000

    upstream: Fix ssh-rsa fallback for old PuTTY interop tests.
    
    OpenBSD-Regress-ID: a19ac929da604843a5b5f0f48d2c0eb6e0773d37

commit 8b02ef0f28dc24cda8cbcd8b7eb02bda8f8bbe59
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Sep 1 00:50:27 2021 +0000

    upstream: Add a function to skip remaining tests.
    
    Many tests skip tests for various reasons but not in a consistent way and
    don't always clean up, so add that and switch the tests that do that over.
    
    OpenBSD-Regress-ID: 72d2ec90a3ee8849486956a808811734281af735

commit d486845c07324c04240f1674ac513985bd356f66
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Aug 31 07:13:59 2021 +0000

    upstream: Specify path to PuTTY keys.
    
    Portable needs this and it makes no difference on OpenBSD, so resync
    them.  (Id sync only, Portable already had this.)
    
    OpenBSD-Regress-ID: 33f6f66744455886d148527af8368811e4264162

commit d22b299115e27606e846b23490746f69fdd4fb38
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Aug 31 06:13:23 2021 +0000

    upstream: Better compat tests with old PuTTY.
    
    When running PuTTY interop tests and using a PuTTY version older than
    0.76, re-enable the ssh-rsa host key algorithm (the 256 and 512 variants
    of RSA were added some time between 0.73 and 0.76).
    
    OpenBSD-Regress-ID: e6138d6987aa705fa1e4f216db0bb386e1ff38e1

commit 87ad70d605c3e39c9b8aa275db27120d7cc09b77
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Aug 31 17:04:50 2021 +1000

    Resync PuTTY interop tests.
    
    Resync behaviour when REGRESS_INTEROP_PUTTY is not set with OpenBSD.

commit e47b82a7bf51021afac218bf59a3be121827653d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Aug 31 01:25:27 2021 +0000

    upstream: Specify hostkeyalgorithms in SSHFP test.
    
    Specify host key algorithms in sshd's default set for the SSHFP test,
    from djm@.  Make the reason for when the test is skipped a bit clearer.
    
    OpenBSD-Regress-ID: 4f923dfc761480d5411de17ea6f0b30de3e32cea

commit 7db3e0a9e8477c018757b59ee955f7372c0b55fb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 30 01:15:45 2021 +0000

    upstream: adapt to RSA/SHA1 deprectation
    
    OpenBSD-Regress-ID: 952397c39a22722880e4de9d1c50bb1a14f907bb

commit 2344750250247111a6c3c6a4fe84ed583a61cc11
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Aug 29 23:53:10 2021 +0000

    upstream: After years of forewarning, disable the RSA/SHA-1
    
    signature algorithm by default. It is feasible to create colliding SHA1
    hashes, so we need to deprecate its use.
    
    RSA/SHA-256/512 remains available and will be transparently selected
    instead of RSA/SHA1 for most SSH servers released in the last five+
    years. There is no need to regenerate RSA keys.
    
    The use of RSA/SHA1 can be re-enabled by adding "ssh-rsa" to the
    PubkeyAcceptedAlgorithms directives on the client and server.
    
    ok dtucker deraadt
    
    OpenBSD-Commit-ID: 189bcc4789c7254e09e23734bdd5def8354ff1d5

commit 56c4455d3b54b7d481c77c82115c830b9c8ce328
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Aug 29 23:44:07 2021 +0000

    upstream: wrap at 80 columns
    
    OpenBSD-Commit-ID: 47ca2286d6b52a9747f34da16d742879e1a37bf0

commit 95401eea8503943449f712e5f3de52fc0bc612c5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 20 18:14:13 2021 +1000

    Replace shell function with ssh-keygen -A.
    
    Prevents the init script in the SysV package from trying (and failing)
    to generate unsupported key types.  Remove now-unused COMMENT_OUT_ECC.
    ok tim@

commit d83ec9ed995a76ed1d5c65cf10b447222ec86131
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 20 15:39:05 2021 +1000

    Remove obsolete Redhat PAM config and init script.

commit e1a596186c81e65a34ce13076449712d3bf97eb4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 20 14:03:49 2021 +1000

    depend

commit 5450606c8f7f7a0d70211cea78bc2dab74ab35d1
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 20 13:59:43 2021 +1000

    update version numbers

commit feee2384ab8d694c770b7750cfa76a512bdf8246
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 20 03:22:55 2021 +0000

    upstream: openssh-8.7
    
    OpenBSD-Commit-ID: 8769dff0fd76ae3193d77bf83b439adee0f300cd

commit 9a2ed62173cc551b2b5f479460bb015b19499de8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 20 10:48:13 2021 +1000

    Also check pid in pselect_notify_setup.
    
    Spotted by djm@.

commit deaadcb93ca15d4f38aa38fb340156077792ce87
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 20 08:39:33 2021 +1000

    Prefix pselect functions to clarify debug messages

commit 10e45654cff221ca60fd35ee069df67208fcf415
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 20 08:30:42 2021 +1000

    Fix race in pselect replacement code.
    
    On the second and subsequent calls to pselect the notify_pipe was not
    added to the select readset, opening up a race that om G. Christensen
    discovered on multiprocessor Solaris <=9 systems.
    
    Also reinitialize notify_pipe if the pid changes.  This will prevent a
    parent and child from using the same FD, although this is not an issue
    in the current structure it might be in future.

commit 464ba22f1e38d25402e5ec79a9b8d34a32df5a3f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Aug 18 12:51:30 2021 +1000

    Check compiler for c99 declarations after code.
    
    The sntrup761 reference code contains c99-style declarations after code
    so don't try to build that if the compiler doesn't support it.

commit 7d878679a4b155a359d32104ff473f789501748d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Aug 17 15:12:04 2021 +1000

    Remove trailing backslash on regress-unit-binaries

commit b71b2508f17c68c5d9dbbe537686d81cedb9a781
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Aug 17 07:59:27 2021 +1000

    Put stdint.h inside HAVE_STDINT_H.
    
    From Tom G. Christensen.

commit 6a24567a29bd7b4ab64e1afad859ea845cbc6b8c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 16 14:13:02 2021 +1000

    Improve github test driver script.
    
     - use a trap to always output any failed regress logs (since the script
       sets -e, the existing log output is never invoked).
     - pass LTESTS and SKIP_LTESTS when re-running with sshd options (eg.
       UsePAM).

commit b467cf13705f59ed348b620722ac098fe31879b7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 16 11:32:23 2021 +1000

    Remove deprecated ubuntu-16.04 test targets.
    
    Github has deprecated ubuntu-16.04 and it will be removed on 20
    September.

commit 20e6eefcdf78394f05e453d456c1212ffaa6b6a4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Aug 15 23:25:26 2021 +1000

    Skip agent ptrace test on hurd.

commit 7c9115bbbf958fbf85259a061c1122e2d046aabf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Aug 15 19:37:22 2021 +1000

    Add hurd test target.

commit 7909a566f6c6a78fcd30708dc49f4e4f9bb80ce3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Aug 15 12:45:10 2021 +1000

    Skip scp3 tests on all dfly58 and 60 configs.

commit e65198e52cb03534e8c846d1bca74c310b1526de
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Aug 14 13:08:07 2021 -0700

    openbsd-compat/openbsd-compat.h: put bsd-signal.h before bsd-misc.h
    to get sigset_t from signal.h needed for the pselect replacement.

commit e50635640f79920d9375e0155cb3f4adb870eee5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 13 13:21:00 2021 +1000

    Test OpenSSH from OpenBSD head on 6.8 and 6.9.

commit e0ba38861c490c680117b7fe0a1d61a181cd00e7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 13 13:00:14 2021 +1000

    Skip scp3 test on dragonfly 58 and 60.
    
    The tests hang, so skip until we figure them out.

commit dcce2a2bcf007bf817a2fb0dce3db83fa9201e92
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 12 23:59:25 2021 +0000

    upstream: mention that CASignatureAlgorithms accepts +/- similarly to
    
    the other algorithm list directives; ok jmc bz#3335
    
    OpenBSD-Commit-ID: 0d46b53995817052c78e2dce9dbd133963b073d9

commit 090a82486e5d7a8f7f16613d67e66a673a40367f
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Thu Aug 12 09:59:00 2021 +0000

    upstream: In the editline(3) branch of the sftp(1) event loop,
    
    handle SIGINT rather than ignoring it, such that the user can use Ctrl-C to
    discard the currently edited command line and get a fresh prompt, just like
    in ftp(1), bc(1), and in shells.
    
    It is critical to not use ssl_signal() for this particular case
    because that function unconditionally sets SA_RESTART, but here we
    need the signal to interrupt the read(2) in the el_gets(3) event loop.
    
    OK dtucker@ deraadt@
    
    OpenBSD-Commit-ID: 8025115a773f52e9bb562eaab37ea2e021cc7299

commit e1371e4f58404d6411d9f95eb774b444cea06a26
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Wed Aug 11 14:07:54 2021 +0000

    upstream: scp: tweak man page and error message for -3 by default
    
    Now that the -3 option is enabled by default, flip the documentation
    and error message logic from "requires -3" to "blocked by -R".
    
    ok djm@
    
    OpenBSD-Commit-ID: a872592118444fb3acda5267b2a8c3d4c4252020

commit 49f46f6d77328a3d10a758522b670a3e8c2235e7
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Wed Aug 11 14:05:19 2021 +0000

    upstream: scp: do not spawn ssh with two -s flags for
    
    remote-to-remote copies
    
    Do not add another "-s" to the argument vector every time an SFTP
    connection is initiated.  Instead, introduce a subsystem flag to
    do_cmd() and add "-s" when the flag is set.
    
    ok djm@
    
    OpenBSD-Commit-ID: 25df69759f323661d31b2e1e790faa22e27966c1

commit 2a2cd00783e1da45ee730b7f453408af1358ef5b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 11 08:55:04 2021 +0000

    upstream: test -Oprint-pubkey
    
    OpenBSD-Regress-ID: 3d51afb6d1f287975fb6fddd7a2c00a3bc5094e0

commit b9f4635ea5bc33ed5ebbacf332d79bae463b0f54
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 11 08:54:17 2021 +0000

    upstream: when verifying sshsig signatures, support an option
    
    (-Oprint-pubkey) to dump the full public key to stdout; based on patch from
    Fabian Stelzer; ok markus@
    
    OpenBSD-Commit-ID: 0598000e5b9adfb45d42afa76ff80daaa12fc3e2

commit 750c1a45ba4e8ad63793d49418a0780e77947b9b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 11 05:21:32 2021 +0000

    upstream: oops, missed one more %p
    
    OpenBSD-Commit-ID: e7e62818d1564cc5cd9086eaf7a51cbd1a9701eb

commit b5aa27b69ab2e1c13ac2b5ad3f8f7d389bad7489
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 11 05:20:17 2021 +0000

    upstream: remove a bunch of %p in format strings; leftovers of
    
    debuggings past. prompted by Michael Forney, ok dtucker@
    
    OpenBSD-Commit-ID: 4853a0d6c9cecaba9ecfcc19066e52d3a8dcb2ac

commit 419aa01123db5ff5dbc68b2376ef23b222862338
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Aug 11 09:21:09 2021 +1000

    Add includes.h to compat tests.
    
    On platforms where closefrom returns void (eg glibc>=2.34) the prototype
    for closefrom in its compat tests would cause compile errors.  Remove
    this and have the tests pull in the compat headers in the same way as
    the main code.  bz#3336.

commit 931f592f26239154eea3eb35a086585897b1a185
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 10 03:35:45 2021 +0000

    upstream: adapt to scp -M flag change; make scp3.sh test SFTP mode too
    
    OpenBSD-Regress-ID: 43fea26704a0f0b962b53c1fabcb68179638f9c0

commit 391ca67fb978252c48d20c910553f803f988bd37
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 10 03:33:34 2021 +0000

    upstream: Prepare for a future where scp(1) uses the SFTP protocol by
    
    default. Replace recently added -M option to select the protocol with -O
    (olde) and -s (SFTP) flags, and label the -s flag with a clear warning that
    it will be removed in the near future (so no, don't use it in scripts!).
    
    prompted by/feedback from deraadt@
    
    OpenBSD-Commit-ID: 92ad72cc6f0023c9be9e316d8b30eb6d8d749cfc

commit bfdd4b722f124a4fa9173d20dd64dd0fc69856be
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 9 23:56:36 2021 +0000

    upstream: make scp -3 the default for remote-to-remote copies. It
    
    provides a much better and more intuitive user experience and doesn't require
    exposing credentials to the source host.
    
    thanks naddy@ for catching the missing argument in usage()
    
    "Yes please!" - markus@
    "makes a lot of sense" - deraadt@
    "the right thing to do" - dtucker@
    
    OpenBSD-Commit-ID: d0d2af5f0965c5192ba5b2fa461c9f9b130e5dd9

commit 2f7a3b51cef689ad9e93d0c6c17db5a194eb5555
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 9 23:49:31 2021 +0000

    upstream: make scp in SFTP mode try to use relative paths as much
    
    as possible. Previosuly, it would try to make relative and ~/-rooted paths
    absolute before requesting transfers.
    
    prompted by and much discussion deraadt@
    ok markus@
    
    OpenBSD-Commit-ID: 46639d382ea99546a4914b545fa7b00fa1be5566

commit 2ab864010e0a93c5dd95116fb5ceaf430e2fc23c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 9 23:47:44 2021 +0000

    upstream: SFTP protocol extension to allow the server to expand
    
    ~-prefixed paths, in particular ~user ones. Allows scp in sftp mode to accept
    these paths, like scp in rcp mode does.
    
    prompted by and much discussion deraadt@
    ok markus@
    
    OpenBSD-Commit-ID: 7d794def9e4de348e1e777f6030fc9bafdfff392

commit 41b019ac067f1d1f7d99914d0ffee4d2a547c3d8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 9 23:44:32 2021 +0000

    upstream: when scp is in SFTP mode, try to deal better with ~
    
    prefixed paths. ~user paths aren't supported, but ~/ paths will be accepted
    and prefixed with the SFTP server starting directory (more to come)
    
    prompted by and discussed with deraadt@
    ok markus@
    
    OpenBSD-Commit-ID: 263a071f14555c045fd03132a8fb6cbd983df00d

commit b4b3f3da6cdceb3fd168b5fab69d11fba73bd0ae
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 9 07:21:01 2021 +0000

    upstream: on fatal errors, make scp wait for ssh connection before
    
    exiting avoids LogLevel=verbose (or greater) messages from ssh appearing
    after scp has returned exited and control has returned to the shell; ok
    markus@
    
    (this was originally committed as r1.223 along with unrelated stuff that
    I rolled back in r1.224)
    
    OpenBSD-Commit-ID: 1261fd667ad918484889ed3d7aec074f3956a74b

commit 2ae7771749e0b4cecb107f9d4860bec16c3f4245
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 9 07:19:12 2021 +0000

    upstream: rever r1.223 - I accidentally committed unrelated changes
    
    OpenBSD-Commit-ID: fb73f3865b2647a27dd94db73d6589506a9625f9

commit 986abe94d481a1e82a01747360bd767b96b41eda
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 9 07:16:09 2021 +0000

    upstream: show only the final path component in the progress meter;
    
    more useful with long paths (that may truncate) and better matches
    traditional scp behaviour; spotted by naddy@ ok deraadt@
    
    OpenBSD-Commit-ID: 26b544d0074f03ebb8a3ebce42317d8d7ee291a3

commit 2b67932bb3176dee4fd447af4368789e04a82b93
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 9 07:13:54 2021 +0000

    upstream: on fatal errors, make scp wait for ssh connection before
    
    exiting avoids LogLevel=verbose (or greater) messages from ssh appearing
    after scp has returned exited and control has returned to the shell; ok
    markus@
    
    OpenBSD-Commit-ID: ef9dab5ef5ae54a6a4c3b15d380568e94263456c

commit 724eb900ace30661d45db2ba01d0f924d95ecccb
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Aug 8 08:49:09 2021 +0000

    upstream: xstrdup environment variable used by ForwardAgent. bz#3328
    
    from goetze at dovetail.com, ok djm@ deraadt@
    
    OpenBSD-Commit-ID: 760320dac1c3b26904284ba417a7d63fccc5e742

commit 86b4cb3a884846b358305aad17a6ef53045fa41f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Aug 8 08:27:28 2021 +0000

    upstream: Although it's POSIX, not all shells used in Portable support
    
    the implicit 'in "$@"' after 'for i'.
    
    OpenBSD-Regress-ID: 3c9aec6bca4868f85d2742b6ba5223fce110bdbc

commit f2ccf6c9f395923695f22345e626dfd691227aaf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Aug 8 17:39:56 2021 +1000

    Move portable specific settings down.
    
    This brings the top hunk of the file back in sync with OpenBSD
    so patches to the CVS Id should apply instead of always being
    rejected.

commit 71b0eb997e220b0fc9331635af409ad84979f2af
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Aug 8 07:27:52 2021 +0000

    upstream: Move setting of USER further down the startup In portable
    
    we have to change this and having it in the same hunk as the CVS Id string
    means applying changes fails every. single. time.
    
    OpenBSD-Regress-ID: 87cd603eb6db58c9b430bf90adacb7f90864429b

commit f0aca2706c710a0da1a4be705f825a807cd15400
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Aug 8 06:38:33 2021 +0000

    upstream: Drop -q in ssh-log-wrapper.sh to preserve logs.
    
    scp and sftp like to add -q to the command line passed to ssh which
    overrides the LogLevel we set in the config files and suppresses output
    to the debug logs so drop any "-q" from the invoked ssh.  In the one
    case where we actually want to use -q in the banner test, call the ssh
    binary directly bypassing the logging wrapper.
    
    OpenBSD-Regress-ID: e2c97d3c964bda33a751374c56f65cdb29755b75

commit cf27810a649c5cfae60f8ce66eeb25caa53b13bc
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Aug 7 01:57:08 2021 +0000

    upstream: Fix prototype mismatch for do_cmd. ok djm@
    
    OpenBSD-Commit-ID: 1c1598bb5237a7ae0be99152f185e0071163714d

commit 85de69f64665245786e28c81ab01fe18b0e2a149
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 7 01:55:01 2021 +0000

    upstream: sftp-client.c needs poll.h
    
    remove unused variable
    
    OpenBSD-Commit-ID: 233ac6c012cd23af62f237167a661db391055a16

commit 397c4d72e50023af5fe3aee5cc2ad407a6eb1073
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Aug 7 11:30:57 2021 +1000

    Include poll.h and friends for struct pollfd.

commit a9e2c533195f28627f205682482d9da384c4c52e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 7 00:14:17 2021 +0000

    upstream: do_upload() used a near-identical structure for
    
    tracking expected status replies from the server to what do_download() was
    using.
    
    Refactor it to use the same structure and factor out some common
    code into helper functions.
    
    OpenBSD-Commit-ID: 0c167df8ab6df4a5292c32421922b0cf379e9054

commit 7b1cbcb7599d9f6a3bbad79d412604aa1203b5ee
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 7 00:12:09 2021 +0000

    upstream: make scp(1) in SFTP mode follow symlinks like
    
    traditional scp(1) ok markus@
    
    OpenBSD-Commit-ID: 97255e55be37e8e26605e4ba1e69f9781765d231

commit 133b44e500422df68c9c25c3b6de35c0263132f1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 7 00:10:49 2021 +0000

    upstream: fix incorrect directory permissions on scp -3
    
    transfers; ok markus@
    
    OpenBSD-Commit-ID: 64b2abaa5635a2be65ee2e77688ad9bcebf576c2

commit 98b59244ca10e62ff67a420856770cb700164f59
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 7 00:09:57 2021 +0000

    upstream: a bit more debugging of file attributes being
    
    sent/received over the wire
    
    OpenBSD-Commit-ID: f68c4e207b08ef95200a8b2de499d422808e089b

commit c677e65365d6f460c084e41e0c4807bb8a9cf601
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 7 00:08:52 2021 +0000

    upstream: make scp(1) in SFTP mode output better match original
    
    scp(1) by suppressing "Retrieving [path]" lines that were emitted to support
    the interactive sftp(1) client. ok markus@
    
    OpenBSD-Commit-ID: 06be293df5f156a18f366079be2f33fa68001acc

commit 48cd39b7a4e5e7c25101c6d1179f98fe544835cd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 7 00:07:18 2021 +0000

    upstream: factor out a structure duplicated between downloading
    
    and crossloading; ok markus@
    
    OpenBSD-Commit-ID: 96eede24d520569232086a129febe342e4765d39

commit 318c06bb04ee21a0cfa6b6022a201eacaa53f388
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 7 00:06:30 2021 +0000

    upstream: use sftp_client crossloading to implement scp -3
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: 7db4c0086cfc12afc9cfb71d4c2fd3c7e9416ee9

commit de7115b373ba0be3861c65de9b606a3e0e9d29a3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 7 00:02:41 2021 +0000

    upstream: support for "cross"-loading files/directories, i.e.
    
    downloading from one SFTP server while simultaneously uploading to another.
    
    feedback & ok markus@
    
    OpenBSD-Commit-ID: 3982878e29d8df0fa4ddc502f5ff6126ac714235

commit a50bd0367ff2063bbc70a387740a2aa6914de094
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 7 00:01:29 2021 +0000

    upstream: factor our SSH2_FXP_OPEN calls into their own function;
    
    "looks fine" markus@
    
    OpenBSD-Commit-ID: d3dea2153f08855c6d9dacc01973248944adeffb

commit e3c0ba05873cf3d3f7d19d595667a251026b2d84
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 7 00:00:33 2021 +0000

    upstream: prepare for scp -3 implemented via sftp
    
    OpenBSD-Commit-ID: 194aac0dd87cb175334b71c2a30623a5ad55bb44

commit 395d8fbdb094497211e1461cf0e2f80af5617e0a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Aug 6 09:00:18 2021 +0000

    upstream: Make diff invocation more portable.
    
    POSIX does not require diff to have -N, so compare in both directions
    with just -r, which should catch missing files in either directory.
    
    OpenBSD-Regress-ID: 0e2ec8594556a6f369ed5a0a90c6806419b845f7

commit d247a73ce27b460138599648d9c637c6f2b77605
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 4 21:28:00 2021 +0000

    upstream: regression test for scp -3
    
    OpenBSD-Regress-ID: b44375d125c827754a1f722ec6b6b75b634de05d

commit 35c8e41a6f6d8ad76f8d1cd81ac2ea23d0d993b2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Aug 6 05:04:42 2021 +0000

    upstream: Document "ProxyJump none". bz#3334.
    
    OpenBSD-Commit-ID: f78cc6f55731f2cd35c3a41d5352ac1ee419eba7

commit 911ec6411821bda535d09778df7503b92f0eafab
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Aug 4 01:34:55 2021 +0000

    upstream: Allow for different (but POSIX compliant) behaviour of
    
    basename(3) and prevent a use-after-free in that case in the new sftp-compat
    code.
    
    POSIX allows basename(3) to either return a pointer to static storage
    or modify the passed string and return a pointer to that.  OpenBSD does
    the former and works as is, but on other platforms "filename" points
    into "tmp" which was just freed.  This makes the freeing of tmp
    consistent with the other variable in the loop.
    
    Pinpointed by the -portable Valgrind regress test.  ok djm@ deraadt@
    
    OpenBSD-Commit-ID: 750f3c19bd4440e4210e30dd5d7367386e833374

commit 6df1fecb5d3e51f3a8027a74885c3a44f6cbfcbd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 4 11:05:11 2021 +1000

    use openbsd-compat glob.h is required

commit 9ebd1828881dfc9014a344587934a5ce7db6fa1b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Aug 3 21:03:23 2021 +1000

    Missing space between macro arg and punctuation.
    
    From jmc@

commit 0fd3f62eddc7cf54dcc9053be6f58998f3eb926a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Aug 3 21:02:33 2021 +1000

    Avoid lines >80 chars.  From jmc@

commit af5d8094d8b755e1daaf2e20ff1dc252800b4c9b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 3 01:05:24 2021 +0000

    upstream: regression tests for scp SFTP protocol support; mostly by
    
    Jakub Jelen in GHPR#194 ok markus
    
    OpenBSD-Regress-ID: 36f1458525bcb111741ec8547eaf58b13cddc715

commit e4673b7f67ae7740131a4ecea29a846593049a91
Author: anton@openbsd.org <anton@openbsd.org>
Date:   Thu Jul 29 15:34:09 2021 +0000

    upstream: Treat doas with arguments as a valid SUDO variable.
    
    Allows one to specify SUDO="doas -n" which I do while running make regress.
    
    ok dtucker@
    
    OpenBSD-Regress-ID: 4fe5814b5010dbf0885500d703bea06048d11005

commit 197e29f1cca190d767c4b2b63a662f9a9e5da0b3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 2 23:38:27 2021 +0000

    upstream: support for using the SFTP protocol for file transfers in
    
    scp, via a new "-M sftp" option. Marked as experimental for now.
    
    Some corner-cases exist, in particular there is no attempt to
    provide bug-compatibility with scp's weird "double shell" quoting
    rules.
    
    Mostly by Jakub Jelen in GHPR#194 with some tweaks by me. ok markus@
    Thanks jmc@ for improving the scp.1 bits.
    
    OpenBSD-Commit-ID: 6ce4c9157ff17b650ace571c9f7793d92874051c

commit dd533c7ab79d61a7796b77b64bd81b098e0d7f9f
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jul 30 14:28:13 2021 +0000

    upstream: fix a formatting error and add some Xr; from debian at
    
    helgefjell de
    
    removed references to rlogin etc. as no longer relevant;
    suggested by djm
    
    ok djm dtucker
    
    OpenBSD-Commit-ID: 3c431c303068d3aec5bb18573a0bd5e0cd77c5ae

commit c7cd347a8823819411222c1e10a0d26747d0fd5c
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jul 30 14:25:01 2021 +0000

    upstream: fix a formatting error and mark up known_hosts
    
    consistently; issues reported by debian at helgefjell de
    
    ok djm dtucker
    
    OpenBSD-Commit-ID: a1fd8d21dc77f507685443832df0c9700481b0ce

commit 4455aec2e4fc90f64ae4fc47e78ebc9c18721738
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Jul 28 05:57:42 2021 +0000

    upstream: no need to talk about version 2 with the -Q option, so
    
    rewrite the text to read better;
    
    issue reported by debian at helgefjell de
    ok djm dtucker
    
    OpenBSD-Commit-ID: 59fe2e8219c37906740ad062e0fdaea487dbe9cf

commit bec429338e9b30d2c7668060e82608286a8a4777
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Jul 27 14:28:46 2021 +0000

    upstream: word fix; reported by debian at helgefjell de
    
    OpenBSD-Commit-ID: 0c6fd22142422a25343c5bd1a618f31618f41ece

commit efad4deb5a1f1cf79ebefd63c6625059060bfbe1
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Jul 27 14:14:25 2021 +0000

    upstream: standardise the grammar in the options list; issue
    
    reported by debian at helgefjell de
    
    ok dtucker djm
    
    OpenBSD-Commit-ID: 7ac15575045d82f4b205a42cc7d5207fe4c3f8e6

commit 1e11fb24066f3fc259ee30db3dbb2a3127e05956
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 2 18:56:29 2021 +1000

    Check for RLIMIT_NOFILE before trying to use it.

commit 0f494236b49fb48c1ef33669f14822ca4f3ce2f4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 27 17:45:34 2021 +1000

    lastenv is only used in setenv.
    
    Prevents an unused variable warning on platforms that have setenv but
    not unsetenv.

commit a1f78e08bdb3eaa88603ba3c6e01de7c8671e28a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jul 26 12:45:30 2021 +1000

    Move SUDO to "make test" command line.
    
    Environment variables don't get passed by vmrun, so move to command
    line.

commit 02e624273b9c78a49a01239159b8c09b8409b1a0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jul 25 23:26:36 2021 +1000

    Set SUDO for tests and cleanup.

commit 460ae5d93051bab70239ad823dd784822d58baad
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jul 25 22:37:55 2021 +1000

    Pass OPENSSL=no to make tests too.

commit b398f499c68d74ebe3298b73757cf3f36e14e0cb
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jul 25 12:27:37 2021 +0000

    upstream: Skip unit and makefile-based key conversion tests when
    
    we're building with OPENSSL=no.
    
    OpenBSD-Regress-ID: 20455ed9a977c93f846059d1fcb48e29e2c8d732

commit 727ce36c8c5941bde99216d27109405907caae4f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jul 25 12:13:03 2021 +0000

    upstream: Replace OPENSSL as the variable that points to the
    
    openssl binary with OPENSSL_BIN.  This will allow us to use the OPENSSL
    variable from mk.conf or the make(1) command line indicating if we're
    building with our without OpenSSL, and ultimately get the regress tests
    working in the OPENSSL=no configuration.
    
    OpenBSD-Regress-ID: 2d788fade3264d7803e5b54cae8875963f688c4e

commit 55e17101a9075f6a63af724261c5744809dcb95c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jul 24 02:57:28 2021 +0000

    upstream: Skip RFC4716 format import and export tests when built
    
    without OpenSSL.
    
    OpenBSD-Regress-ID: d2c2d5d38c1acc2b88cc99cfe00a2eb8bb39dfa4

commit f5ccb5895d39cd627ad9e7b2c671d2587616100d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jul 24 02:51:14 2021 +0000

    upstream: Don't omit ssh-keygen -y from usage when built without
    
    OpenSSL.  It is actually available, albeit only for ed25519 keys.
    
    OpenBSD-Commit-ID: 7a254c33d0e6a55c30c6b016a8d298d3cb7a7674

commit 819d57ac23469f1f03baa8feb38ddefbada90fdc
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jul 24 02:08:13 2021 +0000

    upstream: Exclude key conversion options from usage when built
    
    without OpenSSL since those are not available, similar to what we currently
    do with the moduli screening options.  We can also use this to skip the
    conversion regression tests in this case.
    
    OpenBSD-Commit-ID: 3c82caa398cf99cd4518c23bba5a2fc66b16bafe

commit b6673b1d2ee90b4690ee84f634efe40225423c38
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 24 13:02:51 2021 +1000

    Test OpenBSD upstream with and without OpenSSL.

commit 9d38074b5453c1abbdf888e80828c278d3b886ac
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jul 24 01:54:23 2021 +0000

    upstream: test for first-match-wins in authorized_keys environment=
    
    options
    
    OpenBSD-Regress-ID: 1517c90276fe84b5dc5821c59f88877fcc34c0e8

commit 2b76f1dd19787e784711ea297ad8fc938b4484fd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 23 05:53:02 2021 +0000

    upstream: Simplify keygen-convert by using $SSH_KEYTYPES directly.
    
    OpenBSD-Regress-ID: cdbe408ec3671ea9ee9b55651ee551370d2a4108

commit 7d64a9fb587ba9592f027f7a2264226c713d6579
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jul 24 01:55:19 2021 +0000

    upstream: don't leak environment= variable when it is not the first
    
    match
    
    OpenBSD-Commit-ID: 7fbdc3dfe0032deaf003fd937eeb4d434ee4efe0

commit db2130e2340bf923e41c791aa9cd27b9e926042c
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jul 23 06:01:17 2021 +0000

    upstream: punctuation;
    
    OpenBSD-Commit-ID: 64be152e378c45975073ab1c07e0db7eddd15806

commit 03190d10980c6fc9124e988cb2df13101f266507
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 23 05:56:47 2021 +0000

    upstream: mention in comment that read_passphrase(..., RP_ALLOW_STDIN)
    
    will try to use askpass first. bz3314
    
    convert a couple of debug() -> debug_f() while here
    
    OpenBSD-Commit-ID: c7e812aebc28fcc5db06d4710e0f73613dee545c

commit 1653ece6832b2b304d46866b262d5f69880a9ec7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 23 05:07:16 2021 +0000

    upstream: Test conversion of ed25519 and ecdsa keys too.
    
    OpenBSD-Regress-ID: 3676d2d00e58e0d6d37f2878f108cc2b83bbe4bb

commit 8b7af02dcf9d2b738787efd27da7ffda9859bed2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 23 04:56:21 2021 +0000

    upstream: Add test for exporting pubkey from a passphrase-protected
    
    private key.
    
    OpenBSD-Regress-ID: da99d93e7b235fbd5b5aaa01efc411225e6ba8ac

commit 441095d4a3e5048fe3c87a6c5db5bc3383d767fb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 23 03:54:55 2021 +0000

    upstream: regression test for time-limited signature keys
    
    OpenBSD-Regress-ID: 2a6f3bd900dbee0a3c96f1ff23e032c93ab392bc

commit 9e1882ef6489a7dd16b6d7794af96629cae61a53
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 23 05:24:02 2021 +0000

    upstream: note successful authentication method in final "Authenticated
    
    to ..." message and partial auth success messages (all at LogLevel=verbose)
    ok dtucker@
    
    OpenBSD-Commit-ID: 06834b89ceb89f8f16c5321d368a66c08f441984

commit a917e973a1b90b40ff1e950df083364b48fc6c78
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 23 04:04:52 2021 +0000

    upstream: Add a ForkAfterAuthentication ssh_config(5) counterpart
    
    to the ssh(1) -f flag. Last part of GHPR231 from Volker Diels-Grabsch. ok
    dtucker
    
    OpenBSD-Commit-ID: b18aeda12efdebe2093d55263c90fe4ea0bce0d3

commit e0c5088f1c96a145eb6ea1dee438010da78f9ef5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 23 04:00:59 2021 +0000

    upstream: Add a StdinNull directive to ssh_config(5) that allows
    
    the config file to do the same thing as -n does on the ssh(1) commandline.
    Patch from Volker Diels-Grabsch via GHPR231; ok dtucker
    
    OpenBSD-Commit-ID: 66ddf3f15c76796d4dcd22ff464aed1edd62468e

commit e3957e21ffdc119d6d04c0b1686f8e2fe052f5ea
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 23 03:57:20 2021 +0000

    upstream: make authorized_keys environment="..." directives
    
    first-match-wins and more strictly limit their maximum number; prompted by
    OOM reported by OSS-fuzz (35470).
    
    feedback and ok dtucker@
    
    OpenBSD-Commit-ID: 01f63fc10dcd995e7aed9c378ad879161af83121

commit d0bb1ce731762c55acb95817df4d5fab526c7ecd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 23 03:37:52 2021 +0000

    upstream: Let allowed signers files used by ssh-keygen(1)
    
    signatures support key lifetimes, and allow the verification mode to specify
    a signature time to check at. This is intended for use by git to support
    signing objects using ssh keys. ok dtucker@
    
    OpenBSD-Commit-ID: 3e2c67b7dcd94f0610194d1e8e4907829a40cf31

commit 44142068dc7ef783d135e91ff954e754d2ed432e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 19 08:48:33 2021 +0000

    upstream: Use SUDO when setting up hostkey.
    
    OpenBSD-Regress-ID: 990cf4481cab8dad62e90818a9b4b36c533851a7

commit 6b67f3f1d1d187597e54a139cc7785c0acebd9a2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 19 05:08:54 2021 +0000

    upstream: Increase time margin for rekey tests. Should help
    
    reliability on very heavily loaded hosts.
    
    OpenBSD-Regress-ID: 4c28a0fce3ea89ebde441d7091464176e9730533

commit 7953e1bfce9e76bec41c1331a29bc6cff9d416b8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jul 19 13:47:51 2021 +1000

    Add sshfp-connect.sh file missed in previous.

commit b75a80fa8369864916d4c93a50576155cad4df03
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 19 03:13:28 2021 +0000

    upstream: Ensure that all returned SSHFP records for the specified host
    
    name and hostkey type match instead of only one.  While there, simplify the
    code somewhat and add some debugging.  Based on discussion in bz#3322, ok
    djm@.
    
    OpenBSD-Commit-ID: 0a6a0a476eb7f9dfe8fe2c05a1a395e3e9b22ee4

commit 1cc1fd095393663cd72ddac927d82c6384c622ba
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 19 02:21:50 2021 +0000

    upstream: Id sync only, -portable already has this.
    
    Put dh_set_moduli_file call inside ifdef WITH_OPENSSL. Fixes
    build with OPENSSL=no.
    
    OpenBSD-Commit-ID: af54abbebfb12bcde6219a44d544e18204defb15

commit 33abbe2f4153f5ca5c874582f6a7cc91ae167485
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 19 02:46:34 2021 +0000

    upstream: Add test for host key verification via SSHFP records. This
    
    requires some external setup to operate so is disabled by default (see
    comments in sshfp-connect.sh).
    
    OpenBSD-Regress-ID: c52c461bd1df3a803d17498917d156ef64512fd9

commit f0cd000d8e3afeb0416dce1c711c3d7c28d89bdd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 19 02:29:28 2021 +0000

    upstream: Add ed25519 key and test SSHFP export of it. Only test
    
    RSA SSHFP export if we have RSA functionality compiled in.
    
    OpenBSD-Regress-ID: b4ff5181b8c9a5862e7f0ecdd96108622333a9af

commit 0075511e27e5394faa28edca02bfbf13b9a6693e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 19 00:16:26 2021 +0000

    upstream: Group keygen tests together.
    
    OpenBSD-Regress-ID: 07e2d25c527bb44f03b7c329d893a1f2d6c5c40c

commit 034828820c7e62652e7c48f9ee6b67fb7ba6fa26
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jul 18 23:10:10 2021 +0000

    upstream: Add test for ssh-keygen printing of SSHFP records.
    
    OpenBSD-Regress-ID: fde9566b56eeb980e149bbe157a884838507c46b

commit 52c3b6985ef1d5dadb4c4fe212f8b3a78ca96812
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jul 17 00:38:11 2021 +0000

    upstream: wrap some long lines
    
    OpenBSD-Commit-ID: 4f5186b1466656762dae37d3e569438d900c350d

commit 43ec991a782791d0b3f42898cd789f99a07bfaa4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jul 17 00:36:53 2021 +0000

    upstream: fix sftp on ControlPersist connections, broken by recent
    
    SessionType change; spotted by sthen@
    
    OpenBSD-Commit-ID: 4c5ddc5698790ae6ff50d2a4f8f832f0eeeaa234

commit 073f45c236550f158c9a94003e4611c07dea5279
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 16 09:00:23 2021 +0000

    upstream: Explicitly check for and start time-based rekeying in the
    
    client and server mainloops.
    
    Previously the rekey timeout could expire but rekeying would not start
    until a packet was sent or received. This could cause us to spin in
    select() on the rekey timeout if the connection was quiet.
    
    ok markus@
    
    OpenBSD-Commit-ID: 4356cf50d7900f3df0a8f2117d9e07c91b9ff987

commit ef7c4e52d5d840607f9ca3a302a4cbb81053eccf
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Jul 14 06:46:38 2021 +0000

    upstream: reorder SessionType; ok djm
    
    OpenBSD-Commit-ID: c7dd0b39e942b1caf4976a0b1cf0fed33d05418c

commit 8aa2f9aeb56506dca996d68ab90ab9c0bebd7ec3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 14 11:26:50 2021 +1000

    Make whitespace consistent.

commit 4f4297ee9b8a39f4dfd243a74c5f51f9e7a05723
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 14 11:26:12 2021 +1000

    Add ARM64 Linux self-hosted runner.

commit eda8909d1b0a85b9c3804a04d03ec6738fd9dc7f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 13 23:48:36 2021 +0000

    upstream: add a SessionType directive to ssh_config, allowing the
    
    configuration file to offer equivalent control to the -N (no session) and -s
    (subsystem) command-line flags.
    
    Part of GHPR#231 by Volker Diels-Grabsch with some minor tweaks;
    feedback and ok dtucker@
    
    OpenBSD-Commit-ID: 726ee931dd4c5cc7f1d7a187b26f41257f9a2d12

commit 7ae69f2628e338ba6e0eae7ee8a63bcf8fea7538
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 12 02:12:22 2021 +0000

    upstream: fix some broken tests; clean up output
    
    OpenBSD-Regress-ID: 1d5038edb511dc4ce1622344c1e724626a253566

commit f5fc6a4c3404bbf65c21ca6361853b33d78aa87e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jul 12 18:00:05 2021 +1000

    Add configure-time detection for SSH_TIME_T_MAX.
    
    Should fix printing cert times exceeding INT_MAX (bz#3329) on platforms
    were time_t is a long long.  The limit used is for the signed type, so if
    some system has a 32bit unsigned time_t then the lower limit will still
    be imposed and we would need to add some way to detect this.  Anyone using
    an unsigned 64bit can let us know when it starts being a problem.

commit fd2d06ae4442820429d634c0a8bae11c8e40c174
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 12 06:22:57 2021 +0000

    upstream: Make limit for time_t test unconditional in the
    
    format_absolute_time fix for bz#3329 that allows printing of timestamps past
    INT_MAX. This was incorrectly included with the previous commit.   Based on
    discussion with djm@.
    
    OpenBSD-Commit-ID: 835936f6837c86504b07cabb596b613600cf0f6e

commit 6c29b387cd64a57b0ec8ae7d2c8d02789d88fcc3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 12 06:08:57 2021 +0000

    upstream: Use existing format_absolute_time() function when
    
    printing cert validity instead of doing it inline.  Part of bz#3329.
    
    OpenBSD-Commit-ID: a13d4e3c4f59644c23745eb02a09b2a4e717c00c

commit 99981d5f8bfa383791afea03f6bce8454e96e323
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 9 09:55:56 2021 +0000

    upstream: silence redundant error message; reported by Fabian Stelzer
    
    OpenBSD-Commit-ID: 9349a703016579a60557dafd03af2fe1d44e6aa2

commit e86097813419b49d5bff5c4b51d1c3a5d4d2d804
Author: John Ericson <John.Ericson@Obsidian.Systems>
Date:   Sat Dec 26 11:40:49 2020 -0500

    Re-indent krb5 section after pkg-config addition.

commit 32dd2daa56c294e40ff7efea482c9eac536d8cbb
Author: John Ericson <John.Ericson@Obsidian.Systems>
Date:   Sat Dec 26 11:40:49 2020 -0500

    Support finding Kerberos via pkg-config
    
    This makes cross compilation easier.

commit def7a72234d7e4f684d72d33a0f7229f9eee0aa4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 9 14:34:06 2021 +1000

    Update comments about EGD to include prngd.

commit b5d23150b4e3368f4983fd169d432c07afeee45a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 5 01:21:07 2021 +0000

    upstream: Fix a couple of whitespace things. Portable already has
    
    these so this removes two diffs between the two.
    
    OpenBSD-Commit-ID: 769f017ebafd8e741e337b3e9e89eb5ac73c9c56

commit 8f57be9f279b8e905f9883066aa633c7e67b31cf
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 5 01:16:46 2021 +0000

    upstream: Order includes as per style(9). Portable already has
    
    these so this removes a handful of diffs between the two.
    
    OpenBSD-Commit-ID: 8bd7452d809b199c19bfc49511a798f414eb4a77

commit b75624f8733b3ed9e240f86cac5d4a39dae11848
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 5 00:50:25 2021 +0000

    upstream: Remove comment referencing now-removed
    
    RhostsRSAAuthentication.  ok djm@
    
    OpenBSD-Commit-ID: 3d864bfbd99a1d4429a58e301688f3be464827a9

commit b67eb12f013c5441bb4f0893a97533582ad4eb13
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 5 00:25:42 2021 +0000

    upstream: allow spaces to appear in usernames for local to remote,
    
    and scp -3 remote to remote copies. with & ok dtucker bz#1164
    
    OpenBSD-Commit-ID: e9b550f3a85ffbb079b6720833da31317901d6dd

commit 8c4ef0943e574f614fc7c6c7e427fd81ee64ab87
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 2 07:20:44 2021 +0000

    upstream: Remove obsolete comments about SSHv1 auth methods. ok
    
    djm@
    
    OpenBSD-Commit-ID: 6060f70966f362d8eb4bec3da2f6c4712fbfb98f

commit 88908c9b61bcb99f16e8d398fc41e2b3b4be2003
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 3 23:00:19 2021 +1000

    Remove reference to ChallengeResponse.
    
    challenge_response_authentication was removed from the struct, keeping
    kbd_interactive_authentication.

commit 321874416d610ad2158ce6112f094a4862c2e37f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 3 20:38:09 2021 +1000

    Move signal.h up include order to match upstream.

commit 4fa83e2d0e32c2dd758653e0359984bbf1334f32
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 3 20:36:06 2021 +1000

    Remove old OpenBSD version marker.
    
    Looks like an accidental leftover from a sync.

commit 9d5e31f55d5f3899b72645bac41a932d298ad73b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 3 20:34:19 2021 +1000

    Remove duplicate error on error path.
    
    There's an extra error() call on the listen error path, it looks like
    its removal was missed during an upstream sync.

commit 888c459925c7478ce22ff206c9ac1fb812a40caf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 3 20:32:46 2021 +1000

    Remove some whitespace not in upstream.
    
    Reduces diff vs OpenBSD by a small amount.

commit 4d2d4d47a18d93f3e0a91a241a6fdb545bbf7dc2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 3 19:27:43 2021 +1000

    Replace remaining references to ChallengeResponse.
    
    Portable had a few additional references to ChallengeResponse related to
    UsePAM, replaces these with equivalent keyboard-interactive ones.

commit 53237ac789183946dac6dcb8838bc3b6b9b43be1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 3 19:23:28 2021 +1000

    Sync remaining ChallengeResponse removal.
    
    These were omitted from commit 88868fd131.

commit 2c9e4b319f7e98744b188b0f58859d431def343b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 3 19:17:31 2021 +1000

    Disable rocky84 to figure out why agent test fails

commit bfe19197a92b7916f64a121fbd3c179abf15e218
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 2 15:43:28 2021 +1000

    Remove now-unused SSHv1 enums.
    
    sRhostsRSAAuthentication and sRSAAuthentication are protocol 1 options
    and are no longer used.

commit c73b02d92d72458a5312bd098f32ce88868fd131
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 2 05:11:20 2021 +0000

    upstream: Remove references to ChallengeResponseAuthentication in
    
    favour of KbdInteractiveAuthentication.  The former is what was in SSHv1, the
    latter is what is in SSHv2 (RFC4256) and they were treated as somewhat but
    not entirely equivalent.  We retain the old name as deprecated alias so
    config files continue to work and a reference in the man page for people
    looking for it.
    
    Prompted by bz#3303 which pointed out the discrepancy between the two
    when used with Match.  Man page help & ok jmc@, with & ok djm@
    
    OpenBSD-Commit-ID: 2c1bff8e5c9852cfcdab1f3ea94dfef5a22f3b7e

commit f841fc9c8c7568a3b5d84a4cc0cefacb7dbc16b9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 2 15:20:32 2021 +1000

    Fix ifdefs around get_random_bytes_prngd.
    
    get_random_bytes_prngd() is used if either of PRNGD_PORT or PRNGD_SOCKET
    are defined, so adjust ifdef accordingly.

commit 0767627cf66574484b9c0834500b42ea04fe528a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 2 14:30:23 2021 +1000

    wrap get_random_bytes_prngd() in ifdef
    
    avoid unused static function warning

commit f93fdc4de158386efe1116bd44c5b3f4a7a82c25
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jun 28 13:06:37 2021 +1000

    Add rocky84 test target.

commit d443006c0ddfa7f6a5bd9c0ae92036f3d5f2fa3b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 25 06:30:22 2021 +0000

    upstream: fix decoding of X.509 subject name; from Leif Thuresson
    
    via bz3327 ok markus@
    
    OpenBSD-Commit-ID: 0ea2e28f39750dd388b7e317bc43dd997a217ae8

commit 2a5704ec142202d387fda2d6872fd4715ab81347
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 25 06:20:39 2021 +0000

    upstream: Use better language to refer to the user. From l1ving
    
    via github PR#250, ok jmc@
    
    OpenBSD-Commit-ID: 07ca3526626996613e128aeddf7748c93c4d6bbf

commit 4bdf7a04797a0ea1c431a9d54588417c29177d19
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 25 03:38:17 2021 +0000

    upstream: Replace SIGCHLD/notify_pipe kludge with pselect.
    
    Previously sshd's SIGCHLD handler would wake up select() by writing a
    byte to notify_pipe.  We can remove this by blocking SIGCHLD, checking
    for child terminations then passing the original signal mask through
    to pselect.  This ensures that the pselect will immediately wake up if
    a child terminates between wait()ing on them and the pselect.
    
    In -portable, for platforms that do not have pselect the kludge is still
    there but is hidden behind a pselect interface.
    
    Based on other changes for bz#2158, ok djm@
    
    OpenBSD-Commit-ID: 202c85de0b3bdf1744fe53529a05404c5480d813

commit c9f7bba2e6f70b7ac1f5ea190d890cb5162ce127
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 25 15:08:18 2021 +1000

    Move closefrom() to before first malloc.
    
    When built against tcmalloc, tcmalloc allocates a descriptor for its
    internal use, so calling closefrom() afterward causes the descriptor
    number to be reused resulting in a corrupted connection.  Moving the
    closefrom a little earlier should resolve this.  From kircherlike at
    outlook.com via bz#3321, ok djm@

commit 7ebfe4e439853b88997c9cfc2ff703408a1cca92
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 18 20:41:45 2021 +1000

    Put second -lssh in link line for sftp-server.
    
    When building --without-openssl the recent port-prngd.c change adds
    a dependency on atomicio, but since nothing else in sftp-server uses
    it, the linker may not find it.  Add a second -lssh similar to other
    binaries.

commit e409d7966785cfd9f5970e66a820685c42169717
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 18 18:34:08 2021 +1000

    Try EGD/PRNGD if random device fails.
    
    When built --without-openssl, try EGD/PRGGD (if configured) as a last
    resort before failing.

commit e43a898043faa3a965dbaa1193cc60e0b479033d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 18 18:32:51 2021 +1000

    Split EGD/PRNGD interface into its own file.
    
    This will allow us to use it when building --without-openssl.

commit acb2887a769a1b1912cfd7067f3ce04fad240260
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jun 17 21:03:19 2021 +1000

    Handle GIDs > 2^31 in getgrouplist.
    
    When compiled in 32bit mode, the getgrouplist implementation may fail
    for GIDs greater than LONG_MAX.  Analysis and change from ralf.winkel
    at tui.com.

commit 31fac20c941126281b527605b73bff30a8f02edd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jun 10 09:46:28 2021 +0000

    upstream: Use $SUDO when reading sshd's pidfile here too.
    
    OpenBSD-Regress-ID: 6bfb0d455d493f24839034a629c5306f84dbd409

commit a3a58acffc8cc527f8fc6729486d34e4c3d27643
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jun 10 09:43:51 2021 +0000

    upstream: Use $SUDO when reading sshd's pidfile in case it was
    
    created with a very restrictive umask.  This resyncs with -portable.
    
    OpenBSD-Regress-ID: 07fd2af06df759d4f64b82c59094accca1076a5d

commit 249ad4ae51cd3bc235e75a4846eccdf8b1416611
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jun 10 09:37:59 2021 +0000

    upstream: Set umask when creating hostkeys to prevent excessive
    
    permissions warning.
    
    OpenBSD-Regress-ID: 382841db0ee28dfef7f7bffbd511803e1b8ab0ef

commit 9d0892153c005cc65897e9372b01fa66fcbe2842
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jun 10 03:45:31 2021 +0000

    upstream: Add regress test for SIGHUP restart
    
    while handling active and unauthenticated clients.  Should catch anything
    similar to the pselect bug just fixed in sshd.c.
    
    OpenBSD-Regress-ID: 3b3c19b5e75e43af1ebcb9586875b3ae3a4cac73

commit 73f6f191f44440ca3049b9d3c8e5401d10b55097
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jun 10 03:14:14 2021 +0000

    upstream: Continue accept loop when pselect
    
    returns -1, eg if it was interrupted by a signal.  This should prevent
    the hang discovered by sthen@ wherein sshd receives a SIGHUP while it has
    an unauthenticated child and goes on to a blocking read on a notify_pipe.
    feedback deraadt@, ok djm@
    
    OpenBSD-Commit-ID: 0243c1c5544fca0974dae92cd4079543a3fceaa0

commit c785c0ae134a8e8b5c82b2193f64c632a98159e4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 8 22:30:27 2021 +0000

    upstream: test that UserKnownHostsFile correctly accepts multiple
    
    arguments; would have caught readconf.c r1.356 regression
    
    OpenBSD-Regress-ID: 71ca54e66c2a0211b04999263e56390b1f323a6a

commit 1a6f6b08e62c78906a3032e8d9a83e721c84574e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 8 22:06:12 2021 +0000

    upstream: fix regression in r1.356: for ssh_config options that
    
    accepted multiple string arguments, ssh was only recording the first.
    Reported by Lucas via bugs@
    
    OpenBSD-Commit-ID: 7cbf182f7449bf1cb7c5b4452667dc2b41170d6d

commit 78e30af3e2b2dd540a341cc827c6b98dd8b0a6de
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 8 07:40:12 2021 +0000

    upstream: test argv_split() optional termination on comments
    
    OpenBSD-Regress-ID: 9fd1c4a27a409897437c010cfd79c54b639a059c

commit a023138957ea2becf1c7f93fcc42b0aaac6f2b03
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jun 8 07:05:27 2021 +0000

    upstream: Add testcases from bz#3319 for IPQoS and TunnelDevice
    
    being overridden on the command line.
    
    OpenBSD-Regress-ID: 801674d5d2d02abd58274a78cab2711f11de14a8

commit 660cea10b2cdc11f13ba99c89b1bbb368a4d9ff2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 8 06:52:43 2021 +0000

    upstream: sprinkle some "# comment" at end of configuration lines
    
    to test comment handling
    
    OpenBSD-Regress-ID: cb82fbf40bda5c257a9f742c63b1798e5a8fdda7

commit acc9c32dcb6def6c7d3688bceb4c0e59bd26b411
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 8 06:51:47 2021 +0000

    upstream: more descriptive failure message
    
    OpenBSD-Regress-ID: 5300f6faf1d9e99c0cd10827b51756c5510e3509

commit ce04dd4eae23d1c9cf7c424a702f48ee78573bc1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 7 01:16:34 2021 +0000

    upstream: test AuthenticationMethods inside a Match block as well
    
    as in the main config section
    
    OpenBSD-Regress-ID: ebe0a686621b7cb8bb003ac520975279c28747f7

commit 9018bd821fca17e26e92f7a7e51d9b24cd62f2db
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 7 00:00:50 2021 +0000

    upstream: prepare for stricter sshd_config parsing that will refuse
    
    a config that has {Allow,Deny}{Users,Groups} on a line with no subsequent
    arguments. Such lines are permitted but are nonsensical noops ATM
    
    OpenBSD-Regress-ID: ef65463fcbc0bd044e27f3fe400ea56eb4b8f650

commit a10f929d1ce80640129fc5b6bc1acd9bf689169e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 8 07:09:42 2021 +0000

    upstream: switch sshd_config parsing to argv_split()
    
    similar to the previous commit, this switches sshd_config parsing to
    the newer tokeniser. Config parsing will be a little stricter wrt
    quote correctness and directives appearing without arguments.
    
    feedback and ok markus@
    
    tested in snaps for the last five or so days - thanks Theo and those who
    caught bugs
    
    OpenBSD-Commit-ID: 9c4305631d20c2d194661504ce11e1f68b20d93e

commit ea9e45c89a4822d74a9d97fef8480707d584da4d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 8 07:07:15 2021 +0000

    upstream: Switch ssh_config parsing to use argv_split()
    
    This fixes a couple of problems with the previous tokeniser,
    strdelim()
    
    1. strdelim() is permissive wrt accepting '=' characters. This is
      intended to allow it to tokenise "Option=value" but because it
      cannot keep state, it will incorrectly split "Opt=val=val2".
    2. strdelim() has rudimentry handling of quoted strings, but it
      is incomplete and inconsistent. E.g. it doesn't handle escaped
      quotes inside a quoted string.
    3. It has no support for stopping on a (unquoted) comment. Because
      of this readconf.c r1.343 added chopping of lines at '#', but
      this caused a regression because these characters may legitimately
      appear inside quoted strings.
    
    The new tokeniser is stricter is a number of cases, including #1 above
    but previously it was also possible for some directives to appear
    without arguments. AFAIK these were nonsensical in all cases, and the
    new tokeniser refuses to accept them.
    
    The new code handles quotes much better, permitting quoted space as
    well as escaped closing quotes. Finally, comment handling should be
    fixed - the tokeniser will terminate only on unquoted # characters.
    
    feedback & ok markus@
    
    tested in snaps for the last five or so days - thanks Theo and those who
    caught bugs
    
    OpenBSD-Commit-ID: dc72fd12af9d5398f4d9e159d671f9269c5b14d5

commit d786424986c04d1d375f231fda177c8408e05c3e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jun 8 07:02:46 2021 +0000

    upstream: Check if IPQoS or TunnelDevice are already set before
    
    overriding. Prevents values in config files from overriding values supplied
    on the command line.  bz#3319, ok markus.
    
    OpenBSD-Commit-ID: f3b08b898c324debb9195e6865d8999406938f74

commit aae4b4d3585b9f944d7dbd3c9e5ba0006c55e457
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 8 06:54:40 2021 +0000

    upstream: Allow argv_split() to optionally terminate tokenisation
    
    when it encounters an unquoted comment.
    
    Add some additional utility function for working with argument
    vectors, since we'll be switching to using them to parse
    ssh/sshd_config shortly.
    
    ok markus@ as part of a larger diff; tested in snaps
    
    OpenBSD-Commit-ID: fd9c108cef2f713f24e3bc5848861d221bb3a1ac

commit da9f9acaac5bab95dca642b48e0c8182b246ab69
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jun 7 19:19:23 2021 +1000

    Save logs on failure for upstream test

commit 76883c60161e5f3808787085a27a8c37f8cc4e08
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jun 7 14:36:32 2021 +1000

    Add obsdsnap-i386 upstream test target.

commit d45b9c63f947ec5ec314696e70281f6afddc0ac3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 7 03:38:38 2021 +0000

    upstream: fix debug message when finding a private key to match a
    
    certificate being attempted for user authentication. Previously it would
    print the certificate's path, whereas it was supposed to be showing the
    private key's path. Patch from Alex Sherwin via GHPR247
    
    OpenBSD-Commit-ID: d5af3be66d0f22c371dc1fe6195e774a18b2327b

commit 530739d42f6102668aecd699be0ce59815c1eceb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jun 6 11:34:16 2021 +0000

    upstream: Match host certificates against host public keys, not private
    
    keys. Allows use of certificates with private keys held in a ssh-agent.
    Reported by Miles Zhou in bz3524; ok dtucker@
    
    OpenBSD-Commit-ID: 25f5bf70003126d19162862d9eb380bf34bac22a

commit 4265215d7300901fd7097061c7517688ade82f8e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jun 6 03:40:39 2021 +0000

    upstream: Client-side workaround for a bug in OpenSSH 7.4: this release
    
    allows RSA/SHA2 signatures for public key authentication but fails to
    advertise this correctly via SSH2_MSG_EXT_INFO. This causes clients of these
    server to incorrectly match PubkeyAcceptedAlgorithms and potentially refuse
    to offer valid keys.
    
    Reported by and based on patch from Gordon Messmer via bz3213, thanks
    also for additional analysis by Jakub Jelen. ok dtucker
    
    OpenBSD-Commit-ID: d6d0b7351d5d44c45f3daaa26efac65847a564f7

commit bda270d7fb8522d43c21a79a4b02a052d7c64de8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jun 6 03:17:02 2021 +0000

    upstream: degrade gracefully if a sftp-server offers the
    
    limits@openssh.com extension but fails when the client tries to invoke it.
    Reported by Hector Martin via bz3318
    
    OpenBSD-Commit-ID: bd9d1839c41811616ede4da467e25746fcd9b967

commit d345d5811afdc2d6923019b653cdd93c4cc95f76
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jun 6 03:15:39 2021 +0000

    upstream: the limits@openssh.com extension was incorrectly marked
    
    as an operation that writes to the filesystem, which made it unavailable in
    sftp-server read-only mode. Spotted by Hector Martin via bz3318
    
    OpenBSD-Commit-ID: f054465230787e37516c4b57098fc7975e00f067

commit 2b71010d9b43d7b8c9ec1bf010beb00d98fa765a
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sat Jun 5 13:47:00 2021 +0000

    upstream: PROTOCOL.certkeys: update reference from IETF draft to
    
    RFC
    
    Also fix some typos.
    ok djm@
    
    OpenBSD-Commit-ID: 5e855b6c5a22b5b13f8ffa3897a868e40d349b44

commit aa99b2d9a3e45b943196914e8d8bf086646fdb54
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 4 23:41:29 2021 +1000

    Clear notify_pipe from readset if present.
    
    Prevents leaking an implementation detail to the caller.

commit 6de8dadf6b4d0627d35bca0667ca44b1d61c2c6b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 4 23:24:25 2021 +1000

    space->tabs.

commit c8677065070ee34c05c7582a9c2f58d8642e552d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 4 18:39:48 2021 +1000

    Add pselect implementation for platforms without.
    
    This is basically the existing notify_pipe kludge from serverloop.c
    moved behind a pselect interface.  It works by installing a signal
    handler that writes to a pipe that the select is watching, then calls
    the original handler.
    
    The select call in serverloop will become pselect soon, at which point the
    kludge will be removed from thereand will only exist in the compat layer.
    Original code by markus, help from djm.

commit 7cd7f302d3a072748299f362f9e241d81fcecd26
Author: Vincent Brillault <vincent.brillault@cern.ch>
Date:   Sun May 24 09:15:06 2020 +0200

    auth_log: dont log partial successes as failures
    
    By design, 'partial' logins are successful logins, so initially with
    authenticated set to 1, for which another authentication is required. As
    a result, authenticated is always reset to 0 when partial is set to 1.
    However, even if authenticated is 0, those are not failed login
    attempts, similarly to attempts with authctxt->postponed set to 1.

commit e7606919180661edc7f698e6a1b4ef2cfb363ebf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 4 06:19:07 2021 +0000

    upstream: The RB_GENERATE_STATIC(3) macro expands to a series of
    
    function definitions and not a statement, so there should be no semicolon
    following them. Patch from Michael Forney
    
    OpenBSD-Commit-ID: c975dd180580f0bdc0a4d5b7d41ab1f5e9b7bedd

commit c298c4da574ab92df2f051561aeb3e106b0ec954
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 4 05:59:18 2021 +0000

    upstream: rework authorized_keys example section, removing irrelevant
    
    stuff, de-wrapping the example lines and better aligning the examples with
    common usage and FAQs; ok jmc
    
    OpenBSD-Commit-ID: d59f1c9281f828148e2a2e49eb9629266803b75c

commit d9cb35bbec5f623589d7c58fc094817b33030f35
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 4 05:10:03 2021 +0000

    upstream: adjust SetEnv description to clarify $TERM handling
    
    OpenBSD-Commit-ID: 8b8cc0124856bc1094949d55615e5c44390bcb22

commit 771f57a8626709f2ad207058efd68fbf30d31553
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 4 05:09:08 2021 +0000

    upstream: Switch the listening select loop from select() to
    
    pselect() and mask signals while checking signal flags, umasking for pselect
    and restoring afterwards. Also restore signals before sighup_restart so they
    don't remain blocked after restart.
    
    This prevents a race where a SIGTERM or SIGHUP can arrive between
    checking the flag and calling select (eg if sshd is processing a
    new connection) resulting in sshd not shutting down until the next
    time it receives a new connection.  bz#2158, with & ok djm@
    
    OpenBSD-Commit-ID: bf85bf880fd78e00d7478657644fcda97b9a936f

commit f64f8c00d158acc1359b8a096835849b23aa2e86
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 4 05:02:40 2021 +0000

    upstream: allow ssh_config SetEnv to override $TERM, which is otherwise
    
    handled specially by the protocol. Useful in ~/.ssh/config to set TERM to
    something generic (e.g. "xterm" instead of "xterm-256color") for destinations
    that lack terminfo entries. feedback and ok dtucker@
    
    OpenBSD-Commit-ID: 38b1ef4d5bc159c7d9d589d05e3017433e2d5758

commit 60107677dc0ce1e93c61f23c433ad54687fcd9f5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 4 04:02:21 2021 +0000

    upstream: correct extension name "no-presence-required" =>
    
    "no-touch-required"
    
    document "verify-required" option
    
    OpenBSD-Commit-ID: 1879ff4062cf61d79b515e433aff0bf49a6c55c5

commit ecc186e46e3e30f27539b4311366dfda502f0a08
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jun 2 13:54:11 2021 +1000

    Retire fbsd7 test target.
    
    It's the slowest of the selfhosted targets (since it's 32bit but has
    most of the crypto algos). We still have coverage for 32bit i386.

commit 5de0867b822ec48b5eec9abde0f5f95d1d646546
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jun 2 11:21:40 2021 +1000

    Check for $OPENSSL in md5 fallback too.

commit 1db69d1b6542f8419c04cee7fd523a4a11004be2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jun 2 11:17:54 2021 +1000

    Add dfly60 target.

commit a3f2dd955f1c19cad387a139f0e719af346ca6ef
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jun 2 00:17:45 2021 +0000

    upstream: Merge back shell portability changes
    
    bringing it back in sync with -portable.
    
    OpenBSD-Regress-ID: c07905ba931e66ad7d849b87b7d19648007175d1

commit 9d482295c9f073e84d75af46b720a1c0f7ec2867
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jun 1 23:56:20 2021 +0000

    upstream: Use a default value for $OPENSSL,
    
    allowing it to be overridden. Do the same in the PuTTY tests since it's
    needed there and not exported by test-exec.sh.
    
    OpenBSD-Regress-ID: c49dcd6aa7602a8606b7afa192196ca1fa65de16

commit 07660b3c99f8ea74ddf4a440e55c16c9f7fb3dd1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon May 24 10:25:18 2021 +0000

    upstream: Find openssl binary via environment variable. This
    
    allows overriding if necessary (eg in -portable where we're testing against a
    specific version of OpenSSL).
    
    OpenBSD-Regress-ID: 491f39cae9e762c71aa4bf045803d077139815c5

commit 1a4d1da9188d7c88f646b61f0d6a3b34f47c5439
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 21 04:03:47 2021 +0000

    upstream: fix memleak in test
    
    OpenBSD-Regress-ID: 5e529d0982aa04666604936df43242e97a7a6f81

commit 60455a5d98065a73ec9a1f303345856bbd49aecc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 21 03:59:01 2021 +0000

    upstream: also check contents of remaining string
    
    OpenBSD-Regress-ID: d526fa07253f4eebbc7d6205a0ab3d491ec71a28

commit 39f6cd207851d7b67ca46903bfce4a9f615b5b1c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 21 03:48:07 2021 +0000

    upstream: unit test for misc.c:strdelim() that mostly servces to
    
    highlight its inconsistencies
    
    OpenBSD-Regress-ID: 8d2bf970fcc01ccc6e36a5065f89b9c7fa934195

commit 7a3a1dd2c7d4461962acbcc0ebee9445ba892be0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 27 21:23:15 2021 +1000

    Put minix3 config in the host-specific block.

commit 59a194825f12fff8a7f75d91bf751ea17645711b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 31 06:48:42 2021 +0000

    upstream: Hash challenge supplied by client during FIDO key enrollment
    
    prior to passing it to libfido2, which does expect a hash.
    
    There is no effect for users who are simply generating FIDO keys using
    ssh-keygen - by default we generate a random 256 bit challenge, but
    people building attestation workflows around our tools should now have
    a more consistent experience (esp. fewer failures when they fail to
    guess the magic 32-byte challenge length requirement).
    
    ok markus@
    
    OpenBSD-Commit-ID: b8d5363a6a7ca3b23dc28f3ca69470472959f2b5

commit eb68e669bc8ab968d4cca5bf1357baca7136a826
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 27 21:14:15 2021 +1000

    Include login_cap.h for login_getpwclass override.
    
    On minix3, login_getpwclass is __RENAME'ed to __login_getpwclass50 so
    without this the include overriding login_getpwclass causes a compile
    error.

commit 2063af71422501b65c7a92a5e14c0e6a3799ed89
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 27 21:13:38 2021 +1000

    Add minix3 test target.

commit 2e1efcfd9f94352ca5f4b6958af8a454f8cf48cd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 26 01:47:24 2021 +0000

    upstream: fix SEGV in UpdateHostkeys debug() message, triggered
    
    when the update removed more host keys than remain present. Fix tested by
    reporter James Cook, via bugs@
    
    OpenBSD-Commit-ID: 44f641f6ee02bb957f0c1d150495b60cf7b869d3

commit 9acd76e6e4d2b519773e7119c33cf77f09534909
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sun May 23 18:22:57 2021 +0000

    upstream: ssh: The client configuration keyword is
    
    "hostbasedacceptedalgorithms"
    
    This fixes a mistake that slipped in when "HostbasedKeyTypes" was
    renamed to "HostbasedAcceptedAlgorithms".
    
    Bug report by zack@philomathiclife.com
    
    OpenBSD-Commit-ID: d745a7e8e50b2589fc56877f322ea204bc784f38

commit 078a0e60c92700da4c536c93c007257828ccd05b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 25 11:40:47 2021 +1000

    Rename README.md to ci-status.md.
    
    The original intent was to provide a status page for the CIs configured
    in that directory, but it had the side effect of replacing the top-level
    README.md.

commit 7be4ac813662f68e89f23c50de058a49aa32f7e4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 19 01:24:05 2021 +0000

    upstream: restore blocking status on stdio fds before close
    
    ssh(1) needs to set file descriptors to non-blocking mode to operate
    but it was not restoring the original state on exit. This could cause
    problems with fds shared with other programs via the shell, e.g.
    
    > $ cat > test.sh << _EOF
    > #!/bin/sh
    > {
    >         ssh -Fnone -oLogLevel=verbose ::1 hostname
    >         cat /usr/share/dict/words
    > } | sleep 10
    > _EOF
    > $ ./test.sh
    > Authenticated to ::1 ([::1]:22).
    > Transferred: sent 2352, received 2928 bytes, in 0.1 seconds
    > Bytes per second: sent 44338.9, received 55197.4
    > cat: stdout: Resource temporarily unavailable
    
    This restores the blocking status for fds 0,1,2 (stdio) before ssh(1)
    abandons/closes them.
    
    This was reported as bz3280 and GHPR246; ok dtucker@
    
    OpenBSD-Commit-ID: 8cc67346f05aa85a598bddf2383fcfcc3aae61ce

commit c4902e1a653c67fea850ec99c7537f358904c0af
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 17 11:43:16 2021 +0000

    upstream: fix breakage of -W forwaring introduced in 1.554; reported by
    
    naddy@ and sthen@, ok sthen@
    
    OpenBSD-Commit-ID: f72558e643a26dc4150cff6e5097b5502f6c85fd

commit afea01381ad1fcea1543b133040f75f7542257e6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon May 17 07:22:45 2021 +0000

    upstream: Regenerate moduli.
    
    OpenBSD-Commit-ID: 83c93a2a07c584c347ac6114d6329b18ce515557

commit be2866d6207b090615ff083c9ef212b603816a56
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 17 09:40:23 2021 +1000

    Handle Android libc returning NULL pw->pw_passwd
    
    Reported by Luke Dashjr

commit 5953c143008259d87342fb5155bd0b8835ba88e5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 14 05:20:32 2021 +0000

    upstream: fix previous: test saved no_shell_flag, not the one that just
    
    got clobbered
    
    OpenBSD-Commit-ID: b8deace085d9d941b2d02f810243b9c302e5355d

commit 1e9fa55f4dc4b334651d569d3448aaa3841f736f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 14 03:09:48 2021 +0000

    upstream: Fix ssh started with ControlPersist incorrectly executing a
    
    shell when the -N (no shell) option was specified. bz3290 reported by Richard
    Schwab; patch from markus@ ok me
    
    OpenBSD-Commit-ID: ea1ea4af16a95687302f7690bdbe36a6aabf87e1

commit d1320c492f655d8f5baef8c93899d79dded217a5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed May 12 11:34:30 2021 +0000

    upstream: Clarify language about moduli. While both ends of the
    
    connection do need to use the same parameters (ie groups), the DH-GEX
    protocol takes care of that and both ends do not need the same contents in
    the moduli file, which is what the previous text suggested.  ok djm@ jmc@
    
    OpenBSD-Commit-ID: f0c18cc8e79c2fbf537a432a9070ed94e96a622a

commit d3cc4d650ce3e59f3e370b101778b0e8f1c02c4d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 7 04:11:51 2021 +0000

    upstream: include pid in LogVerbose spam
    
    OpenBSD-Commit-ID: aacb86f96ee90c7cb84ec27452374285f89a7f00

commit e3c032333be5fdbbaf2751f6f478e044922b4ec4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 7 03:09:38 2021 +0000

    upstream: don't sigdie() in signal handler in privsep child process;
    
    this can end up causing sandbox violations per bz3286; ok dtucker@
    
    OpenBSD-Commit-ID: a7f40b2141dca4287920da68ede812bff7ccfdda

commit a4039724a3f2abac810735fc95cf9114a3856049
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 7 09:23:40 2021 +0000

    upstream: Increase ConnectionAttempts from 4 to 10 as the tests
    
    occasionally time out on heavily loaded hosts.
    
    OpenBSD-Regress-ID: 29a8cdef354fc9da471a301f7f65184770434f3a

commit c0d7e36e979fa3cdb60f5dcb6ac9ad3fd018543b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 7 02:26:55 2021 +0000

    upstream: dump out a usable private key string too; inspired by Tyson
    
    Whitehead
    
    OpenBSD-Regress-ID: 65572d5333801cb2f650ebc778cbdc955e372058

commit 24fee8973abdf1c521cd2c0047d89e86d9c3fc38
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 7 02:29:40 2021 +0000

    upstream: correct mistake in spec - the private key blobs are encoded
    
    verbatim and not as strings (i.e. no 4-byte length header)
    
    OpenBSD-Commit-ID: 3606b5d443d72118c5b76c4af6dd87a5d5a4f837

commit f43859159cc62396ad5d080f0b1f2635a67dac02
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue May 4 22:53:52 2021 +0000

    upstream: Don't pass NULL as a string in debugging as it does not work
    
    on some platforms in -portable.  ok djm@
    
    OpenBSD-Commit-ID: 937c892c99aa3c9c272a8ed78fa7c2aba3a44fc9

commit ac31aa3c6341905935e75f0539cf4a61bbe99779
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 3 00:16:45 2021 +0000

    upstream: more debugging for UpdateHostKeys signature failures
    
    OpenBSD-Commit-ID: 1ee95f03875e1725df15d5e4bea3e73493d57d36

commit 8e32e97e788e0676ce83018a742203614df6a2b3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat May 1 20:07:47 2021 +1000

    Add obsd69 test target.

commit f06893063597c5bb9d9e93f851c4070e77d2fba9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 30 04:29:53 2021 +0000

    upstream: a little debugging in the main mux process for status
    
    confirmation failures in multiplexed sessions
    
    OpenBSD-Commit-ID: 6e27b87c95176107597035424e1439c3232bcb49

commit e65cf00da6bc31e5f54603b7feb7252dc018c033
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 30 04:02:52 2021 +0000

    upstream: Remove now-unused skey function prototypes leftover from
    
    skey removal.
    
    OpenBSD-Commit-ID: 2fc36d519fd37c6f10ce74854c628561555a94c3

commit ae5f9b0d5c8126214244ee6b35aae29c21028133
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Apr 29 13:01:50 2021 +1000

    Wrap sntrup761x25519 inside ifdef.
    
    From balu.gajjala at gmail.com via bz#3306.

commit 70a8dc138a6480f85065cdb239915ad4b7f928cf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 28 14:44:07 2021 +1000

    Add status badges for Actions-based tests.

commit 40b59024cc3365815381474cdf4fe423102e391b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 28 12:22:11 2021 +1000

    Add obsdsnap (OpenBSD snapshot) test target.

commit e627067ec8ef9ae8e7a638f4dbac91d52dee3e6d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 28 11:35:28 2021 +1000

    Add test building upstream OpenBSD source.

commit 1b8108ebd12fc4ed0fb39ef94c5ba122558ac373
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 27 14:22:20 2021 +1000

    Test against OpenSSL 1.1.0h instead of 1.1.0g.
    
    1.1.0g requires a perl glob module that's not installed by default.

commit 9bc20efd39ce8525be33df3ee009f5a4564224f1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 27 12:37:59 2021 +1000

    Use the default VM type for libcrypto ver tests.

commit 9f79e80dc40965c2e73164531250b83b176c1eea
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 27 12:24:10 2021 +1000

    Always build OpenSSL shared.
    
    This is the default for current versions but we need it to test against
    earlier versions.

commit b3cc9fbdff2782eca79e33e02ac22450dc63bce9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 27 09:18:02 2021 +1000

    Fix custom OpenSSL tests.
    
    Check out specified OpenSSL version.  Install custom libcrypto where
    configure expects to find it.  Remove unneeded OpenSSL config time
    options.  Older OpenSSL versions were not make -j safe so remove it.

commit 77532609874a99a19e3e2eb2d1b7fa93aef963bb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 26 17:18:25 2021 +1000

    Export CC and CFLAGS for c89 test.

commit 33f62dfbe865f4de77980ab88774bf1eb5e4e040
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 26 17:13:44 2021 +1000

    Add c89 here too.

commit da9d59f526fce58e11cba49cd8eb011dc0bf5677
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 26 15:34:23 2021 +1000

    Add test against OpenSSL w/out ECC.

commit 29e194a752359ebf85bf7fce100f23a0477fc4de
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 26 14:49:59 2021 +1000

    Ensure we can still build with C89.

commit a38016d369d21df5d35f761f2b67e175e132ba22
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 26 14:29:03 2021 +1000

    Interop test agains PuTTY.

commit 095b0307a77be8803768857cc6c0963fa52ed85b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 26 14:02:03 2021 +1000

    Support testing against arbitary libcrytpo vers.
    
    Add tests against various LibreSSL and OpenSSL versions.

commit b16082aa110fa7128ece2a9037ff420c4a285317
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 26 13:35:44 2021 +1000

    Add fbsd10 test target.

commit 2c805f16b24ea37cc051c6018fcb05defab6e57a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Apr 25 14:15:02 2021 +1000

    Disable compiler hardening on nbsd4.
    
    The system compiler supports -fstack-protector-all, but using it will
    result in an internal compiler error on some files.

commit 6a5d39305649da5dff1934ee54292ee0cebd579d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Apr 25 13:01:34 2021 +1000

    Add nbsd3, nbsd4 and nbsd9 test targets.

commit d1aed05bd2e4ae70f359a394dc60a2d96b88f78c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Apr 24 22:03:46 2021 +1000

    Comment out nbsd2 test target for now.

commit a6b4ec94e5bd5a8a18cd2c9942d829d2e5698837
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Apr 24 17:52:24 2021 +1000

    Add OPENBSD ORIGINAL marker.

commit 3737c9f66ee590255546c4b637b6d2be669a11eb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 23 19:49:46 2021 +1000

    Replace "==" (a bashism) with "=".

commit a116b6f5be17a1dd345b7d54bf8aa3779a28a0df
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 23 16:34:48 2021 +1000

    Add nbsd2 test target.

commit 196bf2a9bb771f45d9b0429cee7d325962233c44
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 23 14:54:10 2021 +1000

    Add obsd68 test target.

commit e3ba6574ed69e8b7af725cf5e8a9edaac04ff077
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 23 14:53:32 2021 +1000

    Remove dependency on bash.

commit db1f9ab8feb838aee9f5b99c6fd3f211355dfdcf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 23 14:41:13 2021 +1000

    Add obsd67 test target.

commit c039a6bf79192fe1daa9ddcc7c87dd98e258ae7c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 23 11:08:23 2021 +1000

    Re-add macos-11.0 test target.

commit a6db3a47b56adb76870d59225ffb90a65bc4daf2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 23 10:28:28 2021 +1000

    Add openindiana test target.

commit 3fe7e73b025c07eda46d78049f1da8ed7dfc0c69
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 23 10:26:35 2021 +1000

    Test krb5 on Solaris 11 too.

commit f57fbfe5eb02df1a91f1a237c4d27165afd87c13
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Apr 22 22:27:26 2021 +1000

    Don't always set SUDO.
    
    Rely on sourcing configs to set as appropriate.

commit e428f29402fb6ac140b52f8f12e06ece7bb104a0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Apr 22 22:26:08 2021 +1000

    Remove now-unused 2nd arg to configs.

commit cb4ff640d79b3c736879582139778f016bbb2cd7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 21 01:08:04 2021 +1000

    Add win10 test target.

commit 4457837238072836b2fa3107d603aac809624983
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 20 23:31:29 2021 +1000

    Add nbsd8 test target.

commit bd4fba22e14da2fa196009010aabec5a8ba9dd42
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Apr 17 09:55:47 2021 +1000

    Add obsd51 target.

commit 9403d0e805c77a5741ea8c3281bbe92558c2f125
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 16 18:14:25 2021 +1000

    Add fbsd13 target.

commit e86968280e358e62649d268d41f698d64d0dc9fa
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 13:55:25 2021 +1000

    depend

commit 2fb25ca11e8b281363a2a2a4dec4c497a1475d9a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 13:53:02 2021 +1000

    crank version in README and RPM spec files

commit b2b60ebab0cb77b5bc02d364d72e13db882f33ae
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 16 03:42:00 2021 +0000

    upstream: openssh-8.6
    
    OpenBSD-Commit-ID: b5f3e133c846127ec114812248bc17eff07c3e19

commit faf2b86a46c9281d237bcdec18c99e94a4eb820a
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Apr 15 16:24:31 2021 +0000

    upstream: do not pass file/func to monitor; noted by Ilja van Sprundel;
    
    ok djm@
    
    OpenBSD-Commit-ID: 85ae5c063845c410283cbdce685515dcd19479fa

commit 2dc328023f60212cd29504fc05d849133ae47355
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 14 11:42:55 2021 +1000

    sshd don't exit on transient read errors
    
    openssh-8.5 introduced a regression that would cause sshd to exit
    because of transient read errors on the network socket (e.g. EINTR,
    EAGAIN). Reported by balu.gajjala AT gmail.com via bz3297

commit d5d6b7d76d171a2e6861609dcd92e714ee62ad88
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 10 18:45:00 2021 +1000

    perform report_failed_grab() inline

commit ea996ce2d023aa3c6d31125e2c3ebda1cb42db8c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 10 18:22:57 2021 +1000

    dedicated gnome-ssk-askpass3 source
    
    Compatibility with Wayland requires that we use the gdk_seat_grab()
    API for grabbing mouse/keyboard, however these API don't exist in
    Gtk+2.
    
    This branches gnome-ssk-askpass2.c => gnome-ssk-askpass3.c and
    makes the changes to use the gdk_seat_grab() instead of grabbing
    mouse/focus separately via GDK.
    
    In the future, we can also use the branched file to avoid some
    API that has been soft-deprecated in GTK+3, e.g. gtk_widget_modify_fg

commit bfa5405da05d906ffd58216eb77c4375b62d64c2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Apr 8 15:18:15 2021 +1000

    Ensure valgrind-out exists.
    
    Normally the regress tests would create it, but running the unit tests
    on their own would fail because the directory did not exist.

commit 1f189181f3ea09a9b08aa866f78843fec800874f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Apr 8 15:17:19 2021 +1000

    Pass OBJ to unit test make invocation.
    
    At least the Valgrind unit tests uses $OBJ.

commit f42b550c281d28bd19e9dd6ce65069164f3482b0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Apr 8 14:20:12 2021 +1000

    Add pattern for valgrind-unit.

commit 19e534462710e98737478fd9c44768b50c27c4c6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Apr 8 13:31:08 2021 +1000

    Run unit tests under valgrind.
    
    Run a separate build for the unit tests under Valgrind.  They take long
    enough that running in parallel with the other Valgrind tests helps.

commit 80032102d05e866dc2a48a5caf760cf42c2e090e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Apr 8 13:25:57 2021 +1000

    ifdef out MIN and MAX.
    
    In -portable, defines.h ensures that these are defined, so redefining
    potentially causes a warning.  We don't just delete it to make any
    future code syncs a little but easier.  bz#3293.

commit d1bd184046bc310c405f45da3614a1dc5b3e521a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 7 10:23:51 2021 +1000

    Remove only use of warn().
    
    The warn() function is only used in one place in portable and does not
    exist upstream.  Upgrade the only instance it's used to fail()
    (the privsep/sandbox+proxyconnect, from back when that was new) and
    remove the now-unused function.

commit fea8f4b1aa85026ad5aee5ad8e1599a8d5141fe0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 7 10:18:32 2021 +1000

    Move make_tmpdir() into portable-specific area.
    
    Reduces diff vs OpenBSD and makes it more likely diffs will apply
    cleanly.

commit 13e5fa2acffd26e754c6ee1d070d0afd035d4cb7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Apr 6 23:57:56 2021 +0000

    upstream: Add TEST_SSH_ELAPSED_TIMES environment variable to print the
    
    elapsed time in seconds of each test.  This depends on "date +%s" which is
    not specified by POSIX but is commonly implemented.
    
    OpenBSD-Regress-ID: ec3c8c19ff49b2192116a0a646ee7c9b944e8a9c

commit ef4f46ab4387bb863b471bad124d46e8d911a79a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 7 09:59:15 2021 +1000

    Move the TEST_SSH_PORT section down a bit.
    
    This groups the portable-specific changes together and makes it a
    little more likely that patches will apply cleanly.

commit 3674e33fa70dfa1fe69b345bf576113af7b7be11
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 7 10:05:10 2021 +1000

    Further split Valgrind tests.
    
    Even split in two, the Valgrind tests take by far the longest to run,
    so split them four ways to further increase parallelism.

commit 961af266b861e30fce1e26170ee0dbb5bf591f29
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 6 23:24:30 2021 +0000

    upstream: include "ssherr.h" not <ssherr.h>; from Balu Gajjala via
    
    bz#3292
    
    OpenBSD-Commit-ID: e9535cd9966eb2e69e73d1ede1f44905c30310bd

commit e7d0a285dbdd65d8df16123ad90f15e91862f959
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 7 08:50:38 2021 +1000

    wrap struct rlimit in HAVE_GETRLIMIT too

commit f283a6c2e0a9bd9369e18462acd00be56fbe5b0d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 7 08:20:35 2021 +1000

    wrap getrlimit call in HAVE_GETRLIMIT; bz3291

commit 679bdc4a5c9244f427a7aee9c14b0a0ed086da1f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Apr 6 09:07:33 2021 +0000

    upstream: Don't check return value of unsetenv(). It's part of the
    
    environment setup and not part of the actual test, and some platforms
    -portable runs on declare it as returning void, which prevents the test from
    compiling.
    
    OpenBSD-Regress-ID: 24f08543ee3cdebc404f2951f3e388cc82b844a1

commit 320af2f3de6333aa123f1b088eca146a245e968a
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sun Apr 4 11:36:56 2021 +0000

    upstream: remove stray inserts; from matthias schmidt
    
    OpenBSD-Commit-ID: 2c36ebdc54e14bbf1daad70c6a05479a073d5c63

commit 801f710953b24dd2f21939171c622eac77c7484d
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sun Apr 4 06:11:24 2021 +0000

    upstream: missing comma; from kawashima james
    
    OpenBSD-Commit-ID: 31cec6bf26c6db4ffefc8a070715ebef274e68ea

commit b3ca08cb174266884d44ec710a84cd64c12414ea
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 5 23:46:42 2021 +1000

    Install libcbor with libfido2.

commit f3ca8af87a4c32ada660da12ae95cf03d190c083
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 3 18:21:08 2021 +1100

    enable authopt and misc unit tests
    
    Neither were wired into the build, both required some build
    adaptations for -portable

commit dc1b45841fb97e3d7f655ddbcfef3839735cae5f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Apr 3 06:58:30 2021 +0000

    upstream: typos in comments; GHPR#180 from Vill
    
    =?UTF-8?q?e=20Skytt=C3=A4?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: 93c732381ae0e2b680c79e67c40c1814b7ceed2c

commit 53ea05e09b04fd7b6dea66b42b34d65fe61b9636
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Apr 3 06:55:52 2021 +0000

    upstream: sync CASignatureAlgorithms lists with reality. GHPR#174 from
    
    Matt Hazinski
    
    OpenBSD-Commit-ID: f05e4ca54d7e67b90fe58fe1bdb1d2a37e0e2696

commit 57ed647ee07bb883a2f2264231bcd1df6a5b9392
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 3 17:47:37 2021 +1100

    polish whitespace for portable files

commit 31d8d231eb9377df474746a822d380c5d68d7ad6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Apr 3 06:18:40 2021 +0000

    upstream: highly polished whitespace, mostly fixing spaces-for-tab
    
    and bad indentation on continuation lines. Prompted by GHPR#185
    
    OpenBSD-Commit-ID: e5c81f0cbdcc6144df1ce468ec1bac366d8ad6e9

commit 34afde5c73b5570d6f8cce9b49993b23b77bfb86
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Apr 3 05:54:14 2021 +0000

    upstream: whitespace (tab after space)
    
    OpenBSD-Commit-ID: 0e2b3f7674e985d3f7c27ff5028e690ba1c2efd4

commit 7cd262c1c5a08cc7f4f30e3cab108ef089d0a57b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Apr 3 16:59:10 2021 +1100

    Save config.h and config.log on failure too.

commit 460aee9298f365357e9fd26851c22e0dca51fd6a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Apr 3 05:46:41 2021 +0000

    upstream: fix incorrect plural; from Ville Skyt
    
    =?UTF-8?q?t=C3=A4=20via=20GHPR#181?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: 92f31754c6296d8f403d7c293e09dc27292d22c9

commit 082804c14e548cada75c81003a3c68ee098138ee
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Apr 3 05:40:39 2021 +0000

    upstream: ensure that pkcs11_del_provider() is called before exit -
    
    some PKCS#11 providers get upset if C_Initialize is not matched with
    C_Finalize.
    
    From Adithya Baglody via GHPR#234; ok markus
    
    OpenBSD-Commit-ID: f8e770e03b416ee9a58f9762e162add900f832b6

commit 464ebc82aa926dd132ec75a0b064574ef375675e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Apr 3 05:28:43 2021 +0000

    upstream: unused variable
    
    OpenBSD-Commit-ID: 85f6a394c8e0f60d15ecddda75176f112007b205

commit dc3c0be8208c488e64a8bcb7d9efad98514e0ffb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Apr 3 05:21:46 2021 +0000

    upstream: Fix two problems in string->argv conversion: 1) multiple
    
    backslashes were not being dequoted correctly and 2) quoted space in the
    middle of a string was being incorrectly split.
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    A unit test for these cases has already been committed
    
    prompted by and based on GHPR#223 by Eero Häkkinen; ok markus@
    
    OpenBSD-Commit-ID: d7ef27abb4eeeaf6e167e9312e4abe9e89faf1e4

commit f75bcbba58a08c670727ece5e3f8812125969799
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 3 16:22:48 2021 +1100

    missing bits from 259d648e

commit 4cbc4a722873d9b68cb5496304dc050d7168df78
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 31 21:59:26 2021 +0000

    upstream: cannot effectively test posix-rename extension after
    
    changes in feature advertisment.
    
    OpenBSD-Regress-ID: 5e390bf88d379162aaa81b60ed86b34cb0c54d29

commit 259d648e63e82ade4fe2c2c73c8b67fe57d9d049
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 19 04:23:50 2021 +0000

    upstream: add a test for misc.c:argv_split(), currently fails
    
    OpenBSD-Regress-ID: ad6b96d6ebeb9643b698b3575bdd6f78bb144200

commit 473ddfc2d6b602cb2d1d897e0e5c204de145cd9a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 19 03:25:01 2021 +0000

    upstream: split
    
    OpenBSD-Regress-ID: f6c03c0e4c58b3b9e04b161757b8c10dc8378c34

commit 1339800fef8d0dfbfeabff71b34670105bcfddd2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 31 22:16:34 2021 +0000

    upstream: Use new limits@openssh.com protocol extension to let the
    
    client select good limits based on what the server supports. Split the
    download and upload buffer sizes to allow them to be chosen independently.
    
    In practice (and assuming upgraded sftp/sftp-server at each end), this
    increases the download buffer 32->64KiB and the upload buffer
    32->255KiB.
    
    Patches from Mike Frysinger; ok dtucker@
    
    OpenBSD-Commit-ID: ebd61c80d85b951b794164acc4b2f2fd8e88606c

commit 6653c61202d104e59c8e741329fcc567f7bc36b8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 31 21:58:07 2021 +0000

    upstream: do not advertise protocol extensions that have been
    
    disallowed by the command-line options (e.g. -p/-P/-R); ok dtucker@
    
    OpenBSD-Commit-ID: 3a8a76b3f5131741aca4b41bfab8d101c9926205

commit 71241fc05db4bbb11bb29340b44b92e2575373d8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 29 15:14:25 2021 +1100

    gnome-ssh-askpass3 is a valid target here

commit 8a9520836e71830f4fccca066dba73fea3d16bda
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 19 02:22:34 2021 +0000

    upstream: return non-zero exit status when killed by signal; bz#3281 ok
    
    dtucker@
    
    OpenBSD-Commit-ID: 117b31cf3c807993077b596bd730c24da9e9b816

commit 1269b8a686bf1254b03cd38af78167a04aa6ec88
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 19 02:18:28 2021 +0000

    upstream: increase maximum SSH2_FXP_READ to match the maximum
    
    packet size. Also handle zero-length reads that are borderline nonsensical
    but not explicitly banned by the spec. Based on patch from Mike Frysinger,
    feedback deraadt@ ok dtucker@
    
    OpenBSD-Commit-ID: 4e67d60d81bde7b84a742b4ee5a34001bdf80d9c

commit 860b67604416640e8db14f365adc3f840aebcb1f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 16 06:15:43 2021 +0000

    upstream: don't let logging clobber errno before use
    
    OpenBSD-Commit-ID: ce6cca370005c270c277c51c111bb6911e1680ec

commit 5ca8a9216559349c56e09039c4335636fd85c241
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 13 14:40:43 2021 +1100

    Only call dh_set_moduli_file if using OpenSSL.
    
    Fixes link failure when configuring --without-openssl since dh.c is not
    linked in.

commit 867a7dcf003c51d5a83f83565771a35f0d9530ac
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 13 13:52:53 2021 +1100

    Don't install moduli during tests.
    
    Now that we have TEST_SSH_MODULI_FILE pointing to the moduli in the
    soure directory we don't need to install the file to prevent warnings
    about it being missing.

commit 0c054538fccf92b4a028008321d3711107bee6d5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 13 13:51:26 2021 +1100

    Point TEST_SSH_MODULI_FILE at our own moduli.
    
    This will allow the test to run without requiring a moduli file
    installed at the configured default path.

commit 4d48219c72ab0c71238806f057f0e9630b7dd25c
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Fri Mar 12 05:18:01 2021 +0000

    upstream: spelling
    
    OpenBSD-Commit-ID: 478bc3db04f62f1048ed6e1765400f3ab325e60f

commit 88057eb6df912abf2678ea5c846d9d9cbc92752c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 12 04:08:19 2021 +0000

    upstream: Add ModuliFile keyword to sshd_config to specify the
    
    location of the "moduli" file containing the groups for DH-GEX.  This will
    allow us to run tests against arbitrary moduli files without having to
    install them. ok djm@
    
    OpenBSD-Commit-ID: 8df99d60b14ecaaa28f3469d01fc7f56bff49f66

commit f07519a2af96109325b5a48b1af18b57601074ca
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 12 03:43:40 2021 +0000

    upstream: pwcopy() struct passwd that we're going to reuse across a
    
    bunch of library calls; bz3273 ok dtucker@
    
    OpenBSD-Commit-ID: b6eafa977b2e44607b1b121f5de855107809b762

commit 69d6d4b0c8a88d3d1288415605f36e2df61a2f12
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Mar 10 06:32:27 2021 +0000

    upstream: Import regenerated moduli file.
    
    OpenBSD-Commit-ID: 7ac6c252d2a5be8fbad4c66d9d35db507c9dac5b

commit e5895e8ecfac65086ea6b34d0d168409a66a15e1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 10 04:58:45 2021 +0000

    upstream: no need to reset buffer after send_msg() as that is done
    
    for us; patch from Mike Frysinger
    
    OpenBSD-Commit-ID: 565516495ff8362a38231e0f1a087b8ae66da59c

commit 721948e67488767df0fa0db71ff2578ee2bb9210
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Mar 13 01:52:16 2021 +0000

    upstream: Add TEST_SSH_MODULI_FILE variable to allow overriding of the
    
    moduli file used during the test run.
    
    OpenBSD-Regress-ID: be10f785263120edb64fc87db0e0d6570a10220a

commit 82fef71e20ffef425b932bec26f5bc46aa1ed41c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Mar 12 15:58:57 2021 +1100

    Allow (but return EACCES) fstatat64 in sandbox.
    
    This is apparently used in some configurations of OpenSSL when glibc
    has getrandom().  bz#3276, patch from Kris Karas, ok djm@

commit 1cd67ee15ce3d192ab51be22bc4872a6a7a4b6d9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Mar 12 13:16:10 2021 +1100

    Move generic includes outside of ifdef.
    
    This ensures that the macros in log.h are defined in the case where
    either of --with-solaris-projects or --with-solaris-privs are used
    without --with-solaris-contracts.  bz#3278.

commit 2421a567a8862fe5102a4e7d60003ebffd1313dd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Mar 10 17:41:21 2021 +1100

    Import regenerated moduli file.

commit e99080c05d9d48dbbdb022538533d53ae1bd567d
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Sat Mar 6 20:36:31 2021 +0000

    upstream: Fix PRINT macro, the suffix param to sshlog() was missing.
    
    Also remove redundant __func__ prefix from PRINT calls as the macro already
    adds __FILE__, __func__ and __LINE__.  From Christos Zoulas. OK dtucker@
    
    OpenBSD-Commit-ID: 01fdfa9c5541151b5461d9d7d6ca186a3413d949

commit 160db17fc678ceb5e3fd4a7e006cc73866f484aa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 3 22:41:49 2021 +0000

    upstream: don't sshbuf_get_u32() into an enum; reported by goetze
    
    AT dovetail.com via bz3269
    
    OpenBSD-Commit-ID: 99a30a8f1df9bd72be54e21eee5c56a0f050921a

commit cffd033817a5aa388764b6661855dcdaabab0588
Author: sthen@openbsd.org <sthen@openbsd.org>
Date:   Wed Mar 3 21:40:16 2021 +0000

    upstream: typo in other_hostkeys_message() display output, ok djm
    
    OpenBSD-Commit-ID: 276f58afc97b6f5826e0be58380b737603dbf5f5

commit 7fe141b96b13bd7dc67ca985e14d55b9bd8a03fd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 3 08:42:52 2021 +0000

    upstream: needs FILE*; from Mike Frysinger
    
    OpenBSD-Commit-ID: dddb3aa9cb5792eeeaa37a1af67b5a3f25ded41d

commit d2afd717e62d76bb41ab5f3ab4ce6f885c8edc98
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 2 21:31:47 2021 +1100

    update depend

commit f0c4eddf7cf224ebcac1f07ac8afdb30c6e9fe0a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 2 21:30:14 2021 +1100

    update relnotes URL

commit 67a8bb7fe62a381634db4c261720092e7d514a3d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 2 21:29:54 2021 +1100

    update RPM spec version numbers

commit 0a4b23b11b9a4e6eec332dd5c6ab2ac6f62aa164
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 2 01:48:18 2021 +0000

    upstream: openssh-8.5
    
    OpenBSD-Commit-ID: 185e85d60fe042b8f8fa1ef29d4ef637bdf397d6

commit de3866383b6720ad4cad83be76fe4c8aa111a249
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 1 21:13:24 2021 +1100

    Only upload config logs if configure fails.

commit 85ff2a564ce838f8690050081176c1de1fb33116
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 28 22:56:30 2021 +0000

    upstream: Add %k to list of keywords. From
    
    =?UTF-8?q?=20Eero=20H=C3=A4kkinenvia=20bz#3267?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: 9c87f39a048cee2a7d1c8bab951b2f716256865e

commit e774bac35933e71f924f4301786e7fb5bbe1422f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 28 01:50:47 2021 +0000

    upstream: Do not try to reset signal handler for signal 0 in
    
    subprocess. Prevents spurious debug message.  ok djm@
    
    OpenBSD-Commit-ID: 7f9785e292dcf304457566ad4637effd27ad1d46

commit 351c5dbbd74ce300c4f058112f9731c867c6e225
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 27 23:42:37 2021 +0000

    upstream: fix alphabetic ordering of options; spotted by Iain Morgan
    
    OpenBSD-Commit-ID: f955fec617d74af0feb5b275831a9fee813d7ad5

commit 0d1c9dbe578597f8d45d3ac7690df10d32d743e5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 27 12:25:25 2021 +1100

    zlib is now optional.

commit b7c6ee7b437d9adfd19ef49d6c0f19f13f26f9b3
Author: Jeffrey H. Johnson <61629094+johnsonjh@users.noreply.github.com>
Date:   Sat Feb 27 01:04:58 2021 +0000

    Fix punctuatio and typo in README.md.
    
    Some very minor fixes, missing 's' and punctuation.

commit 6248b86074804983e8f7a2058856a516dbfe2924
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 26 16:45:50 2021 +1100

    Revert "ssh: optional bind interface if bind address specified."
    
    This reverts commit 5a878a71a3528c2626aa1d331934fd964782d41c.
    
    Apologies - I accidentally pushed this.

commit 493339a940b13be6071629c3c2dd5a3b6fc17023
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 26 15:45:38 2021 +1100

    detech BSD libc hash functions in libbsd / libmd
    
    Some Linux distributions are shipping the BSD-style hashing functions
    (e.g. SHA256Update) in libbsd and/or libmd. Detect this situation to
    avoid header/replacement clashes later. ok dtucker@

commit 5a878a71a3528c2626aa1d331934fd964782d41c
Author: Dmitrii Turlupov <dturlupov@factor-ts.ru>
Date:   Thu Feb 4 16:27:31 2021 +0300

    ssh: optional bind interface if bind address specified.
    
    Allows the -b and -B options to be used together.
    For example, when the interface is in the VRF.

commit 1fe4d70df94d3bcc2b35fd57cad6b5fc4b2d7b16
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 26 04:18:42 2021 +0000

    upstream: remove this KEX fuzzer; it's awkward to use and doesn't play
    
    nice with popular fuzzing drivers like libfuzzer. AFAIK nobody has used it
    but me.
    
    OpenBSD-Regress-ID: cad919522b3ce90c147c95abaf81b0492ac296c9

commit 24a3a67bd7421740d08803b84bd784e764107928
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 26 11:49:19 2021 +1100

    Remove macos-11.00 PAM test target too.
    
    These are failing apparently due to some kind of infrastructure problem,
    making it look like every commit is busted.

commit 473201783f732ca8b0ec528b56aa55fa0d8cf717
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 26 00:16:58 2021 +0000

    upstream: a bit more debugging behind #ifdef DEBUG_SK
    
    OpenBSD-Commit-ID: d9fbce14945721061cb322f0084c2165d33d1993

commit fd9fa76a344118fe1ef10b9a6c9e85d39599e9a8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 26 01:15:10 2021 +1100

    Remove macos-11.0 from the test target list.
    
    It has been consistently failing for the past few days with a github
    actions internal error.

commit 476ac8e9d33dbf96ef97aab812b8d7089d0cdc24
Author: Philip Hands <phil@hands.com>
Date:   Wed Feb 24 23:43:16 2021 +0100

    tidy the $INSTALLKEY_SH code layout a little
    
    SSH-Copy-ID-Upstream: 78178aa5017222773e4c23d9001391eeaeca8983

commit 983e05ef3b81329d76d6a802b39ad0d1f637c06c
Author: Jakub Jelen <jjelen@redhat.com>
Date:   Tue Sep 29 10:02:45 2020 +0000

    if unable to add a missing newline, fail
    
    SSH-Copy-ID-Upstream: 76b25e18f55499ea9edb4c4d6dc4a80bebc36d95

commit 3594b3b015f6014591da88ba71bf6ff010be7411
Author: Philip Hands <phil@hands.com>
Date:   Tue Oct 13 14:12:58 2020 +0200

    use $AUTH_KEY_DIR, now that we have it
    
    since that was a change made since jjelen's commit was written
    
    also, quote the variables
    
    SSH-Copy-ID-Upstream: 588cd8e5cbf95f3443d92b9ab27c5d73ceaf6616

commit 333e25f7bc43cee6e36f766e39dad6f9918b318c
Author: Jakub Jelen <jjelen@redhat.com>
Date:   Tue Sep 29 10:00:01 2020 +0000

    restorecon the correct directory
    
    if using different path for authorized_keys file
    
    SSH-Copy-ID-Upstream: 791a3df47b48412c726bff6f7b1d190721e65d51

commit 9beeab8a37a49a9e3ffb1972fff6621ee5bd7a71
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 25 03:27:34 2021 +0000

    upstream: s/PubkeyAcceptedKeyTypes/PubkeyAcceptedAlgorithms/
    
    OpenBSD-Regress-ID: 3dbc005fa29f69dc23d97e433b6dffed6fe7cb69

commit 2dd9870c16ddbd83740adeead5030d6840288c8f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Feb 24 23:12:35 2021 +0000

    upstream: Rename pubkeyacceptedkeytypes to pubkeyacceptedalgorithms in
    
    test to match change to config-dump output.
    
    OpenBSD-Regress-ID: 74c9a4ad50306be873d032819d5e55c24eb74d5d

commit b9225c3a1c3f5827e31d5d64a71b8e0504a25619
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Feb 24 01:18:08 2021 +0000

    upstream: Put obsolete aliases for hostbasedalgorithms and
    
    pubkeyacceptedalgorithms after their current names so that the config-dump
    mode finds and uses the current names.  Spotted by Phil Pennock.
    
    OpenBSD-Commit-ID: 5dd10e93cccfaff3aaaa09060c917adff04a9b15

commit 8b8b60542d6652b2c91e0ef9e9cc81bcb65e6b42
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 23 21:55:08 2021 +0000

    upstream: lots more s/key types/signature algorithms/ mostly in
    
    HostbasedAcceptedAlgorithms and HostKeyAlgorithms; prompted by Jakub Jelen
    
    OpenBSD-Commit-ID: 3f719de4385b1a89e4323b2549c66aae050129cb

commit 0aeb508aaabc4818970c90831e3d21843c3c6d09
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 23 21:50:18 2021 +0000

    upstream: Correct reference to signature algorithms as keys; from
    
    Jakub Jelen
    
    OpenBSD-Commit-ID: 36f7ecee86fc811aa0f8e21e7a872eee044b4be5

commit f186a020f2ba5f9c462a23293750e29ba0a746b1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 23 16:05:22 2021 +1100

    Add a couple more test VMs.

commit ffcdd3d90e74176b3bb22937ad1f65a6c1cd3f9d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 22 08:09:27 2021 +1100

    Valgrind test: split and move up list.
    
    Since the valgrind test takes so long it approaches the limit allowed by
    github, move it to the head of the list so it's the first one started and
    split the longest tests out into a second instance that runs concurrently
    with the first.

commit c3b1636770785cc2830dedd0f22ef7d3d3491d6d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 23 00:05:31 2021 +0000

    upstream: warn when the user specifies a ForwardAgent path that does
    
    not exist and exit if ExitOnForwardFailure is set; bz3264
    
    OpenBSD-Commit-ID: 72f7875865e723e464c71bf8692e83110699bf26

commit 5fcb0514949d61aadaf4a89cf16eb78fb47491ec
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 20 13:34:02 2021 +1100

    Disable rlimit sandbox, doesn't work with valgrind
    
    Only run regress tests, runing unit tests as well makes it run longer
    than allowed y github.

commit bb0b9bf45396c19486080d3eb0a159f94de7e6ba
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 20 13:06:25 2021 +1100

    Upload valgrind logs on failure.

commit ebb3b75e974cb241c6b9b9f5881b09c7bd32b651
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 19 22:18:50 2021 +1100

    Rename "vm" to "os" in selfhosted to match c-cpp.
    
    Should make it easier to share code or maybe merge at some point.

commit 76c0be0fe0465cb2b975dbd409f8d38b55e55bcb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 19 22:15:22 2021 +1100

    Upload regress failure logs in c-cpp too.

commit 8751b6c3136f5225c40f41bbf29aa29e15795f6e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 19 22:13:36 2021 +1100

    Comment out Solaris 64bit PAM build...
    
    until I can figure out why it's failing.

commit e9f6d563c06886b277c6b9abafa99fa80726dc48
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 19 10:20:17 2021 +1100

    Actually run Valgrind tests.

commit 41d232e226624f1a81c17091c36b44c9010aae62
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 19 10:16:56 2021 +1100

    Add test against Valgrind.

commit e6528d91f12fba05f0ea64224091c9d0f38bdf1d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 18 16:30:01 2021 +1100

    Add fbsd12 test target.

commit 6506cb2798d98ff03a7cc06567c392a81f540680
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 18 15:21:13 2021 +1100

    Remove unused arg.

commit 93c31a623973b0fad508214593aab6ca94b11dcb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 18 14:54:07 2021 +1100

    Add DEBUG_SK to kitchensink builds.

commit 65085740d3574eeb3289d592f042df62c2689bb0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 18 14:53:14 2021 +1100

    Add bbone test target (arm32).

commit 63238f5aed66148b8d6ca7bd5fb347d624200155
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 18 02:49:35 2021 +0000

    upstream: Fix the hostkeys rotation extension documentation
    
    The documentation was lacking the needed want-reply field in the initial
    global request.
    
    https://github.com/openssh/openssh-portable/pull/218 by dbussink
    
    OpenBSD-Commit-ID: 051824fd78edf6d647a0b9ac011bf88e28775054

commit 34c5ef6e2d06d9f0e20cb04a9aebf67a6f96609a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 18 02:15:07 2021 +0000

    upstream: make names in function prototypes match those in
    
    definition from https://github.com/openssh/openssh-portable/pull/225 by
    ZenithalHourlyRate
    
    OpenBSD-Commit-ID: 7c736307bf3f2c7cb24d6f82f244eee959485acd

commit 88e3d4de31ab4f14cac658e9e0c512043b15b146
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 18 02:13:58 2021 +0000

    upstream: unbreak SK_DEBUG builds
    
    from https://github.com/openssh/openssh-portable/pull/225 by
    ZenithalHourlyRate
    
    OpenBSD-Commit-ID: 28d7259ce1b04d025411464decfa2f1a097b43eb

commit 788cbc5b74a53956ba9fff11e1ca506271a3597f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 18 00:30:17 2021 +0000

    upstream: sftp-server: implement limits@openssh.com extension
    
    This is a simple extension that allows the server to clearly
    communicate transfer limits it is imposing so the client doesn't
    have to guess, or force the user to manually tune.  This is
    particularly useful when an attempt to use too large of a value
    causes the server to abort the connection.
    
    Patch from Mike Frysinger; ok dtucker@
    
    OpenBSD-Commit-ID: f96293221e5aa24102d9bf30e4f4ef04d5f4fb51

commit 324449a68d510720d0e4dfcc8e9e5a702fe6a48f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 18 12:06:25 2021 +1100

    support OpenSSL 3.x cipher IV API change
    
    OpenSSL renamed the "get current CIPHER_CTX" IV operation in 3.x.
    This uses the new name if available.
    
    https://github.com/openssl/openssl/issues/13411
    
    bz#3238 ok dtucker@

commit 845fe9811c047063d935eca89188ed55c993626b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 18 11:25:38 2021 +1100

    prefer login_getpwclass() to login_getclass()
    
    FreeBSD has login_getpwclass() that does some special magic for
    UID=0. Prefer this to login_getclass() as its easier to emulate
    the former with the latter.
    
    Based on FreeBSD PR 37416 via Ed Maste; ok dtucker@

commit d0763c8d566119cce84d9806e419badf20444b02
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 18 10:45:27 2021 +1100

    Fixing quoting for installing moduli on target guest.

commit b3afc243bc820f323a09e3218e9ec8a30a3c1933
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 18 10:27:16 2021 +1100

    Install moduli on target not host.

commit f060c2bc85d59d111fa18a12eb3872ee4b9f7e97
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 18 10:33:58 2021 +1100

    don't free string returned by login_getcapstr(3)
    
    OpenBSD and NetBSD require the caller to free strings returned
    bu the login_* functions, but FreeBSD requires that callers don't.
    
    Fortunately in this case, we can harmlessly leak as the process is
    about to exec the shell/command.
    
    From https://reviews.freebsd.org/D28617 via Ed Maste; ok dtucker@

commit bc9b0c25703215501da28aa7a6539f96c0fa656f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 18 10:10:00 2021 +1100

    Skip unit tests on sol11 to speed things up.

commit 161873035c12cc22211fc73d07170ade47746bc5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 18 10:09:27 2021 +1100

    Remove SKIP_UNIT as it needs to be a make arg.

commit 1c293868e4b4e8e74e3ea15b8dff90f6b089967a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 18 10:05:03 2021 +1100

    Always intall moduli.
    
    Allows us to run tests without falling back to a fixed modulus.  Ensure that
    the directory exists.

commit 5c8f41ad100601ec2fdcbccdfe92890c31f81bbe
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 18 09:59:09 2021 +1100

    Quote SSHD_CONFOPTS in case it contains spaces.

commit 4653116c1f5384ea7006e6396d9b53c33d218975
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 18 09:51:18 2021 +1100

    Fix labels on targets (dots vs underscores).

commit 4512047f57ca3c6e8cd68f0cc69be59e98b25287
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 17 21:47:48 2021 +1100

    More compact representation of config matrix.

commit 0406cd09f05c2e419b113dd4c0eac8bc34ec915b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 17 21:19:18 2021 +1100

    Skip unit tests on hosted VMs to speed things up.

commit 4582612e6147d766c336198c498740242fb8f1ec
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 17 20:21:29 2021 +1100

    Merge macos and ubuntu tests.

commit 09f4b84654b71099559492e9aed5e1a38bf24815
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 17 18:41:30 2021 +1100

    Convert most github hosted tests to new config structure.

commit 65380ff7e054be1454e5ab4fd7bb9c66f8fcbaa9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 17 18:27:36 2021 +1100

    Only run selfhosted tests from selfhosted repo.

commit f031366535650b88248ed7dbf23033afdf466240
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jan 15 14:11:43 2021 +1100

    Add self-hosted runners for VMs of other platforms.
    
    Github only hosts a limited number of platforms, and the runner code
    is only supported on slightly wider range of platforms.  To increase
    our test coverage beyond that, we run the runner natively on a VM host,
    where it runs a jobs that boot VMs of other platforms, waits for them
    to come up then runs the build and test by ssh'ing into the guest.
    This means that the minimum dependencies for the guests are quite low
    (basically just sshd, a compiler and make).
    
    The interface to the VM host is fairly simple (basically 3 scripts:
    vmstartup, vmrun and vmshutdown), but those are specific to the VM host
    so are not in the public repo.  We also mount the working directory on the
    host via sshfs, so things like artifact upload by the runner also work.
    
    As part of this we are moving the per-test-target configs into a single
    place (.github/configs) where there will be referenced by a single short
    "config" key.  I plan to make the github-hosted runners use this too.
    
    The self-hosted runners are run off a private repo on github since that
    prevents third parties from accessing them[0], and since runner quota is
    limited on private repos, we avoid running the tests we run on the public
    repo.
    
    [0] https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories

commit 64bbd7444d658ef7ee14a7ea5ccc7f5810279ee7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Feb 17 03:59:00 2021 +0000

    upstream: Make sure puttygen is new enough to successfully run the
    
    PuTTY interop tests, otherwise skip them.
    
    OpenBSD-Regress-ID: 34565bb50b8aec58331ed02a5e9e0a9a929bef51

commit da0a9afcc446a30ca49dd216612c41ac3cb1f2d4
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Feb 15 20:43:15 2021 +0000

    upstream: ssh: add PermitRemoteOpen for remote dynamic forwarding
    
    with SOCKS ok djm@, dtucker@
    
    OpenBSD-Commit-ID: 64fe7b6360acc4ea56aa61b66498b5ecc0a96a7c

commit b696858a7f9db72a83d02cb6edaca4b30a91b386
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Feb 15 20:36:35 2021 +0000

    upstream: factor out opt_array_append; ok djm@
    
    OpenBSD-Commit-ID: 571bc5dd35f99c5cf9de6aaeac428b168218e74a

commit ad74fc127cc45567e170e8c6dfa2cfd9767324ec
Author: dlg@openbsd.org <dlg@openbsd.org>
Date:   Mon Feb 15 11:09:22 2021 +0000

    upstream: ProxyJump takes "none" to disable processing like
    
    ProxyCommand does
    
    ok djm@ jmc@
    
    OpenBSD-Commit-ID: 941a2399da2193356bdc30b879d6e1692f18b6d3

commit 16eacdb016ccf38dd9959c78edd3a6282513aa53
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 12 03:49:09 2021 +0000

    upstream: sftp: add missing lsetstat@openssh.com documentation
    
    patch from Mike Frysinger
    
    OpenBSD-Commit-ID: 9c114db88d505864075bfe7888b7c8745549715b

commit e04fd6dde16de1cdc5a4d9946397ff60d96568db
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 12 03:14:18 2021 +0000

    upstream: factor SSH_AGENT_CONSTRAIN_EXTENSION parsing into its own
    
    function and remove an unused variable; ok dtucker@
    
    OpenBSD-Commit-ID: e1a938657fbf7ef0ba5e73b30365734a0cc96559

commit 1bb130ed34721d46452529d094d9bbf045607d79
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 11 10:18:05 2021 +1100

    Add __NR_futex_time64 to seccomp sandbox.
    
    This is apparently needed for (some) 32 bit platforms with glibc 2.33.
    Patch from nix at esperi.org.uk and jjelen at redhat.com via bz#3260.

commit f88a7a431212a16e572ecabd559e632f369c363e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 6 09:37:01 2021 +1100

    Add a hostname function for systems that don't have it.
    
    Some systems don't have a hostname command (it's not required by POSIX).
    The do have uname -n (which is), but as found by tim@ some others (eg
    UnixWare) do not report the FQDN from uname -n.

commit 5e385a71ef2317856f37c91a98658eb12eb5a89c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 5 22:03:40 2021 +0000

    upstream: Roll back the hostname->uname change in rev 1.10. It turns
    
    out uname -n doesn't do what we need for some platforms in portable, so we'll
    fix the original problem (that some other platforms don't have hostname at
    all) by providing wrapper function to implement it.
    
    OpenBSD-Regress-ID: 827a707d6201d5a8e196a8c28aec1d2c76c52341

commit b446c214279de50ed8388e54897eb1be5281c894
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 5 06:01:58 2021 +0000

    upstream: hostname is not specified by POSIX but uname -n is, so use
    
    the latter for portability.  Patch from Geert Hendrickx via github PR#208.
    
    OpenBSD-Regress-ID: d6a79c7c4d141a0d05ade4a042eb57dddbce89f3

commit 1cb6ce98d658e5fbdae025a3bd65793980e3b5d9
Author: David Carlier <devnexen@gmail.com>
Date:   Sat Nov 21 12:22:23 2020 +0000

    Using explicit_memset for the explicit_bzero compatibility layer.
    
    Favoriting the native implementation in this case.

commit 2e0beff67def2120f4b051b1016d7fbf84823e78
Author: Luca Weiss <luca@z3ntu.xyz>
Date:   Sun Nov 8 14:19:23 2020 +0100

    Deny (non-fatal) statx in preauth privsep child.

commit a35d3e911e193a652bd09eed40907e3e165b0a7b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 5 02:20:23 2021 +0000

    upstream: Remove debug message from sigchld handler. While this
    
    works on OpenBSD it can cause problems on other platforms.  From kircherlike
    at outlook.com via bz#3259, ok djm@
    
    OpenBSD-Commit-ID: 3e241d7ac1ee77e3de3651780b5dc47b283a7668

commit 69338ab46afe9e3dfb7762ad65351d854077c998
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 2 22:36:59 2021 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: 544bb092e03fcbecb420196cd0f70af13ea868ad

commit f71219a01d8f71c4b3ed7e456337a84ddba1653e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 2 22:36:46 2021 +0000

    upstream: fix memleaks in private key deserialisation; enforce more
    
    consistency between redundant fields in private key certificate and private
    key body; ok markus@
    
    OpenBSD-Commit-ID: dec344e414d47f0a7adc13aecf3760fe58101240

commit 3287790e78bf5b53c4a3cafb67bb5aa03e3910f0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 2 22:35:14 2021 +0000

    upstream: memleak on error path; ok markus@
    
    OpenBSD-Commit-ID: 2091a36d6ca3980c81891a6c4bdc544e63cb13a8

commit 3dd0c64e08f1bba21d71996d635c7256c8c139d1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 31 22:55:29 2021 +0000

    upstream: more strictly enforce KEX state-machine by banning packet
    
    types once they are received. Fixes memleak caused by duplicate
    SSH2_MSG_KEX_DH_GEX_REQUEST (spotted by portable OpenSSH kex_fuzz via
    oss-fuzz #30078).
    
    ok markus@
    
    OpenBSD-Commit-ID: 87331c715c095b587d5c88724694cdeb701c9def

commit 7a92a324a2e351fabd0ba8ef9b434d3b12d54ee3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jan 31 10:50:10 2021 +0000

    upstream: Set linesize returned by getline to zero when freeing and
    
    NULLing the returned string.  OpenBSD's getline handles this just fine, but
    some implementations used by -portable do not.  ok djm@
    
    OpenBSD-Commit-ID: 4d7bd5169d3397654247db9655cc69a9908d165c

commit a5dfc5bae8c16e2a7caf564758d812c7672480b5
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 30 16:32:29 2021 +1100

    allow a fuzz case to contain more than one request
    
    loop until input buffer empty, no message consumed or 256 messages
    processed

commit 0ef24ad60204022f7e33b6e9d171172c50514132
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 30 16:28:23 2021 +1100

    expect fuzz cases to have length prefix
    
    might make life a little easier for the fuzzer, e.g. it can now
    produce valid (multi-request) messages by smashing two cases together.

commit de613f2713d2dfcd3b03c00e5558a40997f52712
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 30 12:03:30 2021 +1100

    ssh-agent fuzzer

commit 7e96c877bcb2fb645355a687b8cb7347987c1c58
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 30 12:02:46 2021 +1100

    move keys out of kex_fuzz.cc into separate header
    
    add certificates and missing key types

commit 76f46d75664fdaa1112739ca523ff85ee4eb52b4
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 30 12:02:10 2021 +1100

    some fixed test data (mostly keys) for fuzzing

commit 7c2e3d6de1f2edb0c8b4725b4c2b56360e032b19
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 30 00:56:38 2021 +0000

    upstream: add a SK_DUMMY_INTEGRATE define that allows the dummy
    
    security key middleware to be directly linked; useful for writing fuzzers,
    etc.
    
    OpenBSD-Regress-ID: 0ebd00159b58ebd85e61d8270fc02f1e45df1544

commit 1a4b92758690faa12f49079dd3b72567f909466d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 29 06:29:46 2021 +0000

    upstream: fix the values of enum sock_type
    
    OpenBSD-Commit-ID: 18d048f4dbfbb159ff500cfc2700b8fb1407facd

commit 8afaa7d7918419d3da6c0477b83db2159879cb33
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 29 06:28:10 2021 +0000

    upstream: give typedef'd struct a struct name; makes the fuzzer I'm
    
    writing a bit easier
    
    OpenBSD-Commit-ID: 1052ab521505a4d8384d67acb3974ef81b8896cb

commit 1e660115f0c7c4a750cd31e468ff889f33dd8088
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 29 11:09:14 2021 +1100

    fuzz diffie-hellman-group-exchange-sha1 kex too

commit be5f0048ea2aaeddd27be7dcca23aaad345fa16c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 29 11:03:35 2021 +1100

    support for running kex fuzzer with null cipher

commit 3d59e88c0e42182c3749b446ccd9027933c84be4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 28 20:55:16 2021 +1100

    make with -j2 to use available CPUs.

commit 66dd9ddb5d2ea8c407908c8e8468c9d6e71db05b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 28 14:31:01 2021 +1100

    Add test against openssl head and libressl head.

commit 237dbb34e24b6b7ea888d54bda4d17da0a0fd0fa
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 28 14:30:50 2021 +1100

    Remove whitespace.

commit d983e1732b8135d7ee8d92290d6dce35f736ab88
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 27 23:49:46 2021 +0000

    upstream: fix leak: was double allocating kex->session_id buffer
    
    OpenBSD-Commit-ID: 3765f4cc3ae1df874dba9102a3588ba7b48b8183

commit 1134a48cdcef8e7363b9f6c73ebdd24405066738
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 28 08:57:31 2021 +1100

    correct kex name in disabled code

commit 67f47f1965abafc1830a287761125c2f4790857e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 27 10:15:08 2021 +0000

    upstream: this needs kex.h now
    
    OpenBSD-Commit-ID: c5a42166c5aa002197217421a971e48be7cb5d41

commit 39be3dc209f28f9c1ebfeba42adde8963b01e1cd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 27 10:05:28 2021 +0000

    upstream: make ssh->kex->session_id a sshbuf instead of u_char*/size_t
    
    and use that instead of global variables containing copies of it. feedback/ok
    markus@
    
    OpenBSD-Commit-ID: a4b1b1ca4afd2e37cb9f64f737b30a6a7f96af68

commit 4ca6a1fac328477c642329676d6469dba59019a3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 27 09:26:53 2021 +0000

    upstream: remove global variable used to stash compat flags and use the
    
    purpose-built ssh->compat variable instead; feedback/ok markus@
    
    OpenBSD-Commit-ID: 7c4f200e112dae6bcf99f5bae1a5629288378a06

commit bba229b6f3328171f5e3ae85de443002523c0452
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jan 27 12:34:07 2021 +1100

    Install moduli file before tests.
    
    Reduces warnings during test runs.

commit 1b83185593a90a73860a503d753a95ca6d726c00
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jan 27 11:58:26 2021 +1100

    Run one test with -Werror to catch warnings.

commit d1532d90074b212054d5fd965f833231b09982f5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jan 27 00:37:26 2021 +0000

    upstream: Logical not bitwise or. ok djm@
    
    OpenBSD-Commit-ID: d4dc855cf04951b93c45caa383e1ac9af0a3b0e5

commit 507b448a2465a53ab03a88acbc71cc51b48ca6ac
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Tue Jan 26 15:40:17 2021 +0000

    upstream: move HostbasedAcceptedAlgorithms to the right place in
    
    alphabetical order
    
    OpenBSD-Commit-ID: d766820d33dd874d944c14b0638239adb522c7ec

commit e26c980778b228bdd42b8353cc70101cf49b731b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jan 26 11:25:01 2021 +0000

    upstream: Remove unused variables leftover from refactoring. ok
    
    djm@
    
    OpenBSD-Commit-ID: 8b3ad58bff828fcf874e54b2fc27a4cf1d9505e8

commit e9f78d6b06fc323bba1890b2dc3b8423138fb35c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jan 26 05:32:21 2021 +0000

    upstream: Rename HostbasedKeyTypes (ssh) and
    
    HostbasedAcceptedKeyTypes (sshd) to HostbasedAcceptedAlgorithms, which more
    accurately reflects its effect. This matches a previous change to
    PubkeyAcceptedAlgorithms.  The previous names are retained as aliases.  ok
    djm@
    
    OpenBSD-Commit-ID: 49451c382adc6e69d3fa0e0663eeef2daa4b199e

commit 48d0d7a4dd31154c4208ec39029d60646192f978
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jan 26 14:48:07 2021 +1100

    Disable sntrup761 if compiler doesn't support VLAs.
    
    The sntrup761 code sourced from supercop uses variable length
    arrays.  Although widely supported, they are not part of the ANSI
    C89 spec so if the compiler does not support VLAs, disable the
    sntrup761x25519-sha512@openssh.com KEX method by replacing the kex
    functions with no-op ones similar to what we do in kexecdh.c.
    
    This should allow OpenSSH to build with a plain C89 compiler again.
    Spotted by tim@, ok djm@.

commit 37c70ea8d4f3664a88141bcdf0bf7a16bd5fd1ac
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 26 00:54:49 2021 +0000

    upstream: refactor key constraint parsing in ssh-agent
    
    Key constraints parsing code previously existed in both the "add regular
    key" and "add smartcard key" path. This unifies them but also introduces
    more consistency checking: duplicated constraints and constraints that
    are nonsensical for a particular situation (e.g. FIDO provider for a
    smartcard key) are now banned.
    
    ok markus@
    
    OpenBSD-Commit-ID: 511cb1b1c021ee1d51a4c2d649b937445de7983c

commit e0e8bee8024fa9e31974244d14f03d799e5c0775
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 26 00:53:31 2021 +0000

    upstream: more ssh-agent refactoring
    
    Allow confirm_key() to accept an additional reason suffix
    
    Factor publickey userauth parsing out into its own function and allow
    it to optionally return things it parsed out of the message to its
    caller.
    
    feedback/ok markus@
    
    OpenBSD-Commit-ID: 29006515617d1aa2d8b85cd2bf667e849146477e

commit dfe18a295542c169ffde8533b3d7fe42088e2de7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 26 00:51:30 2021 +0000

    upstream: make struct hostkeys public; I have no idea why I made it
    
    opaque originally.
    
    ok markus@
    
    OpenBSD-Commit-ID: e50780b34d4bbe628d69b2405b024dd749d982f3

commit 3b44f2513cae89c920e8fe927b9bc910a1c8c65a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 26 00:49:30 2021 +0000

    upstream: move check_host_cert() from sshconnect,c to sshkey.c and
    
    refactor it to make it more generally usable and testable.
    
    ok markus@
    
    OpenBSD-Commit-ID: 536f489f5ff38808c1fa711ba58d4579b636f9e4

commit 1fe16fd61bb53944ec510882acc0491abd66ff76
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 26 00:47:47 2021 +0000

    upstream: use recallocarray to allocate the agent sockets table;
    
    also clear socket entries that are being marked as unused.
    
    spinkle in some debug2() spam to make it easier to watch an agent
    do its thing.
    
    ok markus
    
    OpenBSD-Commit-ID: 74582c8e82e96afea46f6c7b6813a429cbc75922

commit cb7b22ea20a01332c81c0ddcb3555ad50de9cce2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 26 00:46:17 2021 +0000

    upstream: factor out common code in the agent client
    
    Add a ssh_request_reply_decode() function that sends a message to
    the agent, reads and parses a success/failure reply.
    Use it for all requests that only expect success/failure
    
    ok markus@
    
    OpenBSD-Commit-ID: e0c1f4d5e6cfa525d62581e2b8de93be0cb85adb

commit d1e578afe7cd48140ad6e92a453f9b035363fd7f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 25 06:00:17 2021 +0000

    upstream: make ssh hostbased authentication send the signature
    
    algorithm in its SSH2_MSG_USERAUTH_REQUEST packets instead of the key type.
    This make HostbasedAcceptedAlgorithms do what it is supposed to - filter on
    signature algorithm and not key type.
    
    spotted with dtucker@ ok markus@
    
    OpenBSD-Commit-ID: 25bffe19f0326972f5728170f7da81d5f45c78c6

commit 95eca1e195a3b41baa1a725c2c5af8a09d885e4b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jan 23 18:26:05 2021 +1100

    ifdef new instance of sin6_scope_id
    
    Put inside HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID similar to
    existing instance.  Should fix error on UnixWare 7.

commit 6ffdcdda128045226dda7fbb3956407978028a1e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jan 18 11:43:34 2021 +0000

    upstream: Fix long->int for convtime tests here too. Spotted by
    
    tobhe@.
    
    OpenBSD-Regress-ID: a87094f5863312d00938afba771d25f788c849d0

commit b55b7565f15327d82ad7acbddafa90b658c5f0af
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 22 02:46:40 2021 +0000

    upstream: PubkeyAcceptedKeyTypes->PubkeyAcceptedAlgorithms
    
    here too.
    
    OpenBSD-Commit-ID: 3b64a640f8ce8c21d9314da9df7ce2420eefde3a

commit ee9c0da8035b3168e8e57c1dedc2d1b0daf00eec
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 22 02:44:58 2021 +0000

    upstream: Rename PubkeyAcceptedKeyTypes keyword to
    
    PubkeyAcceptedAlgorithms. While the two were originally equivalent, this
    actually specifies the signature algorithms that are accepted.  Some key
    types (eg RSA) can be used by multiple algorithms (eg ssh-rsa, rsa-sha2-512)
    so the old name is becoming increasingly misleading.  The old name is
    retained as an alias. Prompted by bz#3253, help & ok djm@, man page help jmc@
    
    OpenBSD-Commit-ID: 0346b2f73f54c43d4e001089759d149bfe402ca5

commit a8e798feabe36d02de292bcfd274712cae1d8d17
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 15 02:58:11 2021 +0000

    upstream: Change types in convtime() unit test to int to match change
    
    its new type. Add tests for boundary conditions and fix convtime to work up
    to INT_MAX. ok djm@
    
    OpenBSD-Regress-ID: ba2b81e9a3257fff204b020affe85b604a44f97e

commit 9bde1a420626da5007bf7ab499fa2159b9eddf72
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 15 04:31:25 2021 +0000

    upstream: Make output buffer larger to prevent potential truncation
    
    warnings from compilers not smart enough to know the strftime calls won't
    ever fully fill "to" and "from".  ok djm@
    
    OpenBSD-Commit-ID: 83733f1b01b82da88b9dd1769475952aff10bdd7

commit 02da325f10b214219eae2bb1bc2d3bf0c2f13f9f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 15 02:58:11 2021 +0000

    upstream: Change types in convtime() unit test to int to match
    
    change its new type. Add tests for boundary conditions and fix convtime to
    work up to INT_MAX. ok djm@
    
    OpenBSD-Commit-ID: 01dc0475f1484ac2f47facdfcf9221f9472145de

commit 5339ab369c225b40bc64d5ec3374f5c91b3ad609
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 15 02:32:41 2021 +0000

    upstream: In waitfd(), when poll returns early we are subtracting
    
    the elapsed time from the timeout each loop, so we only want to measure the
    elapsed time the poll() in that loop, not since the start of the function.
    Spotted by chris.xj.zhu at gmail.com, ok djm@
    
    OpenBSD-Commit-ID: 199df060978ee9aa89b8041a3dfaf1bf7ae8dd7a

commit a164862dfa863b54b7897f66e1dd75437f086c11
Author: rob@openbsd.org <rob@openbsd.org>
Date:   Thu Jan 14 19:45:06 2021 +0000

    upstream: Minor grammatical correction.
    
    OK jmc@
    
    OpenBSD-Commit-ID: de0fad0581e212b2750751e479b79c18ff8cac02

commit 8635e7df7e3a3fbb4a4f6cd5a7202883b2506087
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jan 13 18:00:57 2021 +1100

    Merge Mac OS X targets into a single config.

commit ac112ade990585c511048ed4edaf2d9fc92b61f0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jan 12 19:22:47 2021 +1100

    Add Mac OS X test targets.

commit 1050109b4b2884bf50fd1b3aa084c7fd0a42ae90
Author: anatasluo <luolongjuna@gmail.com>
Date:   Mon Jan 11 13:51:39 2021 +0000

    Remove duplicated declaration in fatal.c .

commit 7d0f8a3369579dfe398536eb4e3da7bc15da9599
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jan 11 04:48:22 2021 +0000

    upstream: Correct spelling of persourcenetblocksize in config-dump
    
    mode.
    
    OpenBSD-Commit-ID: ecdc49e2b6bde6b6b0e52163d621831f6ac7b13d

commit ba328bd7a6774f30daaf90b83f1933cc4afc866c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jan 9 12:31:46 2021 +0000

    upstream: Adjust kexfuzz to addr.c/addrmatch.c split.
    
    OpenBSD-Regress-ID: 1d8d23bb548078020be2fb52c4c643efb190f0eb

commit b08ef25552443e94c0857d5e3806dd019ccc55d7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jan 9 12:24:30 2021 +0000

    upstream: Update unittests for addr.c/addrmatch.c split.
    
    OpenBSD-Regress-ID: de2b415fb7af084a91c6ef147a90482d8f771eef

commit 6d30673fedec2d251f4962c526fd0451f70c4d97
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jan 11 02:12:57 2021 +0000

    upstream: Change convtime() from returning long to returning int.
    
    On platforms where sizeof(int) != sizeof(long), convtime could accept values
    >MAX_INT which subsequently truncate when stored in an int during config
    parsing.  bz#3250, ok djm@
    
    OpenBSD-Commit-ID: 8fc932683d6b4660d52f50911d62bd6639c5db31

commit 7a57adb8b07b2ad0aead4b2e09ee18edc04d0481
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Jan 9 12:51:12 2021 +0000

    upstream: add a comma to previous;
    
    OpenBSD-Commit-ID: 9139433701c0aa86a0d3a6c7afe10d1c9c2e0869

commit 3a923129534b007c2e24176a8655dec74eca9c46
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jan 9 12:10:02 2021 +0000

    upstream: Add PerSourceMaxStartups and PerSourceNetBlockSize
    
    options which provide more fine grained MaxStartups limits.  Man page help
    jmc@, feedback & ok djm@
    
    OpenBSD-Commit-ID: e2f68664e3d02c0895b35aa751c48a2af622047b

commit d9a2bc71693ea27461a78110005d5a2d8b0c6a50
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jan 9 11:58:50 2021 +0000

    upstream: Move address handling functions out into their own file
    
    in order to reuse them for per-source maxstartups limiting.  Supplement with
    some additional functions from djm's flowtools that we'll also need.  ok djm@
    (as part of a larger diff).
    
    OpenBSD-Commit-ID: e3e7d9ccc6c9b82e25cfef0ec83598e8e2327cbf

commit b744914fcb76d70761f1b667de95841b3fc80a56
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jan 9 00:36:05 2021 +1100

    Add test against Graphene hardened malloc.

commit 6cb52d5bf771f6769b630fce35a8e9b8e433044f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 8 04:49:13 2021 +0000

    upstream: make CheckHostIP default to 'no'. It doesn't provide any
    
    perceptible value and makes it much harder for hosts to change host keys,
    particularly ones that use IP-based load-balancing.
    
    ok dtucker@
    
    OpenBSD-Commit-ID: 0db98413e82074f78c7d46784b1286d08aee78f0

commit 309b642e1442961b5e57701f095bcd4acd2bfb5f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jan 8 15:50:41 2021 +1100

    Run tests with sudo for better coverage.

commit c336644351fa3c715a08b7a292e309e72792e71e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jan 8 14:26:32 2021 +1100

    Add Ubuntu 16.04 and 20.04 test targets.

commit 4c7af01f9dcc1606dec033e7665a042cb0d8ec52
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 8 02:57:24 2021 +0000

    upstream: If a signature operation on a FIDO key fails with a
    
    "incorrect PIN" reason and no PIN was initially requested from the user, then
    request a PIN and retry the operation.
    
    This smoothes over a few corner cases including FIDO devices that
    require PINs for all hosted credentials, biometric FIDO devices that
    fall back to requiring PIN when reading the biometric failed, devices
    that don't implement reading credProtect status for downloaded keys
    and probably a few more cases that I haven't though of yet.
    
    ok dtucker@
    
    OpenBSD-Commit-ID: 176db8518933d6a5bbf81a2e3cf62447158dc878

commit 64ddd0fe68c4a7acf99b78624f8af45e919cd317
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 8 02:44:14 2021 +0000

    upstream: don't try to use timespeccmp(3) directly as a qsort(3)
    
    comparison function - it returns 0/1 and not the -1/0/1 that qsort expectes.
    
    fixes sftp "ls -ltr" under some circumstances.
    
    Based on patch by Masahiro Matsuya via bz3248.
    
    OpenBSD-Commit-ID: 65b5e9f18bb0d10573868c3516de6e5170adb163

commit 599df78f3008cf78af21f8977be3e1dd085f8e2e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 8 02:33:13 2021 +0000

    upstream: Update the sntrup761 creation script and generated code:
    
    - remove unneeded header files and typedefs and rely on crypto_api.h  - add
    defines to map types used to the crypto_api ones instead of typedefs.  This
     prevents typedef name collisions in -portable.  - remove CRYPTO_NAMESPACE
    entirely instead of making it a no-op  - delete unused functions and make the
    remaining ones that aren't exported static.
    
    ok djm@
    
    OpenBSD-Commit-ID: 7b9d0cf3acd5a3c1091da8afe00c904d38cf5783

commit 16448ff529affda7e2a15ee7c3200793abde0759
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 8 02:19:24 2021 +0000

    upstream: mention that DisableForwarding is valid in a sshd_config
    
    Match block reported by Fredrik Eriksson in bz3239
    
    OpenBSD-Commit-ID: 3a71c3d84b597f5e43e4b40d5232797daf0993f6

commit 91bac5e95b1b0debf9b2b4f05c20dcfa96b368b9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jan 4 21:58:58 2021 +0000

    upstream: estructure sntrup761.sh to process all files in a single
    
    list, which will make it easier to reorder.  Re-inline int32_MINMAX.  ok
    tobhe@
    
    OpenBSD-Commit-ID: d145c6c19b08bb93c9e14bfaa7af589d90f144c0

commit 4d96a3ebab2224f17e639a15078e03be1ad3736d
Author: tobhe@openbsd.org <tobhe@openbsd.org>
Date:   Sun Jan 3 18:05:21 2021 +0000

    upstream: Prevent redefinition of `crypto_int32' error with gcc3.
    
    Fixes compilation on luna88k.
    
    Feedback millert@
    Found by and ok aoyama@
    
    OpenBSD-Commit-ID: f305ddfe575a26cc53431af3fde3f4aeebed9ba6

commit a23954eeb930ccc8a66a2710153730769dba31b6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jan 1 22:00:49 2021 +1100

    Undef int32 after sort routines.
    
    This prevents typedef'ing crypto_int32 twice, in sntrup761.c and
    crypto_api.h, which some compilers (at least some GCCs) don't accept.

commit 148b8a661c3f93e4b6d049ee902de3d521261fbc
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 31 12:47:22 2020 +1100

    fix: missing pieces of previous commit

commit 3d999be7b987c848feda718cfcfcdc005ddf670d
Author: tobhe@openbsd.org <tobhe@openbsd.org>
Date:   Wed Dec 30 14:13:28 2020 +0000

    upstream: Use int64_t for intermediate values in int32_MINMAX to
    
    prevent signed 32-bit integer overflow.
    
    Found by and ok djm@
    ok markus@
    
    OpenBSD-Commit-ID: 4f0704768e34cf45fdd792bac4011c6971881bb3

commit 5c1953bf98732da5a76c706714ac066dbfa015ac
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 29 12:40:54 2020 +1100

    adapt KEX fuzzer to PQ kex change

commit 659864fe81dbc57eeed3769c462679d83e026640
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 29 01:02:15 2020 +0000

    upstream: Adapt to replacement of
    
    sntrup4591761x25519-sha512@tinyssh.org with
    sntrup761x25519-sha512@openssh.com.
    
    Also test sntrup761x25519-sha512@openssh.com in unittests/kex
    
    OpenBSD-Regress-ID: cfa3506b2b077a9cac1877fb521efd2641b6030c

commit 2c71cec020219d69df84055c59eba5799a1233ec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 29 00:59:15 2020 +0000

    upstream: Update/replace the experimental post-quantim hybrid key
    
    exchange method based on Streamlined NTRU Prime (coupled with X25519).
    
    The previous sntrup4591761x25519-sha512@tinyssh.org method is
    replaced with sntrup761x25519-sha512@openssh.com. Per the authors,
    sntrup4591761 was replaced almost two years ago by sntrup761.
    
    The sntrup761 implementaion, like sntrup4591761 before it, is public
    domain code extracted from the SUPERCOP cryptography benchmark
    suite (https://bench.cr.yp.to/supercop.html).
    
    Thanks for Daniel J Bernstein for guidance on algorithm selection.
    Patch from Tobias Heider; feedback & ok markus@ and myself
    
    (note this both the updated method and the one that it replaced are
    disabled by default)
    
    OpenBSD-Commit-ID: 2bf582b772d81ee24e911bb6f4b2aecfd39338ae

commit 09d070ccc3574ae0d7947d212ed53c7268ef7e1f
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Dec 22 07:40:26 2020 +0000

    upstream: tweak the description of KnownHostsCommand in ssh_conf.5,
    
    and add entries for it to the -O list in scp.1 and sftp.1;
    
    ok djm
    
    OpenBSD-Commit-ID: aba31ebea03f38f8d218857f7ce16a500c3e4aff

commit 931c93389a80e32272712459b1102d303844453d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 22 19:43:55 2020 +1100

    whitespace at EOL

commit 397b1c4d393f97427283a4717e9015a2bd31b8a5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 22 19:42:37 2020 +1100

    whitespace at EOL

commit 33fa3ac547e5349ca34681cce6727b2f933dff0a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Dec 22 19:21:26 2020 +1100

    Improve AIX text.

commit 0f2e21c9dca89598b694932b5b05848380a23ec0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Dec 22 18:56:54 2020 +1100

    Include stdio.h for FILE in misc.h.
    
    Fixes build on at least OpenBSD.

commit 3e9811e57b57ee66b0f70d99d7258da3153b0e8a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 22 18:31:50 2020 +1100

    ensure $LOGNAME is set in tests

commit 3eb647cbb34d87a063aa7714256c6e56103fffda
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 22 06:47:24 2020 +0000

    upstream: more detail for failing tests
    
    OpenBSD-Regress-ID: c68c0e5a521cad7e7f68e54c54ebf86d6c10ee1d

commit 2873f19570d4d8758be24dbf78332be9a779009b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 22 06:03:36 2020 +0000

    upstream: regress test for KnownHostsCommand
    
    OpenBSD-Regress-ID: ffc77464320b6dabdcfa0a72e0df02659233a38a

commit 0121aa87bab9ad2365de2d07f2832b56d5ff9871
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Tue Dec 22 03:05:31 2020 +0000

    upstream: Remove lines accidentally left behind in the ProxyJump
    
    parsing fix r1.345.
    
    ok djm
    
    OpenBSD-Commit-ID: fe767c108c8117bea33767b080ff62eef2c55f5c

commit da4bf0db942b5f0278f33238b86235e5813d7a5a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 22 00:15:22 2020 +0000

    upstream: add a ssh_config KnownHostsCommand that allows the client
    
    to obtain known_hosts data from a command in addition to the usual files.
    
    The command accepts bunch of %-expansions, including details of the
    connection and the offered server host key. Note that the command may
    be invoked up to three times per connection (see the manpage for
    details).
    
    ok markus@
    
    OpenBSD-Commit-ID: 2433cff4fb323918ae968da6ff38feb99b4d33d0

commit a34e14a5a0071de2036826a00197ce38c8b4ba8b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 22 00:12:22 2020 +0000

    upstream: move subprocess() from auth.c to misc.c
    
    make privilege dropping optional but allow it via callbacks (to avoid
    need to link uidswap.c everywhere)
    
    add some other flags (keep environment, disable strict path safety check)
    that make this more useful for client-side use.
    
    feedback & ok markus@
    
    OpenBSD-Commit-ID: a80ea9fdcc156f1a18e9c166122c759fae1637bf

commit 649205fe388b56acb3481a1b2461f6b5b7c6efa6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Dec 21 22:48:41 2020 +0000

    upstream: Remove explicit rijndael-cbc@lysator.liu.se test since the
    
    cipher was removed.
    
    OpenBSD-Regress-ID: aa93cddb4ecd9bc21446a79008a1a53050e64f17

commit 03e93c753d7c223063ad8acaf9a30aa511e5f931
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Dec 21 11:09:32 2020 +0000

    upstream: Remove the pre-standardization cipher
    
    rijndael-cbc@lysator.liu.se. It is an alias for aes256-cbc which was
    standardized in RFC4253 (2006), has been deprecated and disabled by default
    since OpenSSH 7.2 (2016) and was only briefly documented in ssh.1 in 2001.
    
    This will reduce the amount of work the cipher/kex regression tests need
    to do by a little bit.  ok markus@ djm@
    
    OpenBSD-Commit-ID: fb460acc18290a998fd70910b19c29b4e4f199ad

commit a11ca015879eab941add8c6bdaaec7d41107c6f5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 21 09:19:53 2020 +0000

    upstream: properly fix ProxyJump parsing; Thanks to tb@ for
    
    pointing out my error (parse_ssh_uri() can return -1/0/1, that I missed).
    Reported by Raf Czlonka via bugs@
    
    ok tb@
    
    OpenBSD-Commit-ID: a2991a3794bcaf1ca2b025212cce11cdb5f6b7d6

commit d97fb879724f1670bf55d9adfea7278a93c33ae2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 21 01:31:06 2020 +0000

    upstream: adapt to API change in hostkeys_foreach()/load_hostkeys()
    
    OpenBSD-Regress-ID: dcb468514f32da49a446372453497dc6eeafdbf3

commit bf7eb3c266b7fd4ddda108fcf72b860af2af6406
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 16 14:02:24 2020 +0000

    upstream: few more things needs match.c and addrmatch.c now that
    
    log.c calls match_pattern_list()
    
    OpenBSD-Regress-ID: f7c95c76b150d0aeb00a67858b9579b7d1b2db74

commit 2c64f24e27a5e72a7f59e515fc4f4985355237ae
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Dec 21 14:02:56 2020 +1100

    Pull in missing rev 1.2.

commit 0f504f592d15d8047e466eb7453067a6880992a8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 20 23:40:19 2020 +0000

    upstream: plumb ssh_conn_info through to sshconnect.c; feedback/ok
    
    markus@
    
    OpenBSD-Commit-ID: e8d14a09cda3f1dc55df08f8a4889beff74e68b0

commit 729b05f59ded35483acef90a6f88aa03eae33b29
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 20 23:38:00 2020 +0000

    upstream: allow UserKnownHostsFile=none; feedback and ok markus@
    
    OpenBSD-Commit-ID: c46d515eac94a35a1d50d5fd71c4b1ca53334b48

commit b4c7cd1185c5dc0593d47eafcc1a34fda569dd1d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 20 23:36:51 2020 +0000

    upstream: load_hostkeys()/hostkeys_foreach() variants for FILE*
    
    Add load_hostkeys_file() and hostkeys_foreach_file() that accept a
    FILE* argument instead of opening the file directly.
    
    Original load_hostkeys() and hostkeys_foreach() are implemented using
    these new interfaces.
    
    Add a u_int note field to the hostkey_entry and hostkey_foreach_line
    structs that is passed directly from the load_hostkeys() and
    hostkeys_foreach() call. This is a lightweight way to annotate results
    between different invocations of load_hostkeys().
    
    ok markus@
    
    OpenBSD-Commit-ID: 6ff6db13ec9ee4edfa658b2c38baad0f505d8c20

commit 06fbb386bed666581095cb9cbc7a900e02bfe1b7
Author: tobhe@openbsd.org <tobhe@openbsd.org>
Date:   Sat Dec 19 22:09:21 2020 +0000

    upstream: Print client kem key with correct length.
    
    ok markus@
    
    OpenBSD-Commit-ID: 91689e14a4fc6c270e265a32d1c8faba63a45755

commit 0ebead6593e2441e4af2735bbe2cd097607cd0d3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 17 23:28:50 2020 +0000

    upstream: fix possible error("%s", NULL) on error paths
    
    OpenBSD-Commit-ID: 0b3833c2cb985453ecca1d76803ebb8f3b736a11

commit d060bc7f6e6244f001e658208f53e3e2ecbbd382
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 17 23:26:11 2020 +0000

    upstream: refactor client percent_expand() argument passing;
    
    consolidate the common arguments into a single struct and pass that around
    instead of using a bunch of globals. ok markus@
    
    OpenBSD-Commit-ID: 035e6d7ca9145ad504f6af5a021943f1958cd19b

commit 43026da035cd266db37df1f723d5575056150744
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 17 23:10:27 2020 +0000

    upstream: prepare readconf.c for fuzzing; remove fatal calls and
    
    fix some (one-off) memory leaks; ok markus@
    
    OpenBSD-Commit-ID: 91c6aec57b0e7aae9190de188e9fe8933aad5ec5

commit bef92346c4a808f33216e54d6f4948f9df2ad7c1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 14 03:13:12 2020 +0000

    upstream: use _PATH_SSH_USER_DIR instead of hardcoded .ssh in path
    
    OpenBSD-Commit-ID: 5c1048468813107baa872f5ee33ba51623630e01

commit a5ab499bd2644b4026596fc2cb24a744fa310666
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 4 14:01:27 2020 +1100

    basic KEX fuzzer; adapted from Markus' unittest

commit 021ff33e383c77b11badd60cec5b141a3e3fa532
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 4 13:57:43 2020 +1100

    use options that work with recent clang

commit e4d1a0b40add800b6e9352b40c2223e44acc3a45
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 4 02:41:10 2020 +0000

    upstream: shuffle a few utility functions into sftp-client.c; from
    
    Jakub Jelen
    
    OpenBSD-Commit-ID: fdeb1aae1f6149b193f12cd2af158f948c514a2a

commit ace12dc64f8e3a2496ca48d36b53cb3c0a090755
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 4 02:29:56 2020 +0000

    upstream: make ssh_free(NULL) a no-op
    
    OpenBSD-Commit-ID: 42cb285d94789cefe6608db89c63040ab0a80fa0

commit 3b98b6e27f8a122dbfda9966b1afeb3e371cce91
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 4 02:29:25 2020 +0000

    upstream: memleak of DH public bignum; found with libfuzzer
    
    OpenBSD-Commit-ID: 0e913b542c3764b100b1571fdb0d0e5cc086fe97

commit 553b90feedd7da5b90901d73005f86705456d686
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 4 02:27:57 2020 +0000

    upstream: fix minor memleak of kex->hostkey_alg on rekex
    
    OpenBSD-Commit-ID: 2c3969c74966d4ccdfeff5e5f0df0791919aef50

commit ac0364b85e66eb53da2f9618f699ba6bd195ceea
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 4 02:27:08 2020 +0000

    upstream: typos: s/hex/kex/ in error messages
    
    OpenBSD-Commit-ID: 43a026c9571dd779ec148de1829cf5a6b6651905

commit ee22db7c5885a1d90219202c0695bc621aa0409b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 4 02:25:13 2020 +0000

    upstream: make program name be const
    
    OpenBSD-Commit-ID: ece25680ec637fdf20502721ccb0276691df5384

commit 2bcbf679de838bb77a8bd7fa18e100df471a679c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Nov 30 05:36:39 2020 +0000

    upstream: Ignore comments at the end of config lines in ssh_config,
    
    similar to what we already do for sshd_config.  bz#2320, with & ok djm@
    
    OpenBSD-Commit-ID: bdbf9fc5bc72b1a14266f5f61723ed57307a6db4

commit b755264e7d3cdf1de34e18df1af4efaa76a3c015
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Nov 28 12:52:32 2020 +0000

    upstream: Include cipher.h for declaration of cipher_by_name.
    
    OpenBSD-Commit-ID: ddfebbca03ca0e14e00bbad9d35f94b99655d032

commit 022def7bd16c3426a95e25f57cb259d54468341c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Nov 28 03:27:59 2020 +0000

    upstream: check result of strchr() against NULL rather than
    
    searched-for characters; from zhongjubin@huawei.com
    
    OpenBSD-Commit-ID: e6f57de1d4a4d25f8db2d44e8d58d847e247a4fe

commit 57bf03f0217554afb8980f6697a7a0b88658d0a9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Nov 27 10:12:30 2020 +0000

    upstream: Document ssh-keygen -Z, sanity check its argument earlier and
    
    provide a better error message if it's not correct.  Prompted by bz#2879, ok
    djm@ jmc@
    
    OpenBSD-Commit-ID: 484178a173e92230fb1803fb4f206d61f7b58005

commit 33313ebc1c7135085676db62189e3520341d6b73
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 27 00:49:58 2020 +0000

    upstream: Set the specified TOS/DSCP for interactive use prior to
    
    TCP connect. The connection phase of the SSH session is time-sensitive (due
    to server side login grace periods) and is frequently interactive (e.g.
    entering passwords). The ultimate interactive/bulk TOS/DSCP will be set after
    authentication completes.
    
    ok dtucker@
    
    OpenBSD-Commit-ID: f31ab10d9233363a6d2c9996007083ba43a093f1

commit b2bcec13f17ce9174238a704e91d52203e916432
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 27 00:37:10 2020 +0000

    upstream: clean up passing of struct passwd from monitor to preauth
    
    privsep process. No longer copy entire struct w/ pointer addresses, but pass
    remaining scalar fields explicitly,
    
    Prompted by Yuichiro NAITO, feedback Thorsten Glaser; ok dtucker@
    
    OpenBSD-Commit-ID: 9925df75a56732c43f3663e70dd15ff413ab3e53

commit 19af04e2231155d513e24fdc81fbec2217ae36a6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 22 22:38:26 2020 +0000

    upstream: when loading PKCS#11 keys, include the key fingerprints
    
    and provider/slot information in debug output.
    
    OpenBSD-Commit-ID: 969a089575d0166a9a364a9901bb6a8d9b8a1431

commit 9b9465ea856e15b9e9890b4ecb4110d7106e7766
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 22 22:37:11 2020 +0000

    upstream: when mentioning that the host key has changed, don't
    
    report the type because it is ambiguous as to whether it referred to the
    known or new host key. bz3216; ok dtucker@
    
    OpenBSD-Commit-ID: 2d5ce4a83dbcf44e340a572e361decad8aab7bad

commit 637017a7dd3281d3f2df804993cc27c30dbfda47
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 25 17:38:46 2020 +1100

    Use "=" not "==" in string test.
    
    POSIX says "=" is string comparison and some shells (eg HP-UX) will
    complain about "==".

commit 9880f3480f9768897f3b8e714d5317fb993bc5b3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 20 17:16:51 2020 +1100

    Restore correct flags during localtime_r check.
    
    We were restoring the wrong thing CPPFLAGS (we used CFLAGS) for any
    platform that doesn't have localtime_r.

commit 41935882f4e82de60dbd6e033eabe79e1b963518
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Nov 20 03:16:56 2020 +0000

    upstream: When doing an sftp recursive upload or download of a
    
    read-only directory, ensure that the directory is created with write and
    execute permissions in the interim so that we can actually complete the
    transfer, then set the directory permission as the final step.  (The execute
    bit is only likely to be an issue with a non-POSIX server).  bz#3222, ok djm@
    
    OpenBSD-Commit-ID: a82606212f2796e31f0e1af94a63355a7ad5d903

commit 0f90440ca70abab947acbd77795e9f130967956c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 20 13:37:54 2020 +1100

    Add new pselect6_time64 syscall on ARM.
    
    This is apparently needed on armhfp/armv7hl.  bz#3232, patch from
    jjelen at redhat.com.

commit 3a7c46c72b6a1f643b1fc3589cd20d8320c3d9e1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Nov 20 02:14:16 2020 +0000

    upstream: Explicitly initialize all members of the
    
    find_by_key_ctx struct.  Initializing a single member should be enough
    (the spec says the remainder should be initialized as per the static
    rules) but some GCCs warn on this which prevents us testing with -Werror
    on those.  ok deraadt@ djm@
    
    OpenBSD-Commit-ID: 687126e60a27d30f02614760ef3c3ae4e8d6af28

commit 076cb616b87d1ea1d292973fcd0ba38c08ea6832
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Nov 19 23:05:05 2020 +0000

    upstream: draft-ietf-secsh-architecture is now RFC4251.
    
    OpenBSD-Commit-ID: cb0bb58c2711fb5ed519507659be1dcf179ed403

commit 85cceda21f1471548e04111aefe2c4943131c1c8
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Nov 17 11:23:58 2020 +0000

    upstream: Specify that the KDF function is bcrypt. Based on github
    
    PR#214 from rafork, ok markus@, mdoc correction jmc@
    
    OpenBSD-Commit-ID: d8f2853e7edbcd483f31b50da77ab80ffa18b4ef

commit 5b9720f9adbd70ba5a994f407fe07a7d016d8d65
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 15 22:34:58 2020 +0000

    upstream: revert r1.341; it breaks ProxyJump; reported by sthen@
    
    OpenBSD-Commit-ID: 6ac2f945b26cb86d936eed338f77861d6da8356a

commit 04088725ec9c44880c01799b588cd4ba47b3e8bc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 13 07:30:44 2020 +0000

    upstream: scrub keyboard-interactive authentication prompts coming
    
    from the server through asmprintf() prior to display; suggested by and ok
    dtucker@
    
    OpenBSD-Commit-ID: 31fe93367645c37fbfe4691596bf6cf1e3972a58

commit 5442b491d0ee4bb82f6341ad0ee620ef3947f8c5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 13 04:53:12 2020 +0000

    upstream: prefix keyboard interactive prompts with (user@host) to
    
    make it easier to determine which connection they are associated with in
    cases like scp -3, ProxyJump, etc. bz#3224 ok dtucker
    
    OpenBSD-Commit-ID: 67e6189b04b46c867662f8a6759cf3ecb5f59170

commit 2992e4e7014ac1047062acfdbbf6feb156fef616
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 13 17:56:11 2020 +1100

    Remove use of TIME_WITH_SYS_TIME.
    
    It was only set by the recently removed AC_HEADER_TIME macro, replace
    with simple inclusions of both sys/time.h and time.h.  Should prevent
    mis-detection of struct timespec.

commit e3f27006f15abacb7e89fda3f5e9a0bd420b7e38
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 13 14:20:43 2020 +1100

    Revert "detect Linux/X32 systems"
    
    This reverts commit 5b56bd0affea7b02b540bdbc4d1d271b0e4fc885.
    
    The approach used was incorrect; discussion in bz#3085

commit e51dc7fab61df36e43f3bc64b673f88d388cab91
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 13 13:22:15 2020 +1100

    SELinux has deprecated security_context_t
    
    (it was only ever a char* anyway)

commit b79add37d118276d67f3899987b9f0629c9449c3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 13 13:43:30 2020 +1100

    Remove obsolete AC_HEADER_TIME macro.
    
    AC_HEADER_TIME is marked as obsolete in autoconf-2.70 and as far as I
    can tell everything we have that might be old enough to need it doesn't.

commit d5d05cdb3d4efd4a618aa52caab5bec73097c163
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 12 22:56:00 2020 +0000

    upstream: when prompting the user to accept a new hostkey, display
    
    any other host names/addresses already associated with the key. E.g.
    
    > The authenticity of host 'test (10.0.0.1)' can't be established.
    > ECDSA key fingerprint is SHA256:milU4MODXm8iJQI18wlsbPG7Yup+34fuNNmV08qDnax.
    > This host key is known by the following other names/addresses:
    >     ~/.ssh/known_hosts:1: host.example.org,10.0.0.1
    >     ~/.ssh/known_hosts:2: [hashed name]
    >     ~/.ssh/known_hosts:3: [hashed name]
    >     ~/.ssh/known_hosts:4: host
    >     ~/.ssh/known_hosts:5: [host]:2222
    > Are you sure you want to continue connecting (yes/no/[fingerprint])?
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: f6f58a77b49f1368b5883b3a1f776447cfcc7ef4

commit 819b44e8b9af6ce18d3ec7505b9f461bf7991a1f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Nov 12 22:38:57 2020 +0000

    upstream: Prevent integer overflow when ridiculously large
    
    ConnectTimeout is specified, capping the effective value (for most platforms)
    at 24 days. bz#3229, ok djm@
    
    OpenBSD-Commit-ID: 62d4c4b7b87d111045f8e9f28b5b532d17ac5bc0

commit add926dd1bbe3c4db06e27cab8ab0f9a3d00a0c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 11 05:22:32 2020 +0000

    upstream: fix logic error that broke URI parsing in ProxyJump
    
    directives; ok dtucker@
    
    OpenBSD-Commit-ID: 96d48839b1704882a0e9a77898f5e14b2d222705

commit 4340dd43928dfe746cb7e75fe920b63c0d909a9a
Author: claudio@openbsd.org <claudio@openbsd.org>
Date:   Tue Nov 10 07:46:20 2020 +0000

    upstream: Free the previously allocated msg buffer after writing it
    
    out. OK djm@
    
    OpenBSD-Commit-ID: 18c055870fc75e4cb9f926c86c7543e2e21d7fa4

commit fcf429a4c69d30d8725612a55b37181594da8ddf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 11 12:30:46 2020 +1100

    Prevent excessively long username going to PAM.
    
    This is a mitigation for a buffer overflow in Solaris' PAM username
    handling (CVE-2020-14871), and is only enabled for Sun-derived PAM
    implementations.  This is not a problem in sshd itself, it only
    prevents sshd from being used as a vector to attack Solaris' PAM.
    It does not prevent the bug in PAM from being exploited via some other
    PAM application.
    
    Based on github PR#212 from Mike Scott but implemented slightly
    differently.  ok tim@ djm@

commit 10dce8ff68ef615362cfcab0c0cc33ce524e7682
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 8 23:19:03 2020 +0000

    upstream: unbreak; missing NULL check
    
    OpenBSD-Commit-ID: 6613dfab488123f454d348ef496824476b8c11c0

commit d5a0cd4fc430c8eda213a4010a612d4778867cd9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 8 22:37:24 2020 +0000

    upstream: when requesting a security key touch on stderr, inform the
    
    user once the touch has been recorded; requested by claudio@ ok markus@
    
    OpenBSD-Commit-ID: 3b76ee444490e546b9ea7f879e4092ee0d256233

commit 292bcb2479deb27204e3ff796539c003975a5f7a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 9 00:33:35 2020 +1100

    Remove preprocessor directive from log macro calls.
    
    Preprocessor directives inside macro calls, such as the new log macros,
    are undefined behaviour and do not work with, eg old GCCs.  Put the
    entire log call inside the ifdef for OPENSSL_HAS_NISTP521.

commit 71693251b7cbb7dd89aaac18815147124732d0d3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Nov 8 12:10:20 2020 +0000

    upstream: Add a comment documenting the source of the moduli group
    
    sizes.
    
    OpenBSD-Commit-ID: aec0725ce607630caaa62682624c6763b350391c

commit 4d94b031ff88b015f0db57e140f481bff7ae1a91
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Nov 8 11:46:12 2020 +0000

    upstream: Replace WITH_OPENSSL ifdefs in log calls with a macro.
    
    The log calls are themselves now macros, and preprocessor directives inside
    macro arguments are undefined behaviour which some compilers (eg old GCCs)
    choke on.  It also makes the code tidier.  ok deraadt@
    
    OpenBSD-Commit-ID: cc12a9029833d222043aecd252d654965c351a69

commit 6d2564b94e51184eb0b73b97d13a36ad50b4f810
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 6 17:11:16 2020 +1100

    Fix function body for variadic macro test.
    
    AC_LANG_PROGRAM puts its second argument inside main() so we don't need
    to do it ourselves.

commit 586f9bd2f5980e12f8cf0d3c2a761fa63175da52
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 6 16:53:24 2020 +1100

    Remove AC_PROC_CC_C99 obsoleted in autoconf 2.70.
    
    Since we only use it to make sure we can handle variadic macros,
    explicitly check only for that.  with & ok djm@

commit a019e353df04de1b2ca78d91b39c393256044ad7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 6 13:56:41 2020 +1100

    Replace AC_TRY_COMPILE obsoleted in autoconf 2.70.
    
    Replace with the equivalent AC_COMPILE_IFELSE.

commit 771b7795c0ef6a2fb43b4c6c66b615c2085cb9cd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 6 13:55:33 2020 +1100

    Move AC_PROG_CC_C99 to immediately afer AC_PROG_CC.
    
    This puts the related C version selection output in the same place.

commit e5591161f21ab493c6284a85ac3c0710ad94998f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 6 13:54:17 2020 +1100

    AC_CHECK_HEADER() is obsoleted in autoconf 2.70.
    
    Replace with the non-obsoleted AC_CHECK_HEADERS().

commit 05bcd0cadf160fd4826a2284afa7cba6ec432633
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 3 22:53:12 2020 +0000

    upstream: fold consecutive '*' wildcards to mitigate combinatorial
    
    explosion of recursive searches; ok dtucker
    
    OpenBSD-Commit-ID: d18bcb39c40fb8a1ab61153db987e7d11dd3792b

commit 7d680448db5858dc76307663f78d0b8d3c2b4a3d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 30 01:50:07 2020 +0000

    upstream: print reason in fatal error message when
    
    kex_assemble_namelist() fails
    
    OpenBSD-Commit-ID: a9975ee8db6c98d6f32233d88051b2077ca63dab

commit 95d1109fec7e89ad21f2a97e92bde1305d32a353
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 29 03:13:06 2020 +0000

    upstream: fix sshd_config SetEnv directive inside Match blocks; part of
    
    github PR#201 from github user manuelm
    
    OpenBSD-Commit-ID: 9772e3748abff3ad65ae8fc43d026ed569b1d2bc

commit b12b835dc022ba161afe68348e05a83dfbcb1515
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 29 03:01:18 2020 +0000

    upstream: fix type of nid in type_bits_valid(); github PR#202 from
    
    github user thingsconnected
    
    OpenBSD-Commit-ID: 769d2b040dec7ab32d323daf54b854dd5dcb5485

commit 1a14c13147618144d1798c36a588397ba9008fcc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 29 02:52:43 2020 +0000

    upstream: whitespace; no code change
    
    OpenBSD-Commit-ID: efefc1c47e880887bdee8cd2127ca93177eaad79

commit 815209abfdd2991fb92ad7d2e33374916cdcbcf4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 29 02:47:23 2020 +0000

    upstream: UpdateHostkeys: fixed/better detection of host keys that
    
    exist under other names and addresses; spotted by and debugged with lots of
    help from jca@
    
    OpenBSD-Commit-ID: 5113d7f550bbd48243db1705afbf16b63792d4b7

commit a575cf44e59a65506c67bddb62a712208a7a279c
Author: Duncan Eastoe <duncan.eastoe@att.com>
Date:   Wed Oct 21 10:11:10 2020 +0100

    session.c: use "denylist" terminology
    
    Follow upstream (6d755706a0059eb9e2d63517f288b75cbc3b4701) language
    improvements in this portable-specific code.

commit 33267feaffd5d98aa56d2f0b3a99ec352effe938
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 27 16:46:31 2020 +1100

    Remove checks for strict POSIX mkdtemp()
    
    We needed a mkdtemp() that accepted template paths that did not
    end in XXXXXX a long time ago for KRB4, but that code is long
    deprecated. We no longer need to replace mkdtemp() for strictly
    following POSIX. ok dtucker@

commit 492d70e18bad5a8c97d05f5eddac817171e88d2c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Oct 26 00:39:04 2020 +0000

    upstream: Minor man page fixes (capitalization, commas) identified by
    
    the manpage-l10n project via bz#3223.  feedback deraadt@, ok jmc@
    
    OpenBSD-Commit-ID: ab83af0daf18369244a72daaec6c4a58a9eb7e2c

commit eab2888cfc6cc4e2ef24bd017da9835a0f365f3f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Oct 19 22:49:23 2020 +0000

    upstream: Adapt XMSS to new logging infrastructure. With markus@, ok
    
    djm@.
    
    OpenBSD-Commit-ID: 9c35ec3aa0f710e4e3325187ceff4fa3791686de

commit f7bd11e4941620991f3e727cd0131b01f0311a58
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 19 08:07:08 2020 +0000

    upstream: fix SEGV on fatal() errors spotted by dtucker@
    
    OpenBSD-Commit-ID: 75f155a1ac61e364ed00dc379e2c42df81067ce2

commit 7715a3b171049afa1feffb1d5a1245dfac36ce99
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 19 10:54:41 2020 +1100

    Use fatal_fr not fatal_r when passing r.
    
    Caught by the PAM -Werror tinderbox build.

commit 816036f142ecd284c12bb3685ae316a68d2ef190
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 18 11:32:01 2020 +0000

    upstream: use the new variant log macros instead of prepending
    
    __func__ and appending ssh_err(r) manually; ok markus@
    
    OpenBSD-Commit-ID: 1f14b80bcfa85414b2a1a6ff714fb5362687ace8

commit 9e2c4f64224f68fb84c49b5182e449f94b0dc985
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 18 11:21:59 2020 +0000

    upstream: variants of the log methods that append a ssherr.h string
    
    from a supplied error code; ok markus@
    
    OpenBSD-Commit-ID: aed98c4435d48d036ae6740300f6a8357b7cc0bf

commit 28cb0a4b03940d1ee576eb767a81a4113bdc917e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 18 11:14:27 2020 +0000

    upstream: remove a level of macro indirection; ok markus@
    
    OpenBSD-Commit-ID: 0c529d06e902c5d1a6b231e1bec6157f76dc67c9

commit 9cac1db52e6c4961c447910fe02cd68a3b2f9460
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 18 11:13:45 2020 +0000

    upstream: add some variant log.h calls that prepend the calling
    
    function name; ok markus@
    
    OpenBSD-Commit-ID: 4be1b2e2455b271ddb7457bc195c5367644f4e48

commit d55dfed34ef6ef1f028d552a90d5f3dba8dd6f7b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 17 22:55:24 2020 +1100

    missing header

commit 999d7cb79a3a73d92a6dfbf174c33da0d984c7a2
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 17 22:47:52 2020 +1100

    sync regress/misc/sk-dummy/fatal.c

commit 3554b4afa38b3483a3302f1be18eaa6f843bb260
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Oct 17 01:28:20 2020 +0000

    upstream: make the log functions that exit (sshlogdie(),
    
    sshfatal(), etc) have identical signatures. Makes things a bit more
    consistent...
    
    OpenBSD-Commit-ID: bd0ae124733389d7c0042e135c71ee9091362eb9

commit 616029a85ad7529b24bb8c4631d9607c0d6e7afe
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Oct 16 14:34:33 2020 +0000

    upstream: add space between macro arg and punctuation;
    
    OpenBSD-Commit-ID: bb81e2ed5a77832fe62ab30a915ae67cda57633e

commit f812a36cee5727147bc897d34ab9af068dd4561e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 17 12:03:34 2020 +1100

    check for and require a C99 capable compiler
    
    recent logging changes use __VA_ARGS__.

commit f9ea6515202b59a1e2d5b885cafc1b12eff33016
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 17 11:51:20 2020 +1100

    logging is now macros, remove function pointers

commit 0f938f998626e8359324f803157cd7c9f8f403e2
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 17 11:42:26 2020 +1100

    adapt sk-dummy's fatal implementation to changes

commit afbd9ec9e2dbad04834ce7ce53e58740434f32a5
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 17 11:33:13 2020 +1100

    fix netcat build problem

commit 793b583d097381730adaf6f68bed3c343139a013
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 16 13:26:13 2020 +0000

    upstream: LogVerbose keyword for ssh and sshd
    
    Allows forcing maximum debug logging by file/function/line pattern-
    lists.
    
    ok markus@
    
    OpenBSD-Commit-ID: c294c25732d1b4fe7e345cb3e044df00531a6356

commit 752250caabda3dd24635503c4cd689b32a650794
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 16 13:24:45 2020 +0000

    upstream: revised log infrastructure for OpenSSH
    
    log functions receive function, filename and line number of caller.
    We can use this to selectively enable logging via pattern-lists.
    
    ok markus@
    
    OpenBSD-Commit-ID: 51a472610cbe37834ce6ce4a3f0e0b1ccc95a349

commit acadbb3402b70f72f14d9a6930ad41be97c2f9dc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 16 02:37:12 2020 +0000

    upstream: use do_log2 instead of function pointers to different log
    
    functions
    
    OpenBSD-Commit-ID: 88077b826d348c58352a6b394755520f4e484480

commit 95b0bcfd1531d59e056ae8af27bb741391f26ab0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 14 00:55:17 2020 +0000

    upstream: make UpdateHostkeys still more conservative: refuse to
    
    proceed if one of the keys offered by the server is already in known_hosts
    under another name. This avoid collisions between address entries for
    different host aliases when CheckHostIP=yes
    
    Also, do not attempt to fix known_hosts with incomplete host/ip matches
    when there are no new or deprecated hostkeys.
    
    OpenBSD-Commit-ID: 95c19842f7c41f9bd9c92aa6441a278c0fd0c4a3

commit a336ce8c2c55547cc00e0070a18c55f30bb53fb6
Author: kn@openbsd.org <kn@openbsd.org>
Date:   Mon Oct 12 08:36:36 2020 +0000

    upstream: Zap unused family parameter from ssh_connect_direct()
    
    sshconnect.c r1.241 from 2013 made it unused;  found while reading code.
    
    OK djm
    
    OpenBSD-Commit-ID: 219ba6d7f9925d0b7992918612680399d86712b5

commit e545d94b713effab8e6c7dfabbfb76c1d84d7498
Author: Philip Hands <phil@hands.com>
Date:   Sun Oct 4 00:15:46 2020 +0200

    shift contents of long $() into filter_ids()
    
    This was prompted by the fact that posh does not deal with $()
    that contains comments where the comment includes an odd number
    of single-quotes. It seems to get befuddled into trying to find
    the matching quote.
    Regardless, making a function for filtering the unneeded ids
    seems much neater than avoiding apostrophes,
    so that's what I've done.
    
    SSH-Copy-ID-Upstream: 3dab3366a584427045c8a690a93282f02c09cf24

commit fd360174596047b52aa1cddda74d85012a03ca4b
Author: Philip Hands <phil@hands.com>
Date:   Sat Oct 3 23:15:16 2020 +0200

    combine if/elif to avoid duplication of the action
    
    SSH-Copy-ID-Upstream: 42aeb1cc53d3f7f6e78edc210fb121fda0834914

commit f7c3a39b016dd77709ecbf18da8282f967b86cd7
Author: Philip Hands <phil@hands.com>
Date:   Sat Oct 3 21:45:16 2020 +0200

    shellcheck tidyage
    
    SSH-Copy-ID-Upstream: 5b08f840e78ac544288b3983010a1b0585e966fd

commit 108676c3f26be6c873db0dd8754063699908727b
Author: Philip Hands <phil@hands.com>
Date:   Sat Oct 3 21:10:03 2020 +0200

    tidy up test of $SCRATCH_DIR creation
    
    SSH-Copy-ID-Upstream: 2d8b22d96c105d87743ffe8874887b06f8989b93

commit a9c9e91a82bc1a2cf801b4e3ef27a941dbd27717
Author: Philip Hands <phil@hands.com>
Date:   Wed Sep 16 16:13:30 2020 +0200

    add -s flag: to install keys via SFTP
    
    This is prompted by:
    
     https://bugzilla.mindrot.org/show_bug.cgi?id=3201
    
    Thanks go to Matthias Blümel for the idea, and the helpful patch, from
    which this patch grew.
    
    SSH-Copy-ID-Upstream: f7c76dc64427cd20287a6868f672423b62057614

commit f92424970c02b78852ff149378c7f2616ada4ccf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 11 22:14:38 2020 +0000

    upstream: UpdateHostkeys: check for keys under other names
    
    Stop UpdateHostkeys from automatically removing deprecated keys from
    known_hosts files if the same keys exist under a different name or
    address to the host that is being connected to.
    
    This avoids UpdateHostkeys from making known_hosts inconsistent in
    some cases. For example, multiple host aliases sharing address-based
    known_hosts on different lines, or hosts that resolves to multiple
    addresses.
    
    ok markus@
    
    OpenBSD-Commit-ID: 6444a705ba504c3c8ccddccd8d1b94aa33bd11c1

commit d98f14b5328922ae3085e07007d820c4f655b57a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 11 22:13:37 2020 +0000

    upstream: UpdateHostkeys: better CheckHostIP handling
    
    When preparing to update the known_hosts file, fully check both
    entries for both the host and the address (if CheckHostIP enabled)
    and ensure that, at the end of the operation, entries for both are
    recorded.
    
    Make sure this works with HashKnownHosts too, which requires maintaining
    a list of entry-types seen across the whole file for each key.
    
    ok markus@
    
    OpenBSD-Commit-ID: 374dc263103f6b343d9671f87dbf81ffd0d6abdd

commit af5941ae9b013aac12585e84c4cf494f3728982f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 11 22:12:44 2020 +0000

    upstream: UpdateHostkeys: better detect manual host entries
    
    Disable UpdateHostkeys if the known_hosts line has more than two
    entries in the pattern-list. ssh(1) only writes "host" or "host,ip"
    lines so anything else was added by a different tool or by a human.
    
    ok markus@
    
    OpenBSD-Commit-ID: e434828191fb5f3877d4887c218682825aa59820

commit 6247812c76f70b2245f3c23f5074665b3d436cae
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 8 01:15:16 2020 +0000

    upstream: don't misdetect comma-separated hostkey names as wildcards;
    
    spotted by naddy@
    
    OpenBSD-Commit-ID: 4b874edfec7fc324a21b130bdb42f912177739ce

commit 67146c7d022a170be3cdad2f5f40259a663fb266
Author: wangxp006 <wangxiaopeng7@huawei.com>
Date:   Thu Oct 8 17:49:59 2020 +0800

    fix TEST_MALLOC_OPTIONS var

commit 3205eaa3f8883a34fa4559ddef6c90d1067c5cce
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 8 00:31:05 2020 +0000

    upstream: clarify conditions for UpdateHostkeys
    
    OpenBSD-Commit-ID: 9cba714cf6aeed769f998ccbe8c483077a618e27

commit e8dfca9bfeff05de87160407fb3e6a5717fa3dcb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 7 06:38:16 2020 +0000

    upstream: remove GlobalKnownHostsFile for this test after
    
    UpdateHostkeys change
    
    OpenBSD-Regress-ID: a940ad79d59343319613ba8fc46b6ef24aa3f8e1

commit 4aa2717d7517cff4bc423a6cfba3a2defb055aea
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 7 02:26:28 2020 +0000

    upstream: Disable UpdateHostkeys when hostkey checking fails
    
    If host key checking fails (i.e. a wrong host key is recorded for the
    server) and the user elects to continue (via StrictHostKeyChecking=no),
    then disable UpdateHostkeys for the session.
    
    reminded by Mark D. Baushke; ok markus@
    
    OpenBSD-Commit-ID: 98b524f121f4252309dd21becd8c4cacb0c6042a

commit 04c06d04475f1f673e9d9743710d194453fe3888
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 7 02:25:43 2020 +0000

    upstream: Fix UpdateHostkeys/HashKnownHosts/CheckHostIP bug
    
    When all of UpdateHostkeys, HashKnownHosts and ChechHostIP
    were enabled and new host keys were learned, known_hosts IP
    entries were not being recorded for new host keys.
    
    reported by matthieu@ ok markus@
    
    OpenBSD-Commit-ID: a654a8290bd1c930aac509e8158cf85e42e49cb7

commit b70e33711291f3081702133175a41cccafc0212a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 7 02:24:51 2020 +0000

    upstream: don't UpdateHostkeys when the hostkey is verified by the
    
    GlobalKnownHostsFile file, support only UserKnownHostsFile matches
    
    suggested by Mark D. Baushke; feedback and ok markus@
    
    OpenBSD-Commit-ID: eabb771a6add676c398d38a143a1aff5f04abbb9

commit aa623142e426ca1ab9db77b06dcc9b1b70bd102b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 7 02:22:23 2020 +0000

    upstream: revert kex->flags cert hostkey downgrade back to a plain
    
    key (commitid VtF8vozGOF8DMKVg). We now do this a simpler way that needs less
    plumbing.
    
    ok markus@
    
    OpenBSD-Commit-ID: fb92d25b216bff8c136da818ac2221efaadf18ed

commit f4f14e023cafee1cd9ebe4bb0db4029e6e1fafac
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 7 02:20:35 2020 +0000

    upstream: simply disable UpdateHostkeys when a certificate
    
    successfully authenticated the host; simpler than the complicated plumbing
    via kex->flags we have now.
    
    ok markus@
    
    OpenBSD-Commit-ID: 80e39644eed75717d563a7f177e8117a0e14f42c

commit e79957e877db42c4c68fabcf6ecff2268e53acb5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 7 02:18:45 2020 +0000

    upstream: disable UpdateHostkeys by default if VerifyHostKeyDNS is
    
    enabled; suggested by Mark D. Baushke
    
    OpenBSD-Commit-ID: 85a1b88592c81bc85df7ee7787dbbe721a0542bf

commit 3d4c2016bae1a6f14b48c1150a4c79ca4c9968bd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Oct 6 07:12:04 2020 +0000

    upstream: Agent protocol draft is now at rev 4. ok djm@
    
    OpenBSD-Commit-ID: 8c01ea3aae48aab45e01b7421b0fca2dad5e7837

commit af889a40ffc113af9105c03d7b32131eb4372d50
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Oct 4 09:45:01 2020 +0000

    upstream: when ordering host key algorithms in the client, consider
    
    the ECDSA key subtype; ok markus@
    
    OpenBSD-Commit-ID: 3097686f853c61ff61772ea35f8b699931392ece

commit 2d39fc9f7e039351daa3d6aead1538ac29258add
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Oct 4 03:04:02 2020 +0000

    upstream: Allow full range of UIDs and GIDs for sftp chown and
    
    chgrp on 32bit platforms instead of being limited by LONG_MAX.  bz#3206,
    found by booking00 at sina.cn, ok markus@
    
    OpenBSD-Commit-ID: 373b7bbf1f15ae482d39567ce30d18b51c9229b5

commit 396d32f3a1a16e54df2a76b2a9b237868580dcbe
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Oct 3 09:22:26 2020 +0000

    upstream: There are lots of place where we want to redirect stdin,
    
    stdout and/or stderr to /dev/null. Factor all these out to a single
    stdfd_devnull() function that allows selection of which of these to redirect.
    ok markus@
    
    OpenBSD-Commit-ID: 3033ba5a4c47cacfd5def020d42cabc52fad3099

commit 1286981d08b8429a64613215ce8bff3f6b32488a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Oct 3 08:30:47 2020 +0000

    upstream: enable UpdateHostkeys by default when the configuration
    
    has not overridden UserKnownHostsFile; ok markus@ "The timing is perfect"
    deraadt@
    
    OpenBSD-Commit-ID: 62df71c9c5242da5763cb473c2a2deefbd0cef60

commit 332f21537293d66508f7342dc643bc7fe45f0f69
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Oct 3 08:12:59 2020 +0000

    upstream: disable UpdateHostkeys when a wildcard hostname pattern
    
    is encountered or when a certificate host key is in use. feedback/ok markus@
    
    OpenBSD-Commit-ID: b6e5575af7e6732322be82ec299e09051a5413bd

commit 13cee44ef907824083d89cb9395adbbd552e46c1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Oct 3 08:11:28 2020 +0000

    upstream: record when the host key checking code downgrades a
    
    certificate host key to a plain key. This occurs when the user connects to a
    host with a certificate host key but no corresponding CA key configured in
    known_hosts; feedback and ok markus@
    
    OpenBSD-Commit-ID: 2ada81853ff9ee7824c62f440bcf4ad62030c901

commit 12ae8f95e2e0c273e9e7ef930b01a028ef796a3f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Oct 3 04:15:06 2020 +0000

    upstream: prefer ed25519 signature algorithm variants to ECDSA; ok
    
    markus@
    
    OpenBSD-Commit-ID: 82187926fca96d35a5b5afbc091afa84e0966e5b

commit e5ed753add7aa8eed6b167e44db6240a76404db2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Oct 3 03:40:38 2020 +0000

    upstream: want time.h here too
    
    OpenBSD-Commit-ID: fafee8f1108c64ad8b282f9a1ed5ea830d8c58a7

commit 66bd9fdf8b7762eb6a85cabbb1ae4ed955679f60
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sat Oct 3 02:18:33 2020 +0000

    upstream: split introductory paragraph, and insert ominous words about
    
    the glob issue, which cannot be fully fixed and really requires completely
    replacing scp with a completely different subsystem. team effort to find the
    right words..
    
    OpenBSD-Commit-ID: 58e1f72d292687f63eb357183036ee242513691c

commit 86cc8ce002ea10e88a4c5d622a8fdfab8a7d261f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 3 13:38:55 2020 +1000

    use relative rather than system include here

commit 922cfac5ed5ead9f796f7d39f012dd653dc5c173
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 3 13:38:41 2020 +1000

    add some openbsd-compat licenses we missed

commit ce941c75ea9cd6c358508a5b206809846c8d9240
Author: Philip Hands <phil@hands.com>
Date:   Sat Oct 3 00:20:07 2020 +0200

    un-nest $() to make ksh cheerful

commit 18ea5f4b88e303677d2003b95e5cb864b439e442
Author: Philip Hands <phil@hands.com>
Date:   Fri Oct 2 21:30:10 2020 +0200

    ksh doesn't grok 'local'
    
    and AFAICT it's not actually doing anything useful in the code, so let's
    see how things go without it.

commit d9e727dcc04a52caaac87543ea1d230e9e6b5604
Author: Oleg <Fallmay@users.noreply.github.com>
Date:   Thu Oct 1 12:09:08 2020 +0300

    Fix `EOF: command not found` error in ssh-copy-id

commit a1a856d50c89be3206f320baa4bfb32fff4e826f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Sep 30 09:11:39 2020 +0000

    upstream: Regen moduli.
    
    OpenBSD-Commit-ID: 04967f8c43e9854ac34b917bcd6f5ac96c53a693

commit fa1fe3ead7069d90d3c67d62137ad66acfcc9f48
Author: HARUYAMA Seigo <haruyama@unixuser.org>
Date:   Sun Sep 27 20:06:20 2020 +0900

    Restore first section title of INSTALL

commit 279261e1ea8150c7c64ab5fe7cb4a4ea17acbb29
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 27 17:25:01 2020 +1000

    update version numbers

commit 58ca6ab6ff035ed12b5078e3e9c7199fe72c8587
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Sep 27 07:22:05 2020 +0000

    upstream: openssh 8.4
    
    OpenBSD-Commit-ID: a29e5b372d2c00e297da8a35a3b87c9beb3b4a58

commit 9bb8a303ce05ff13fb421de991b495930be103c3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 22 10:07:43 2020 +1000

    sync with upstream ssh-copy-id rev f0da1a1b7

commit 0a4a5571ada76b1b012bec9cf6ad1203fc19ec8d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 21 07:29:09 2020 +0000

    upstream: close stdin when forking after authentication too; ok markus
    
    OpenBSD-Commit-ID: 43db17e4abc3e6b4a7b033aa8cdab326a7cb6c24

commit d14fe25e6c3b89f8af17e2894046164ac3b45688
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Sep 20 23:31:46 2020 +0000

    upstream: close stdout/stderr after "ssh -f ..." forking
    
    bz#3137, ok markus
    
    OpenBSD-Commit-ID: e2d83cc4dea1665651a7aa924ad1ed6bcaaab3e2

commit 53a33a0d745179c02108589e1722457ca8ae4372
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 20 15:57:09 2020 +1000

    .depend

commit 107eb3eeafcd390e1fa7cc7672a05e994d14013e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Sep 20 05:47:25 2020 +0000

    upstream: cap channel input buffer size at 16MB; avoids high memory use
    
    when peer advertises a large window but is slow to consume the data we send
    (e.g. because of a slow network)
    
    reported by Pierre-Yves David
    
    fix with & ok markus@
    
    OpenBSD-Commit-ID: 1452771f5e5e768876d3bfe2544e3866d6ade216

commit acfe2ac5fe033e227ad3a56624fbbe4af8b5da04
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 18 22:02:53 2020 +1000

    libfido2 1.5.0 is recommended

commit 52a03e9fca2d74eef953ddd4709250f365ca3975
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 18 08:16:38 2020 +0000

    upstream: handle multiple messages in a single read()
    
    PR#183 by Dennis Kaarsemaker; feedback and ok markus@
    
    OpenBSD-Commit-ID: 8570bb4d02d00cf70b98590716ea6a7d1cce68d1

commit dc098405b2939146e17567a25b08fc6122893cdf
Author: pedro martelletto <pedro@ambientworks.net>
Date:   Fri Sep 18 08:57:29 2020 +0200

    configure.ac: add missing includes
    
    when testing, make sure to include the relevant header files that
    declare the types of the functions used by the test:
    
    - stdio.h for printf();
    - stdlib.h for exit();
    - string.h for strcmp();
    - unistd.h for unlink(), _exit(), fork(), getppid(), sleep().

commit b3855ff053f5078ec3d3c653cdaedefaa5fc362d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 18 05:23:03 2020 +0000

    upstream: tweak the client hostkey preference ordering algorithm to
    
    prefer the default ordering if the user has a key that matches the
    best-preference default algorithm.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: a92dd7d7520ddd95c0a16786a7519e6d0167d35f

commit f93b187ab900c7d12875952cc63350fe4de8a0a8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 18 14:55:48 2020 +1000

    control over the colours in gnome-ssh-askpass[23]
    
    Optionally set the textarea colours via $GNOME_SSH_ASKPASS_FG_COLOR and
    $GNOME_SSH_ASKPASS_BG_COLOR. These accept the usual three or six digit
    hex colours.

commit 9d3d36bdb10b66abd1af42e8655502487b6ba1fa
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 18 14:50:38 2020 +1000

    focus improvement for gnome-ssh-askpass[23]
    
    When serving a SSH_ASKPASS_PROMPT=none information dialog, ensure
    then <enter> doesn't immediately close the dialog. Instead, require an
    explicit <tab> to reach the close button, or <esc>.

commit d6f507f37e6c75a899db0ef8224e72797c5563b6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Sep 16 03:07:31 2020 +0000

    upstream: Remove unused buf, last user was removed when switching
    
    to the sshbuf API. Patch from Sebastian Andrzej Siewior.
    
    OpenBSD-Commit-ID: 250fa17f0cec01039cc4abd95917d9746e24c889

commit c3c786c3a0973331ee0922b2c51832a3b8d7f20f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 9 21:57:27 2020 +0000

    upstream: For the hostkey confirmation message:
    
    > Are you sure you want to continue connecting (yes/no/[fingerprint])?
    
    compare the fingerprint case sensitively; spotted Patrik Lundin
    ok dtucker
    
    OpenBSD-Commit-ID: 73097afee1b3a5929324e345ba4a4a42347409f2

commit f2950baf0bafe6aa20dfe2e8d1ca4b23528df617
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 11 14:45:23 2020 +1000

    New config-build-time dependency on automake.

commit 600c1c27abd496372bd0cf83d21a1c119dfdf9a5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Sep 6 21:56:36 2020 +1000

    Add aclocal.m4 and config.h.in~ to .gitignore.
    
    aclocal.m4 is now generated by autoreconf.

commit 4bf7e1d00b1dcd3a6b3239f77465c019e61c6715
Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Date:   Sat Sep 5 17:50:03 2020 +0200

    Quote the definition of OSSH_CHECK_HEADER_FOR_FIELD
    
    autoreconf complains about underquoted definition of
    OSSH_CHECK_HEADER_FOR_FIELD after aclocal.m4 has been and now is beeing
    recreated.
    
    Quote OSSH_CHECK_HEADER_FOR_FIELD as suggested.
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>

commit a2f3ae386b5f7938ed3c565ad71f30c4f7f010f1
Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Date:   Sat Sep 5 17:50:02 2020 +0200

    Move the local m4 macros
    
    The `aclocal' step is skipped during `autoreconf' because aclocal.m4 is
    present.
    Move the current aclocal.m4 which contains local macros into the m4/
    folder. With this change the aclocal.m4 will be re-created during
    changes to the m4/ macro.
    This is needed so the `aclocal' can fetch m4 macros from the system if
    they are references in the configure script. This is a prerequisite to
    use PKG_CHECK_MODULES.
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>

commit 8372bff3a895b84fd78a81dc39da10928b662f5a
Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Date:   Sat Sep 5 17:50:01 2020 +0200

    Remove HAVE_MMAP and BROKEN_MMAP
    
    BROKEN_MMAP is no longer defined since commit
       1cfd5c06efb12 ("Remove portability support for mmap")
    
    this commit also removed other HAVE_MMAP user. I didn't find anything
    that defines HAVE_MMAP. The check does not trigger because compression
    on server side is by default COMP_DELAYED (2) so it never triggers.
    
    Remove remaining HAVE_MMAP and BROKEN_MMAP bits.
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>

commit bbf20ac8065905f9cb9aeb8f1df57fcab52ee2fb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 9 03:10:21 2020 +0000

    upstream: adapt to SSH_SK_VERSION_MAJOR crank
    
    OpenBSD-Regress-ID: 0f3e76bdc8f9dbd9d22707c7bdd86051d5112ab8

commit 9afe2a150893b20bdf9eab764978d817b9a7b783
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Aug 28 03:17:13 2020 +0000

    upstream: Ensure that address/mask mismatches are flagged at
    
    config-check time. ok djm@
    
    OpenBSD-Regress-ID: 8f5f4c2c0bf00e6ceae7a1755a444666de0ea5c2

commit c76773524179cb654ff838dd43ba1ddb155bafaa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 9 03:08:01 2020 +0000

    upstream: when writing an attestation blob for a FIDO key, record all
    
    the data needed to verify the attestation. Previously we were missing the
    "authenticator data" that is included in the signature.
    
    spotted by Ian Haken
    feedback Pedro Martelletto and Ian Haken; ok markus@
    
    OpenBSD-Commit-ID: 8439896e63792b2db99c6065dd9a45eabbdb7e0a

commit c1c44eeecddf093a7983bd91e70b446de789b363
Author: pedro martelletto <pedro@ambientworks.net>
Date:   Tue Sep 1 17:01:55 2020 +0200

    configure.ac: fix libfido2 back-compat
    
    - HAVE_FIDO_CRED_PROD -> HAVE_FIDO_CRED_PROT;
    - check for fido_dev_get_touch_begin(), so that
      HAVE_FIDO_DEV_GET_TOUCH_BEGIN gets defined.

commit 785f0f315bf7ac5909e988bb1ac3e019fb5e1594
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 31 04:33:17 2020 +0000

    upstream: refuse to add verify-required (PINful) FIDO keys to
    
    ssh-agent until the agent supports them properly
    
    OpenBSD-Commit-ID: 125bd55a8df32c87c3ec33c6ebe437673a3d037e

commit 39e88aeff9c7cb6862b37ad1a87a03ebbb38c233
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 31 00:17:41 2020 +0000

    upstream: Add RCS IDs to the few files that are missing them; from
    
    Pedro Martelletto
    
    OpenBSD-Commit-ID: 39aa37a43d0c75ec87f1659f573d3b5867e4a3b3

commit 72730249b38a676da94a1366b54a6e96e6928bcb
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Aug 28 03:15:52 2020 +0000

    upstream: Check that the addresses supplied to Match Address and
    
    Match LocalAddress are valid when parsing in config-test mode.  This will
    catch address/mask mismatches before they cause problems at runtime. Found by
    Daniel Stocker, ok djm@
    
    OpenBSD-Commit-ID: 2d0b10c69fad5d8fda4c703e7c6804935289378b

commit 2a3a9822311a565a9df48ed3b6a3c972f462bd7d
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Aug 27 12:34:00 2020 +0000

    upstream: sentence fix; from pedro martelletto
    
    OpenBSD-Commit-ID: f95b84a1e94e9913173229f3787448eea2f8a575

commit ce178be0d954b210c958bc2b9e998cd6a7aa73a9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 27 20:01:52 2020 +1000

    tweak back-compat for older libfido2

commit d6f45cdde031acdf434bbb27235a1055621915f4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 27 09:46:04 2020 +0000

    upstream: debug()-print a little info about FIDO-specific key
    
    fields via "ssh-keygen -vyf /path/key"
    
    OpenBSD-Commit-ID: cf315c4fe77db43947d111b00155165cb6b577cf

commit b969072cc3d62d05cb41bc6d6f3c22c764ed932f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 27 09:43:28 2020 +0000

    upstream: skip a bit more FIDO token selection logic when only a
    
    single token is attached.
    
    with Pedro Martelletto
    
    OpenBSD-Commit-ID: e4a324bd9814227ec1faa8cb619580e661cca9ac

commit 744df42a129d7d7db26947b7561be32edac89f88
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Aug 27 06:15:22 2020 +0000

    upstream: tweak previous;
    
    OpenBSD-Commit-ID: 92714b6531e244e4da401b2defaa376374e24be7

commit e32479645ce649b444ba5c6e7151304306a09654
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 27 03:55:22 2020 +0000

    upstream: adapt to API changes
    
    OpenBSD-Regress-ID: 5f147990cb67094fe554333782ab268a572bb2dd

commit bbcc858ded3fbc46abfa7760e40389e3ca93884c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 27 12:37:12 2020 +1000

    degrade semi-gracefully when libfido2 is too old

commit 9cbbdc12cb6a2ab1e9ffe9974cca91d213c185c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 27 01:15:36 2020 +0000

    upstream: dummy firmware needs to match API version numner crank (for
    
    verify-required resident keys) even though it doesn't implement this feature
    
    OpenBSD-Regress-ID: 86579ea2891e18e822e204413d011b2ae0e59657

commit c1e76c64956b424ba260fd4eec9970e5b5859039
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 27 02:11:09 2020 +0000

    upstream: remove unreachable code I forgot to delete in r1.334
    
    OpenBSD-Commit-ID: 9ed6078251a0959ee8deda443b9ae42484fd8b18

commit 0caff05350bd5fc635674c9e051a0322faba5ae3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 27 01:08:45 2020 +0000

    upstream: Request PIN ahead of time for certain FIDO actions
    
    When we know that a particular action will require a PIN, such as
    downloading resident keys or generating a verify-required key, request
    the PIN before attempting it.
    
    joint work with Pedro Martelletto; ok markus@
    
    OpenBSD-Commit-ID: 863182d38ef075bad1f7d20ca485752a05edb727

commit b649b3daa6d4b8ebe1bd6de69b3db5d2c03c9af0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 27 01:08:19 2020 +0000

    upstream: preserve verify-required for resident FIDO keys
    
    When downloading a resident, verify-required key from a FIDO token,
    preserve the verify-required in the private key that is written to
    disk. Previously we weren't doing that because of lack of support
    in the middleware API.
    
    from Pedro Martelletto; ok markus@ and myself
    
    OpenBSD-Commit-ID: 201c46ccdd227cddba3d64e1bdbd082afa956517

commit 642e06d0df983fa2af85126cf4b23440bb2985bf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 27 01:07:51 2020 +0000

    upstream: major rework of FIDO token selection logic
    
    When PINs are in use and multiple FIDO tokens are attached to a host, we
    cannot just blast requests at all attached tokens with the PIN specified
    as this will cause the per-token PIN failure counter to increment. If
    this retry counter hits the token's limit (usually 3 attempts), then the
    token will lock itself and render all (web and SSH) of its keys invalid.
    We don't want this.
    
    So this reworks the key selection logic for the specific case of
    multiple keys being attached. When multiple keys are attached and the
    operation requires a PIN, then the user must touch the key that they
    wish to use first in order to identify it.
    
    This may require multiple touches, but only if there are multiple keys
    attached AND (usually) the operation requires a PIN. The usual case of a
    single key attached should be unaffected.
    
    Work by Pedro Martelletto; ok myself and markus@
    
    OpenBSD-Commit-ID: 637d3049ced61b7a9ee796914bbc4843d999a864

commit 801c9f095e6d8b7b91aefd98f5001c652ea13488
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 27 01:07:09 2020 +0000

    upstream: support for requiring user verified FIDO keys in sshd
    
    This adds a "verify-required" authorized_keys flag and a corresponding
    sshd_config option that tells sshd to require that FIDO keys verify the
    user identity before completing the signing/authentication attempt.
    Whether or not user verification was performed is already baked into the
    signature made on the FIDO token, so this is just plumbing that flag
    through and adding ways to require it.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: 3a2313aae153e043d57763d766bb6d55c4e276e6

commit 9b8ad93824c682ce841f53f3b5762cef4e7cc4dc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 27 01:06:18 2020 +0000

    upstream: support for user-verified FIDO keys
    
    FIDO2 supports a notion of "user verification" where the user is
    required to demonstrate their identity to the token before particular
    operations (e.g. signing). Typically this is done by authenticating
    themselves using a PIN that has been set on the token.
    
    This adds support for generating and using user verified keys where
    the verification happens via PIN (other options might be added in the
    future, but none are in common use now). Practically, this adds
    another key generation option "verify-required" that yields a key that
    requires a PIN before each authentication.
    
    feedback markus@ and Pedro Martelletto; ok markus@
    
    OpenBSD-Commit-ID: 57fd461e4366f87c47502c5614ec08573e6d6a15

commit 1196d7f49d4fbc90f37e550de3056561613b0960
Author: cheloha@openbsd.org <cheloha@openbsd.org>
Date:   Wed Aug 12 01:23:45 2020 +0000

    upstream: ssh-keyscan(1): simplify conloop() with timercmp(3),
    
    timersub(3); ok djm@
    
    OpenBSD-Commit-ID: a102acb544f840d33ad73d40088adab4a687fa27

commit d0a195c89e26766d3eb8f3e4e2a00ebc98b57795
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 11 09:49:57 2020 +0000

    upstream: let ssh_config(5)'s AddKeysToAgent keyword accept a time
    
    limit for keys in addition to its current flag options. Time-limited keys
    will automatically be removed from ssh-agent after their expiry time has
    passed; ok markus@
    
    OpenBSD-Commit-ID: 792e71cacbbc25faab5424cf80bee4a006119f94

commit e9c2002891a7b8e66f4140557a982978f372e5a3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 11 09:45:54 2020 +0000

    upstream: let the "Confirm user presence for key ..." ssh-askpass
    
    notification respect $SSH_ASKPASS_REQUIRE; ok markus@
    
    OpenBSD-Commit-ID: 7c1a616b348779bda3b9ad46bf592741f8e206c1

commit eaf8672b1b52db2815a229745f4e4b08681bed6d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 21 00:04:13 2020 +1000

    Remove check for 'ent' command.
    
    It was added in 8d1fd57a9 for measuring entropy of ssh_prng_cmds which
    has long since been removed and there are no other references to it.

commit 05c215de8d224e094a872d97d45f37f60c06206b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 17 21:34:32 2020 +1000

    Wrap stdint.h include in ifdef HAVE_STDINT_H.

commit eaf2765efe8bc74feba85c34295d067637fc6635
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 10 13:24:09 2020 +1000

    sync memmem.c with OpenBSD

commit ed6bef77f5bb5b8f9ca2914478949e29f2f0a780
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 7 17:12:16 2020 +1000

    Always send any PAM account messages.
    
    If the PAM account stack reaturns any messages, send them to the user
    not just if the check succeeds.  bz#2049, ok djm@

commit a09e98dcae1e26f026029b7142b0e0d10130056f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 7 15:37:37 2020 +1000

    Output test debug logs on failure.

commit eb122b1eebe58b29a83a507ee814cbcf8aeded1b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 7 15:11:42 2020 +1000

    Add ability to specify exact test target.

commit c2ec7a07f8caabb4d8e00c66e7cd46bf2cd1e922
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 7 14:21:15 2020 +1000

    Document --without-openssl and --without-zlib.

commit 651bb3a31949bbdc3a78b2ede95a77bce0c72984
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Aug 7 14:15:11 2020 +1000

    Add without-openssl without-zlib test target.

commit 9499f2bb01dc1032ae155999b2d7764b9491341f
Author: Stefan Schindler <dns2utf8@estada.ch>
Date:   Wed Aug 5 19:00:52 2020 +0200

    Add CI with prepare script
    
    * Only use heimdal kerberos implementation
    * Fetch yubico/libfido2 (see: https://github.com/Yubico/libfido2)
    * Add one target for
        * all features
        * each feature alone
        * no features

commit ea1f649046546a860f68b97ddc3015b7e44346ca
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 5 08:58:57 2020 +1000

    support NetBSD's utmpx.ut_ss address field
    
    bz#960, ok dtucker

commit 32c63e75a70a0ed9d6887a55fcb0e4531a6ad617
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 4 14:59:21 2020 +1000

    wrap a declaration in the same ifdefs as its use
    
    avoids warnings on NetBSD

commit c9e3be9f4b41fda32a2a0138d54c7a6b563bc94d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 4 14:58:46 2020 +1000

    undef TAILQ_CONCAT and friends
    
    Needed for NetBSD. etc that supply these macros

commit 2d8a3b7e8b0408dfeb933ac5cfd3a58f5bac49af
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 3 02:53:51 2020 +0000

    upstream: ensure that certificate extensions are lexically sorted.
    
    Previously if the user specified a custom extension then the everything would
    be in order except the custom ones. bz3198 ok dtucker markus
    
    OpenBSD-Commit-ID: d97deb90587b06cb227c66ffebb2d9667bf886f0

commit a8732d74cb8e72f0c6366015687f1e649f60be87
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 3 02:43:41 2020 +0000

    upstream: allow -A to explicitly enable agent forwarding in scp and
    
    sftp. The default remains to not forward an agent, even when ssh_config
    enables it. ok jmc dtucker markus
    
    OpenBSD-Commit-ID: 36cc526aa3b0f94e4704b8d7b969dd63e8576822

commit ab9105470a83ed5d8197959a1b1f367399958ba1
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Mon Aug 3 02:42:49 2020 +0000

    upstream: clang -Wimplicit-fallthrough does not recognise /*
    
    FALLTHROUGH */ comments, which is the style we currently use, and gives too
    many boring warnings. ok djm
    
    OpenBSD-Commit-ID: 07b5031e9f49f2b69ac5e85b8da4fc9e393992a0

commit ced327b9fb78c94d143879ef4b2a02cbc5d38690
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 31 04:19:37 2020 +0000

    upstream: Also compare username when checking for JumpHost loops.
    
    bz#3057, ok djm@
    
    OpenBSD-Commit-ID: 9bbc1d138adb34c54f3c03a15a91f75dbf418782

commit ae7527010c44b3376b85d036a498f136597b2099
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 31 15:19:04 2020 +1000

    Remove AC_REVISION.
    
    It hasn't been useful since we switched to git in 2014.  ok djm@

commit 89fc3f414be0ce4e8008332a9739a7d721269e50
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 28 19:40:30 2020 +1000

    Use argv in OSSH_CHECK_CFLAG_COMPILE test.
    
    configure.ac is not detecting -Wextra in compilers that implement the
    option. The problem is that -Wextra implies -Wunused-parameter, and the
    C excerpt used by aclocal.m4 does not use argv.  Patch from pedro at
    ambientworks.net, ok djm@

commit 62c81ef531b0cc7ff655455dd34f5f0c94f48e82
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jul 20 22:12:07 2020 +1000

    Skip ECDSA-SK webauthn test when built w/out ECC

commit 3ec9a6d7317236a9994887d8bd5d246af403a00d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 20 13:09:25 2020 +1000

    Add ssh-sk-helper and manpage to RPM spec file
    
    Based on patch from Fabio Pedretti

commit a2855c048b3f4b17d8787bd3f24232ec0cd79abe
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 17 07:09:24 2020 +0000

    upstream: Add %k to the TOKENs for Match Exec for consistency with
    
    the other keywords that recently got %k.
    
    OpenBSD-Commit-ID: 1857d1c40f270cbc254fca91e66110641dddcfdb

commit 69860769fa9f4529d8612ec055ae11912f7344cf
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jul 17 05:59:05 2020 +0000

    upstream: fix macro slip in previous;
    
    OpenBSD-Commit-ID: 624e47ab209450ad9ad5c69f54fa69244de5ed9a

commit 40649bd0822883b684183854b16d0b8461d5697b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 17 07:10:24 2020 +0000

    upstream: Add test for '%k' (HostKeyAlias) TOKEN.
    
    OpenBSD-Regress-ID: 8ed1ba1a811790031aad3fcea860a34ad7910456

commit 6736fe680704a3518cb4f3f8f6723b00433bd3dd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 17 03:26:58 2020 +0000

    upstream: Add tests for expansions on UserKnownHostsFile.
    
    OpenBSD-Regress-ID: bccf8060306c841bbcceb1392644f906a4d6ca51

commit 287dc6396e0f9cb2393f901816dbd7f2a7dfbb5f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 17 03:51:32 2020 +0000

    upstream: log error message for process_write() write failures
    
    OpenBSD-Commit-ID: f733d7b3b05e3c68967dc18dfe39b9e8fad29851

commit 8df5774a42d2eaffe057bd7f293fc6a4b1aa411c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 17 03:43:42 2020 +0000

    upstream: Add a '%k' TOKEN that expands to the effective HostKey of
    
    the destination.  This allows, eg, keeping host keys in individual files
    using "UserKnownHostsFile ~/.ssh/known_hosts.d/%k". bz#1654, ok djm@, jmc@
    (man page bits)
    
    OpenBSD-Commit-ID: 7084d723c9cc987a5c47194219efd099af5beadc

commit c4f239944a4351810fd317edf408bdcd5c0102d9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 17 03:23:10 2020 +0000

    upstream: Add %-TOKEN, environment variable and tilde expansion to
    
    UserKnownHostsFile, allowing the file to be automagically split up in the
    configuration (eg bz#1654).  ok djm@, man page parts jmc@
    
    OpenBSD-Commit-ID: 7e1b406caf147638bb51558836a72d6cc0bd1b18

commit dbaaa01daedb423c38124a72c471982fb08a16fb
Author: solene@openbsd.org <solene@openbsd.org>
Date:   Wed Jul 15 07:50:46 2020 +0000

    upstream: - Add [-a rounds] in ssh-keygen man page and usage() -
    
    Reorder parameters list in the first usage() case - Sentence rewording
    
    ok dtucker@
    jmc@ noticed usage() missed -a flag too
    
    OpenBSD-Commit-ID: f06b9afe91cc96f260b929a56e9930caecbde246

commit 69924a92c3af7b99a7541aa544a2334ec0fb092c
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Jul 15 05:40:05 2020 +0000

    upstream: start sentence with capital letter;
    
    OpenBSD-Commit-ID: ab06581d51b2b4cc1b4aab781f7f3cfa56cad973

commit 5b56bd0affea7b02b540bdbc4d1d271b0e4fc885
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 17 13:15:50 2020 +1000

    detect Linux/X32 systems
    
    This is a frankenstein monster of AMD64 instructions/calling conventions
    but with a 4GB address space. Allegedly deprecated but people still run
    into it causing weird sandbox failures, e.g. bz#3085

commit 9c9ddc1391d6af8d09580a2424ab467d0a5df3c7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jul 15 06:43:16 2020 +0000

    upstream: Fix previous by calling the correct function.
    
    OpenBSD-Regress-ID: 821cdd1dff9c502cceff4518b6afcb81767cad5a

commit f1a4798941b4372bfe5e46f1c0f8672fe692d9e4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jul 15 05:36:50 2020 +0000

    upstream: Update test to match recent change in match.c
    
    OpenBSD-Regress-ID: 965bda1f95f09a765050707340c73ad755f41167

commit d7e71be4fd57b7c7e620d733cdf2333b27bfa924
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 15 15:30:43 2020 +1000

    Adjust portable code to match changes in 939d787d,

commit fec89f32a84fd0aa1afc81deec80a460cbaf451a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jul 15 04:27:34 2020 +0000

    upstream: Add default for number of rounds (-a). ok djm@
    
    OpenBSD-Commit-ID: cb7e9aa04ace01a98e63e4bd77f34a42ab169b15

commit aaa8b609a7b332be836cd9a3b782422254972777
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 14 23:57:01 2020 +0000

    upstream: allow some additional control over the use of ssh-askpass
    
    via $SSH_ASKPASS_REQUIRE, including force-enable/disable. bz#69 ok markus@
    
    OpenBSD-Commit-ID: 3a1e6cbbf6241ddc4405c4246caa2c249f149eb2

commit 6368022cd4dd508671c4999a59ec5826df098530
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Tue Jul 7 02:47:21 2020 +0000

    upstream: correct recently broken comments
    
    OpenBSD-Commit-ID: 964d9a88f7de1d0eedd3f8070b43fb6e426351f1

commit 6d755706a0059eb9e2d63517f288b75cbc3b4701
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jul 5 23:59:45 2020 +0000

    upstream: some language improvements; ok markus
    
    OpenBSD-Commit-ID: 939d787d571b4d5da50b3b721fd0b2ac236acaa8

commit b0c1e8384d5e136ebdf895d1434aea7dd8661a1c
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Jul 3 10:12:26 2020 +0000

    upstream: update setproctitle after re-exec; ok djm
    
    OpenBSD-Commit-ID: bc92d122f9184ec2a9471ade754b80edd034ce8b

commit cd119a5ec2bf0ed5df4daff3bd14f8f7566dafd3
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Jul 3 10:11:33 2020 +0000

    upstream: keep ignoring HUP after fork+exec; ok djm
    
    OpenBSD-Commit-ID: 7679985a84ee5ceb09839905bb6f3ddd568749a2

commit 8af4a743693ccbea3e15fc9e93edbeb610fa94f4
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Jul 3 10:10:17 2020 +0000

    upstream: don't exit the listener on send_rexec_state errors; ok
    
    djm
    
    OpenBSD-Commit-ID: 57cbd757d130d3f45b7d41310b3a15eeec137d5c

commit 03da4c2b70468f04ed1c08518ea0a70e67232739
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jul 15 04:55:47 2020 +0000

    upstream: Use $OBJ to find key files. Fixes test when run on an obj
    
    directory (on OpenBSD) or out of tree (in Portable).
    
    OpenBSD-Regress-ID: 938fa8ac86adaa527d64a305bd2135cfbb1c0a17

commit 73f20f195ad18f1cf633eb7d8be95dc1b6111eea
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 4 23:11:23 2020 +1000

    Wrap stdint.h in ifdef HAVE_STDINT_H.

commit aa6fa4bf3023fa0e5761cd8f4b2cd015d2de74dd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 3 07:25:18 2020 +0000

    upstream: put back the mux_ctx memleak fix, but only for channels of
    
    type SSH_CHANNEL_MUX_LISTENER; Specifically SSH_CHANNEL_MUX_PROXY channels
    should not have this structure freed.
    
    OpenBSD-Commit-ID: f3b213ae60405f77439e2b06262f054760c9d325

commit d8195914eb43b20b13381f4e5a74f9f8a14f0ded
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 3 07:17:35 2020 +0000

    upstream: revert r1.399 - the lifetime of c->mux_ctx is more complex;
    
    simply freeing it here causes other problems
    
    OpenBSD-Commit-ID: c6fee8ca94e2485faa783839541962be2834c5ed

commit 20b5fab9f773b3d3c7f06cb15b8f69a2c081ee80
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 3 07:02:37 2020 +0000

    upstream: avoid tilde_expand_filename() in expanding ~/.ssh/rc - if
    
    sshd is in chroot mode, the likely absence of a password database will cause
    tilde_expand_filename() to fatal; ok dtucker@
    
    OpenBSD-Commit-ID: e20aee6159e8b79190d18dba1513fc1b7c8b7ee1

commit c8935081db35d73ee6355999142fa0776a2af912
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 3 06:46:41 2020 +0000

    upstream: when redirecting sshd's log output to a file, undo this
    
    redirection after the session child process is forked(); ok dtucker@
    
    OpenBSD-Commit-ID: 6df86dd653c91f5bc8ac1916e7680d9d24690865

commit 183c4aaef944af3a1a909ffa01058c65bac55748
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 3 06:29:57 2020 +0000

    upstream: start ClientAliveInterval bookkeeping before first pass
    
    through select() loop; fixed theoretical case where busy sshd may ignore
    timeouts from client; inspired by and ok dtucker
    
    OpenBSD-Commit-ID: 96bfc4b1f86c7da313882a84755b2b47eb31957f

commit 6fcfd303d67f16695198cf23d109a988e40eefb6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 3 15:28:27 2020 +1000

    add check for fido_cred_set_prot() to configure

commit f11b23346309e4d5138e733a49321aedd6eeaa2f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 3 05:09:06 2020 +0000

    upstream: Only reset the serveralive check when we receive traffic from
    
    the server and ignore traffic from a port forwarding client, preventing a
    client from keeping a connection alive when it should be terminated.  Based
    on a patch from jxraynor at gmail.com via openssh-unix-dev and bz#2265, ok
    djm@
    
    OpenBSD-Commit-ID: a941a575a5cbc244c0ef5d7abd0422bbf02c2dcd

commit adfdbf1211914b631c038f0867a447db7b519937
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 3 15:15:15 2020 +1000

    sync sys-queue.h with OpenBSD upstream
    
    needed for TAILQ_CONCAT

commit 1b90ddde49e2ff377204082b6eb130a096411dc1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 3 05:08:41 2020 +0000

    upstream: fix memory leak of mux_ctx; patch from Sergiy Lozovsky
    
    via bz3189 ok dtucker
    
    OpenBSD-Commit-ID: db249bd4526fd42d0f4f43f72f7b8b7705253bde

commit 55ef3e9cbd5b336bd0f89205716924886fcf86de
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jul 1 16:28:31 2020 +0000

    upstream: free kex in ssh_packet_close; ok djm semarie
    
    OpenBSD-Commit-ID: dbc181e90d3d32fd97b10d75e68e374270e070a2

commit e1c401109b61f7dbc199b5099933d579e7fc5dc9
Author: bket@openbsd.org <bket@openbsd.org>
Date:   Sat Jun 27 13:39:09 2020 +0000

    upstream: Replace TAILQ concatenation loops with TAILQ_CONCAT
    
    OK djm@
    
    OpenBSD-Commit-ID: 454b40e09a117ddb833794358970a65b14c431ef

commit 14beca57ac92d62830c42444c26ba861812dc837
Author: semarie@openbsd.org <semarie@openbsd.org>
Date:   Fri Jun 26 11:26:01 2020 +0000

    upstream: backout 1.293 fix kex mem-leak in ssh_packet_close at markus
    
    request
    
    the change introduced a NULL deref in sshpkt_vfatal() (uses of ssh->kex after
    calling ssh_packet_clear_keys())
    
    OpenBSD-Commit-ID: 9c9a6721411461b0b1c28dc00930d7251a798484

commit 598c3a5e3885080ced0d7c40fde00f1d5cdbb32b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 26 16:07:12 2020 +1000

    document a PAM spec problem in a frustrated comment

commit 976c4f86286d52a0cb2aadf4a095d379c0da752e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 26 05:42:16 2020 +0000

    upstream: avoid spurious error message when ssh-keygen creates files
    
    outside ~/.ssh; with dtucker@
    
    OpenBSD-Commit-ID: ac0c662d44607e00ec78c266ee60752beb1c7e08

commit 32b2502a9dfdfded1ccdc1fd6dc2b3fe41bfc205
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 26 15:30:06 2020 +1000

    missing ifdef SELINUX; spotted by dtucker

commit e073106f370cdd2679e41f6f55a37b491f0e82fe
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 26 05:12:21 2020 +0000

    upstream: regress test for ssh-add -d; ok dtucker@
    
    OpenBSD-Regress-ID: 3a2e044be616afc7dd4f56c100179e83b33d8abf

commit c809daaa1bad6b1c305b0e0b5440360f32546c84
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jun 24 15:16:23 2020 +0000

    upstream: add test for mux w/-Oproxy; ok djm
    
    OpenBSD-Regress-ID: 764d5c696e2a259f1316a056e225e50023abb027

commit 3d06ff4bbd3dca8054c238d2a94c0da563ef7eee
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 26 05:16:38 2020 +0000

    upstream: handle EINTR in waitfd() and timeout_connect() helpers;
    
    bz#3071; ok dtucker@
    
    OpenBSD-Commit-ID: 08fa87be50070bd8b754d9b1ebb1138d7bc9d8ee

commit fe2ec0b9c19adeab0cd9f04b8152dc17f31c31e5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 26 05:04:07 2020 +0000

    upstream: allow "ssh-add -d -" to read keys to be deleted from
    
    stdin bz#3180; ok dtucker@
    
    OpenBSD-Commit-ID: 15c7f10289511eb19fce7905c9cae8954e3857ff

commit a3e0c376ffc11862fa3568b28188bd12965973e1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 26 05:03:36 2020 +0000

    upstream: constify a few things; ok dtucker (as part of another
    
    diff)
    
    OpenBSD-Commit-ID: 7c17fc987085994d752304bd20b1ae267a9bcdf6

commit 74344c3ca42c3f53b00b025daf09ae7f6aa38076
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 26 05:02:03 2020 +0000

    upstream: Defer creation of ~/.ssh by ssh(1) until we attempt to
    
    write to it so we don't leave an empty .ssh directory when it's not needed.
    Use the same function to replace the code in ssh-keygen that does the same
    thing. bz#3156, ok djm@
    
    OpenBSD-Commit-ID: 59c073b569be1a60f4de36f491a4339bc4ae870f

commit c9e24daac6324fcbdba171392c325bf9ccc3c768
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 26 04:45:11 2020 +0000

    upstream: Expand path to ~/.ssh/rc rather than relying on it
    
    being relative to the current directory, so that it'll still be found if the
    shell startup changes its directory.  Since the path is potentially longer,
    make the cmd buffer that uses it dynamically sized.  bz#3185, with & ok djm@
    
    OpenBSD-Commit-ID: 36e33ff01497af3dc8226d0c4c1526fc3a1e46bf

commit 07f5f369a25e228a7357ef6c57205f191f073d99
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jun 24 15:12:09 2020 +0000

    upstream: fix kex mem-leak in ssh_packet_close; ok djm
    
    OpenBSD-Commit-ID: e2e9533f393620383afd0b68ef435de8d5e8abe4

commit e35995088cd6691a712bfd586bae8084a3a922ba
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jun 24 15:10:38 2020 +0000

    upstream: fix ssh -O proxy w/mux which got broken by no longer
    
    making ssh->kex optional in packet.c revision 1.278 ok djm@
    
    OpenBSD-Commit-ID: 2b65df04a064c2c6277359921d2320c90ab7d917

commit 250246fef22b87a54a63211c60a2def9be431fbd
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jun 24 15:09:53 2020 +0000

    upstream: support loading big sshd_config files w/o realloc; ok
    
    djm
    
    OpenBSD-Commit-ID: ba9238e810074ac907f0cf8cee1737ac04983171

commit 89b54900ac61986760452f132bbe3fb7249cfdac
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jun 24 15:08:53 2020 +0000

    upstream: allow sshd_config longer than 256k; ok djm
    
    OpenBSD-Commit-ID: 83f40dd5457a64c1d3928eb4364461b22766beb3

commit e3fa6249e6d9ceb57c14b04dd4c0cfab12fa7cd5
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jun 24 15:07:33 2020 +0000

    upstream: only call sshkey_xmss_init() once for KEY_XMSS_CERT; ok
    
    djm
    
    OpenBSD-Commit-ID: d0002ffb7f20f538b014d1d0735facd5a81ff096

commit 37f2da069c0619f2947fb92785051d82882876d7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 22 23:44:27 2020 +0000

    upstream: some clarifying comments
    
    OpenBSD-Commit-ID: 5268479000fd97bfa30ab819f3517139daa054a2

commit b659319a5bc9e8adf3c4facc51f37b670d2a7426
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Jun 22 06:37:38 2020 +0000

    upstream: updated argument name for -P in first synopsis was
    
    missed in previous;
    
    OpenBSD-Commit-ID: 8d84dc3050469884ea91e29ee06a371713f2d0b7

commit 02a9222cbce7131d639984c2f6c71d1551fc3333
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Jun 22 06:36:40 2020 +0000

    upstream: supply word missing in previous;
    
    OpenBSD-Commit-ID: 16a38b049f216108f66c8b699aa046063381bd23

commit 5098b3b6230852a80ac6cef5d53a785c789a5a56
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 22 16:54:02 2020 +1000

    missing files for webauthn/sshsig unit test

commit 354535ff79380237924ac8fdc98f8cdf83e67da6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 22 06:00:06 2020 +0000

    upstream: add support for verification of webauthn sshsig signature,
    
    and example HTML/JS to generate webauthn signatures in SSH formats (also used
    to generate the testdata/* for the test).
    
    OpenBSD-Regress-ID: dc575be5bb1796fdf4b8aaee0ef52a6671a0f6fb

commit bb52e70fa5330070ec9a23069c311d9e277bbd6f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 22 05:58:35 2020 +0000

    upstream: Add support for FIDO webauthn (verification only).
    
    webauthn is a standard for using FIDO keys in web browsers. webauthn
    signatures are a slightly different format to plain FIDO signatures - this
    support allows verification of these. Feedback and ok markus@
    
    OpenBSD-Commit-ID: ab7e3a9fb5782d99d574f408614d833379e564ad

commit 64bc121097f377142f1387ffb2df7592c49935af
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 22 05:56:23 2020 +0000

    upstream: refactor ECDSA-SK verification a little ahead of adding
    
    support for FIDO webauthn signature verification support; ok markus@
    
    OpenBSD-Commit-ID: c9f478fd8e0c1bd17e511ce8694f010d8e32043e

commit 12848191f8fe725af4485d3600e0842d92f8637f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 22 05:54:10 2020 +0000

    upstream: support for RFC4648 base64url encoding; ok markus
    
    OpenBSD-Commit-ID: 0ef22c55e772dda05c112c88412c0797fec66eb4

commit 473b4af43db12127137c7fc1a10928313f5a16d2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 22 05:53:26 2020 +0000

    upstream: better terminology for permissions; feedback & ok markus@
    
    OpenBSD-Commit-ID: ff2a71803b5ea57b83cc3fa9b3be42b70e462fb9

commit fc270baf264248c3ee3050b13a6c8c0919e6559f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 22 05:52:05 2020 +0000

    upstream: better terminology for permissions; feedback & ok markus@
    
    OpenBSD-Commit-ID: ffb220b435610741dcb4de0e7fc68cbbdc876d2c

commit 00531bb42f1af17ddabea59c3d9c4b0629000d27
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 19 07:21:42 2020 +0000

    upstream: Correct synopsis and usage for the options accepted when
    
    passing a command to ssh-agent.  ok jmc@
    
    OpenBSD-Commit-ID: b36f0679cb0cac0e33b361051b3406ade82ea846

commit b4556c8ad7177e379f0b60305a0cd70f12180e7c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 19 19:22:00 2020 +1000

    Add OPENBSD ORIGINAL marker to bcrypt_pbkdf.

commit 1babb8bb14c423011ca34c2f563bb1c51c8fbf1d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 19 19:10:47 2020 +1000

    Extra brackets around sizeof() in bcrypt.
    
    Prevents following warning from clang 10:
    bcrypt_pbkdf.c:94:40: error: expression does not compute the number of
      elements in this array; element type is ´uint32_tÂ[...]
      place parentheses around the ´sizeof(uint64_t)´ expression to
      silence this warning

commit 9e065729592633290e5ddb6852792913b2286545
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 19 18:47:56 2020 +1000

    Add includes.h to new test.
    
    Fixes warnings eg "´bounded´ attribute directive ignor" from gcc.

commit e684b1ea365e070433f282a3c1dabc3e2311ce49
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 19 18:38:39 2020 +1000

    Skip OpenSSL specific tests w/out OpenSSL.
    
    Allows unit tests to pass when configure'ed --without-openssl.

commit 80610e97a76407ca982e62fd051c9be03622fe7b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 19 17:15:27 2020 +1000

    Hook sshsig tests up to Portable Makefiles.

commit 5dba1fcabacaab46693338ec829b42a1293d1f52
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 19 05:07:09 2020 +0000

    upstream: Test that ssh-agent exits when running as as subprocess
    
    of a specified command (ie "ssh-agent command").  Would have caught bz#3181.
    
    OpenBSD-Regress-ID: 895b4765ba5153eefaea3160a7fe08ac0b6db8b3

commit 68e8294f6b04f9590ea227e63d3e129398a49e27
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 19 04:34:21 2020 +0000

    upstream: run sshsig unit tests
    
    OpenBSD-Regress-ID: 706ef17e2b545b64873626e0e35553da7c06052a

commit 5edfa1690e9a75048971fd8775f7c16d153779db
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 19 04:32:09 2020 +0000

    upstream: basic unit test for sshsig.[ch], including FIDO keys
    
    verification only so far
    
    OpenBSD-Regress-ID: fb1f946c8fc59206bc6a6666e577b5d5d7e45896

commit e95c0a0e964827722d29b4bc00d5c0ff4afe0ed2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 19 03:48:49 2020 +0000

    upstream: basic unit test for FIDO kep parsing
    
    OpenBSD-Regress-ID: 8089b88393dd916d7c95422b442a6fd4cfe00c82

commit 7775819c6de3e9547ac57b87c7dd2bfd28cefcc5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 18 23:34:19 2020 +0000

    upstream: check public host key matches private; ok markus@ (as
    
    part of previous diff)
    
    OpenBSD-Commit-ID: 65a4f66436028748b59fb88b264cb8c94ce2ba63

commit c514f3c0522855b4d548286eaa113e209051a6d2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 18 23:33:38 2020 +0000

    upstream: avoid spurious "Unable to load host key" message when
    
    sshd can load a private key but no public counterpart; with & ok markus@
    
    OpenBSD-Commit-ID: 0713cbdf9aa1ff8ac7b1f78b09ac911af510f81b

commit 7fafaeb5da365f4a408fec355dac04a774f27193
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 12 05:26:37 2020 +0000

    upstream: correct RFC number; from HARUYAMA Seigo via GH PR191
    
    OpenBSD-Commit-ID: 8d03b6c96ca98bfbc23d3754c3c33e1fe0852e10

commit 3a7f654d5bcb20df24a134b6581b0d235da4564a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 5 06:18:07 2020 +0000

    upstream: unbreak "sshd -ddd" - close of config passing fd happened too
    
    early. ok markus@
    
    OpenBSD-Commit-ID: 49346e945c6447aca3e904e65fc400128d2f8ed0

commit 3de02be39e5c0c2208d9682a3844991651620fcc
Author: Andreas Schwab <schwab@suse.de>
Date:   Mon May 25 11:10:44 2020 +0200

    Add support for AUDIT_ARCH_RISCV64

commit ea547eb0329c2f8da77a4ac05f6c330bd49bdaab
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 5 03:25:35 2020 +0000

    upstream: make sshbuf_putb(b, NULL) a no-op
    
    OpenBSD-Commit-ID: 976fdc99b500e347023d430df372f31c1dd128f7

commit 69796297c812640415c6cea074ea61afc899cbaa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 5 03:24:36 2020 +0000

    upstream: make sshbuf_dump() args const
    
    OpenBSD-Commit-ID: b4a5accae750875d665b862504169769bcf663bd

commit 670428895739d1f79894bdb2457891c3afa60a59
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 5 03:24:16 2020 +0000

    upstream: wrap long line
    
    OpenBSD-Commit-ID: ed405a12bd27bdc9c52e169bc5ff3529b4ebbbb2

commit 2f648cf222882719040906722b3593b01df4ad1a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 5 03:15:26 2020 +0000

    upstream: Correct historical comment: provos@ modified OpenSSH to
    
    work with SSLeay (very quickly replaced by OpenSSL) not SSL in general.  ok
    deraadt, historical context markus@
    
    OpenBSD-Commit-ID: 7209e07a2984b50411ed8ca5a4932da5030d2b90

commit 56548e4efcc3e3e8093c2eba30c75b23e561b172
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jun 3 08:23:18 2020 +0000

    upstream: Import regenerated moduli file.
    
    OpenBSD-Commit-ID: 52ff0e3205036147b2499889353ac082e505ea54

commit 8da801f585dd9c534c0cbe487a3b1648036bf2fb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 5 13:20:10 2020 +1000

    Test fallthrough in OSSH_CHECK_CFLAG_COMPILE.
    
    clang 10's -Wimplicit-fallthrough does not understand /* FALLTHROUGH */
    comments and we don't use the __attribute__((fallthrough)) that it's
    looking for.  This has the effect of turning off -Wimplicit-fallthrough
    where it does not currently help (particularly with -Werror).  ok djm@

commit 049297de975b92adcc2db77e3fb7046c0e3c695d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jun 3 08:23:18 2020 +0000

    upstream: Import regenerated moduli file.
    
    OpenBSD-Commit-ID: 52ff0e3205036147b2499889353ac082e505ea54

commit b458423a38a3140ac022ffcffcb332609faccfe3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jun 1 07:11:38 2020 +0000

    upstream: Remove now-unused proto_spec and associated definitions.
    
    ok djm@
    
    OpenBSD-Commit-ID: 2e2b18e3aa6ee22a7b69c39f2d3bd679ec35c362

commit 5ad3c3a33ef038b55a14ebd31faeeec46073db2c
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Fri May 29 21:22:02 2020 +0000

    upstream: Fix error message on close(2) and add printf format
    
    attributes. From Christos Zoulas, OK markus@
    
    OpenBSD-Commit-ID: 41523c999a9e3561fcc7082fd38ea2e0629ee07e

commit 712ac1efb687a945a89db6aa3e998c1a17b38653
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 29 11:17:56 2020 +0000

    upstream: Make dollar_expand variadic and pass a real va_list to
    
    vdollar_percent_expand. Fixes build error on arm64 spotted by otto@.
    
    OpenBSD-Commit-ID: 181910d7ae489f40ad609b4cf4a20f3d068a7279

commit 837ffa9699a9cba47ae7921d2876afaccc027133
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 29 20:39:00 2020 +1000

    Omit ToS setting if we don't have IPV6_TCLASS too.
    
    Fixes tests on old BSDs.

commit f85b118d2150847cc333895296bc230e367be6b5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 29 09:02:44 2020 +0000

    upstream: Pass a NULL instead of zeroed out va_list from
    
    dollar_expand.  The original intent was in case there's some platform where
    va_list is not a pointer equivalent, but on i386 this chokes on the memset.
    This unbreaks that build, but will require further consideration.
    
    OpenBSD-Commit-ID: 7b90afcd8e1137a1d863204060052aef415baaf7

commit ec1d50b01c84ff667240ed525f669454c4ebc8e9
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri May 29 05:48:39 2020 +0000

    upstream: remove a stray .El;
    
    OpenBSD-Commit-ID: 58ddfe6f8a15fe10209db6664ecbe7896f1d167c

commit 058674a62ffe33f01d871d46e624bc2a2c22d91f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 29 04:32:26 2020 +0000

    upstream: Add regression and unit tests for ${ENV} style
    
    environment variable expansion in various keywords (bz#3140).  ok djm@
    
    OpenBSD-Regress-ID: 4d9ceb95d89365b7b674bc26cf064c15a5bbb197

commit 0b15892fc47d6840eba1291a6be9be1a70bc8972
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 29 01:21:35 2020 +0000

    upstream: Unit test for convtime. ok djm@
    
    OpenBSD-Regress-ID: cec4239efa2fc4c7062064f07a847e1cbdbcd5dd

commit 188e332d1c8f9f24e5b6659e9680bf083f837df9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 29 05:37:03 2020 +0000

    upstream: mention that wildcards are processed in lexical order;
    
    bz#3165
    
    OpenBSD-Commit-ID: 8856f3d1612bd42e9ee606d89386cae456dd165c

commit 4a1b46e6d032608b7ec00ae51c4e25b82f460b05
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 29 04:25:40 2020 +0000

    upstream: Allow some keywords to expand shell-style ${ENV}
    
    environment variables on the client side.  The supported keywords are
    CertificateFile, ControlPath, IdentityAgent and IdentityFile, plus
    LocalForward and RemoteForward when used for Unix domain socket paths.  This
    would for example allow forwarding of Unix domain socket paths that change at
    runtime.  bz#3140, ok djm@
    
    OpenBSD-Commit-ID: a4a2e801fc2d4df2fe0e58f50d9c81b03822dffa

commit c9bab1d3a9e183cef3a3412f57880a0374cc8cb2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 29 14:49:16 2020 +1000

    depend

commit 0b0d219313bf9239ca043f20b1a095db0245588f
Author: sobrado <sobrado@openbsd.org>
Date:   Thu Sep 3 23:06:28 2015 +0000

    partial sync of regress/netcat.c with upstream
    
    synchronize synopsis and usage.

commit 0f04c8467f589f85a523e19fd684c4f6c4ed9482
Author: chl <chl@openbsd.org>
Date:   Sun Jul 26 19:12:28 2015 +0000

    partial sync of regress/netcat.c with upstream
    
    remove unused variable
    
    ok tedu@

commit d6a81050ace2630b06c3c6dd39bb4eef5d1043f8
Author: tobias <tobias@openbsd.org>
Date:   Thu Mar 26 21:22:50 2015 +0000

    partial sync of regress/netcat.c with upstream
    
    The code in socks.c writes multiple times in a row to a socket. If the socket becomes invalid between these calls (e.g. connection closed), write will throw SIGPIPE. With this patch, SIGPIPE is ignored so we can handle write's -1 return value (errno will be EPIPE). Ultimately, it leads to program exit, too -- but with nicer error message. :)
    
    with input by and ok djm

commit bf3893dddd35e16def04bf48ed2ee1ad695b8f82
Author: tobias <tobias@openbsd.org>
Date:   Thu Mar 26 10:36:03 2015 +0000

    partial sync of regress/netcat.c with upstream
    
    Check for short writes in fdpass(). Clean up while at it.
    
    ok djm

commit e18435fec124b4c08eb6bbbbee9693dc04f4befb
Author: jca <jca@openbsd.org>
Date:   Sat Feb 14 22:40:22 2015 +0000

    partial sync of regress/netcat.c with upstream
    
    Support for nc -T on IPv6 addresses.
    
    ok sthen@

commit 4c607244054a036ad3b2449a6cb4c15feb846a76
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 29 03:14:02 2020 +0000

    upstream: fix compilation on !HAVE_DLOPEN platforms; stub function
    
    was not updated to match API change. From Dale Rahn via beck@ ok markus@
    
    OpenBSD-Commit-ID: 2b8d054afe34c9ac85e417dae702ef981917b836

commit 224418cf55611869a4ace1b8b07bba0dff77a9c3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 29 03:11:54 2020 +0000

    upstream: fix exit status for downloading of FIDO resident keys;
    
    from Pedro Martelletto, ok markus@
    
    OpenBSD-Commit-ID: 0da77dc24a1084798eedd83c39a002a9d231faef

commit 1001dd148ed7c57bccf56afb40cb77482ea343a6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 29 01:20:46 2020 +0000

    upstream: Fix multiplier in convtime when handling seconds after
    
    other units. bz#3171, spotted by ronf at timeheart.net, ok djm@.
    
    OpenBSD-Commit-ID: 95b7a848e1083974a65fbb6ccb381d438e1dd5be

commit 7af1e92cd289b7eaa9a683e9a6f2fddd98f37a01
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 27 22:37:53 2020 +0000

    upstream: fix Include before Match in sshd_config; bz#3122 patch
    
    from Jakub Jelen
    
    OpenBSD-Commit-ID: 1b0aaf135fe6732b5d326946042665dd3beba5f4

commit 0a9a611619b0a1fecd0195ec86a9885f5d681c84
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 27 21:59:11 2020 +0000

    upstream: Do not call process_queued_listen_addrs() for every
    
    included file from sshd_config; patch from Jakub Jelen
    
    OpenBSD-Commit-ID: 0ff603d6f06a7fab4881f12503b53024799d0a49

commit 16ea1fdbe736648f79a827219134331f8d9844fb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 27 21:25:18 2020 +0000

    upstream: fix crash in recallocarray when deleting SendEnv
    
    variables; spotted by & ok sthen@
    
    OpenBSD-Commit-ID: b881e8e849edeec5082b5c0a87d8d7cff091a8fd

commit 47adfdc07f4f8ea0064a1495500244de08d311ed
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 27 22:35:19 2020 +0000

    upstream: two new tests for Include in sshd_config, checking whether
    
    Port directives are processed correctly and handling of Include directives
    that appear before Match. Both tests currently fail. bz#3122 and bz#3169 -
    patch from Jakub Jelen
    
    OpenBSD-Regress-ID: 8ad5a4a385a63f0a1c59c59c763ff029b45715df

commit 47faad8f794516c33864d866aa1b55d88416f94c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed May 27 23:26:23 2020 +1000

    Document that libfido2 >= 1.4.0 is needed.

commit 4be563994c0cbe9856e7dd3078909f41beae4a9c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 26 01:59:46 2020 +0000

    upstream: fix memleak of signature; from Pedro Martelletto
    
    OpenBSD-Commit-ID: d0a6eb07e77c001427d738b220dd024ddc64b2bb

commit 0c111eb84efba7c2a38b2cc3278901a0123161b9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 26 01:26:58 2020 +0000

    upstream: Restrict ssh-agent from signing web challenges for FIDO
    
    keys.
    
    When signing messages in ssh-agent using a FIDO key that has an
    application string that does not start with "ssh:", ensure that the
    message being signed is one of the forms expected for the SSH protocol
    (currently pubkey authentication and sshsig signatures).
    
    This prevents ssh-agent forwarding on a host that has FIDO keys
    attached granting the ability for the remote side to sign challenges
    for web authentication using those keys too.
    
    Note that the converse case of web browsers signing SSH challenges is
    already precluded because no web RP can have the "ssh:" prefix in the
    application string that we require.
    
    ok markus@
    
    OpenBSD-Commit-ID: 9ab6012574ed0352d2f097d307f4a988222d1b19

commit 9c5f64b6cb3a68b99915202d318b842c6c76cf14
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 26 01:09:05 2020 +0000

    upstream: improve logging for MaxStartups connection throttling:
    
    have sshd log when it starts and stops throttling and periodically while in
    this state. bz#3055 ok markus@
    
    OpenBSD-Commit-ID: 2e07a09a62ab45d790d3d2d714f8cc09a9ac7ab9

commit 756c6f66aee83a5862a6f936a316f761532f3320
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 26 01:06:52 2020 +0000

    upstream: add fmt_timeframe() (from bgpd) to format a time
    
    interval in a human- friendly format. Switch copyright for this file from BSD
    to MIT to make it easier to add Henning's copyright for this function. ok
    markus@
    
    OpenBSD-Commit-ID: 414a831c662df7e68893e5233e86f2cac081ccf9

commit 2a63ce5cd6d0e782783bf721462239b03757dd49
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 18 04:29:35 2020 +0000

    upstream: avoid possible NULL deref; from Pedro Martelletto
    
    OpenBSD-Commit-ID: e6099c3fbb70aa67eb106e84d8b43f1fa919b721

commit 4b307faf2fb0e63e51a550b37652f7f972df9676
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri May 15 08:34:03 2020 +0000

    upstream: sshd listener must not block if reexecd sshd exits
    
    in write(2) on config_s[0] if the forked child exits early before finishing
    recv_rexec_state (e.g. with fatal()) because config_s[1] stays open in the
    parent. this prevents the parent from accepting new connections. ok djm,
    deraadt
    
    OpenBSD-Commit-ID: 92ccfeb939ccd55bda914dc3fe84582158c4a9ef

commit af8b16fb2cce880341c0ee570ceb0d84104bdcc0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 15 03:57:33 2020 +0000

    upstream: fix off-by-one error that caused sftp downloads to make
    
    one more concurrent request that desired. This prevented using sftp(1) in
    unpipelined request/response mode, which is useful when debugging. Patch from
    Stephen Goetze in bz#3054
    
    OpenBSD-Commit-ID: 41b394ebe57037dbc43bdd0eef21ff0511191f28

commit d7d753e2979f2d3c904b03a08d30856cd2a6e892
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed May 13 22:38:41 2020 +0000

    upstream: we are still aiming for pre-C99 ...
    
    OpenBSD-Commit-ID: a240fc9cbe60bc4e6c3d24d022eb4ab01fe1cb38

commit 2ad7b7e46408dbebf2a4efc4efd75a9544197d57
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 13 10:08:02 2020 +0000

    upstream: Enable credProtect extension when generating a resident
    
    key.
    
    The FIDO 2.1 Client to Authenticator Protocol introduced a "credProtect"
    feature to better protect resident keys. This option allows (amone other
    possibilities) requiring a PIN prior to all operations that may retrieve
    the key handle.
    
    Patch by Pedro Martelletto; ok djm and markus
    
    OpenBSD-Commit-ID: 013bc06a577dcaa66be3913b7f183eb8cad87e73

commit 1e70dc3285fc9b4f6454975acb81e8702c23dd89
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 13 09:57:17 2020 +0000

    upstream: always call fido_init(); previous behaviour only called
    
    fido_init() when SK_DEBUG was defined. Harmless with current libfido2, but
    this isn't guaranteed in the future.
    
    OpenBSD-Commit-ID: c7ea20ff2bcd98dd12015d748d3672d4f01f0864

commit f2d84f1b3fa68d77c99238d4c645d0266fae2a74
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 13 09:55:57 2020 +0000

    upstream: preserve group/world read permission on known_hosts
    
    file across runs of "ssh-keygen -Rf /path". The old behaviour was to remove
    all rights for group/other. bz#3146 ok dtucker@
    
    OpenBSD-Commit-ID: dc369d0e0b5dd826430c63fd5f4b269953448a8a

commit 05a651400da6fbe12296c34e3d3bcf09f034fbbf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 13 09:52:41 2020 +0000

    upstream: when ordering the hostkey algorithms to request from a
    
    server, prefer certificate types if the known_hosts files contain a key
    marked as a @cert-authority; bz#3157 ok markus@
    
    OpenBSD-Commit-ID: 8f194573e5bb7c01b69bbfaabc68f27c9fa5e0db

commit 829451815ec207e14bd54ff5cf7e22046816f042
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 12 01:41:32 2020 +0000

    upstream: fix non-ASCII quote that snuck in; spotted by Gabriel
    
    Kihlman
    
    OpenBSD-Commit-ID: 04bcde311de2325d9e45730c744c8de079b49800

commit 5a442cec92c0efd6fffb4af84bf99c70af248ef3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 11 02:11:29 2020 +0000

    upstream: clarify role of FIDO tokens in multi-factor
    
    authentictation; mostly from Pedro Martelletto
    
    OpenBSD-Commit-ID: fbe05685a1f99c74b1baca7130c5a03c2df7c0ac

commit ecb2c02d994b3e21994f31a70ff911667c262f1f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 8 05:13:14 2020 +0000

    upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@
    
    OpenBSD-Commit-ID: 832e771948fb45f2270e8b8895aac36d176ba17a

commit 3ab6fccc3935e9b778ff52f9c8d40f215d58e01d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 14 12:22:09 2020 +1000

    prefer ln to cp for temporary copy of sshd
    
    I saw failures on the reexec fallback test on Darwin 19.4 where
    fork()ed children of a process that had it's executable removed
    would instantly fail. Using ln to preserve the inode avoids this.

commit f700d316c6b15a9cfbe87230d2dca81a5d916279
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed May 13 15:24:51 2020 +1000

    Actually skip pty tests when needed.

commit 08ce6b2210f46f795e7db747809f8e587429dfd2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed May 13 13:56:45 2020 +1000

    Skip building sk-dummy library if no SK support.

commit 102d106bc2e50347d0e545fad6ff5ce408d67247
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 13 12:08:34 2020 +1000

    explicitly manage .depend and .depend.bak
    
    Bring back removal of .depend to give the file a known state before
    running makedepend, but manually move aside the current .depend file
    and restore it as .depend.bak afterwards so the stale .depend check
    works as expected.

commit 83a6dc6ba1e03b3fa39d12a8522b8b0e68dd6390
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 13 12:03:42 2020 +1000

    make depend

commit 7c0bbed967abed6301a63e0267cc64144357a99a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 13 12:01:10 2020 +1000

    revert removal of .depend before makedepend
    
    Commit 83657eac4 started removing .depend before running makedepend
    to reset the contents of .depend to a known state. Unfortunately
    this broke the depend-check step as now .depend.bak would only ever
    be created as an empty file.
    
    ok dtucker

commit 58ad004acdcabf3b9f40bc3aaa206b25d998db8c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 12 12:58:46 2020 +1000

    prepare for 8.3 release

commit 4fa9e048c2af26beb7dc2ee9479ff3323e92a7b5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 8 21:50:43 2020 +1000

    Ensure SA_SIGNAL test only signals itself.
    
    When the test's child signals its parent and it exits the result of
    getppid changes.  On Ubuntu 20.04 this results in the ppid being that
    of the GDM session, causing it to exit.  Analysis and testing from pedro
    at ambientworks.net

commit dc2da29aae76e170d22f38bb36f1f5d1edd5ec2b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 8 13:31:53 2020 +1000

    sync config.guess/config.sub with latest versions
    
    ok dtucker@

commit a8265bd64c14881fc7f4fa592f46dfc66b911f17
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 6 20:58:01 2020 +0000

    upstream: openssh-8.3; ok deraadt@
    
    OpenBSD-Commit-ID: c8831ec88b9c750f5816aed9051031fb535d22c1

commit 955854cafca88e0cdcd3d09ca1ad4ada465364a1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 6 20:57:38 2020 +0000

    upstream: another case where a utimes() failure could make scp send
    
    a desynchronising error; reminded by Aymeric Vincent ok deraadt markus
    
    OpenBSD-Commit-ID: 2ea611d34d8ff6d703a7a8bf858aa5dbfbfa7381

commit 59d531553fd90196946743da391f3a27cf472f4e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 7 15:34:12 2020 +1000

    Check if -D_REENTRANT is needed for localtime_r.
    
    On at least HP-UX 11.11, the localtime_r declararation is behind
    ifdef _REENTRANT.  Check for and add if needed.

commit c13403e55de8cdbb9da628ed95017b1d4c0f205f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue May 5 11:32:43 2020 +1000

    Skip security key tests if ENABLE_SK not set.

commit 4da393f87cd52d788c84112ee3f2191c9bcaaf30
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 04:03:14 2020 +0000

    upstream: sure enough, some of the test data that we though were in
    
    new format were actually in the old format; fix from Michael Forney
    
    OpenBSD-Regress-ID: a41a5c43a61b0f0b1691994dbf16dfb88e8af933

commit 15bfafc1db4c8792265ada9623a96f387990f732
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 04:00:29 2020 +0000

    upstream: make mktestdata.sh generate old/new format keys that we
    
    expect. This script was written before OpenSSH switched to new-format private
    keys by default and was never updated to the change (until now) From Michael
    Forney
    
    OpenBSD-Regress-ID: 38cf354715c96852e5b71c2393fb6e7ad28b7ca7

commit 7882d2eda6ad3eb82220a85294de545d20ef82db
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 03:58:02 2020 +0000

    upstream: portability fix for sed that always emil a newline even
    
    if the input does not contain one; from Michael Forney
    
    OpenBSD-Regress-ID: 9190c3ddf0d2562ccc02c4a95fce0e392196bfc7

commit 8074f9499e454df0acdacea33598858a1453a357
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 03:36:25 2020 +0000

    upstream: remove obsolete RSA1 test keys; spotted by Michael Forney
    
    OpenBSD-Regress-ID: 6384ba889594e217d166908ed8253718ab0866da

commit c697e46c314aa94574af0d393d80f23e0ebc9748
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat May 2 18:34:47 2020 +1000

    Update .depend.

commit 83657eac42941f270c4b02b2c46d9a21f616ef99
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat May 2 18:29:40 2020 +1000

    Remove use of tail for 'make depend'.
    
    Not every tail supports +N and we can do with out it so just remove it.
    Prompted by mforney at mforney.org.

commit d25d630d24c5a1c64d4e646510e79dc22d6d7b88
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat May 2 07:19:43 2020 +0000

    upstream: we have a sshkey_save_public() function to save public keys;
    
    use it and save a bunch of redundant code.
    
    Patch from loic AT venez.fr; ok markus@ djm@
    
    OpenBSD-Commit-ID: f93e030a0ebcd0fd9054ab30db501ec63454ea5f

commit e9dc9863723e111ae05e353d69df857f0169544a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 1 18:32:25 2020 +1000

    Use LONG_LONG_MAX and friends if available.
    
    If we don't have LLONG_{MIN,MAX} but do have LONG_LONG_{MIN,MAX}
    then use those instead.  We do calculate these values in configure,
    but it turns out that at least one compiler (old HP ANSI C) can't
    parse "-9223372036854775808LL" without mangling it. (It can parse
    "-9223372036854775807LL" which is presumably why its limits.h defines
    LONG_LONG_MIN as the latter minus 1.)
    
    Fixes rekey test when compiled with the aforementioned compiler.

commit aad87b88fc2536b1ea023213729aaf4eaabe1894
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 06:31:42 2020 +0000

    upstream: when receving a file in sink(), be careful to send at
    
    most a single error response after the file has been opened. Otherwise the
    source() and sink() can become desyncronised. Reported by Daniel Goujot,
    Georges-Axel Jaloyan, Ryan Lahfa, and David Naccache.
    
    ok deraadt@ markus@
    
    OpenBSD-Commit-ID: 6c14d233c97349cb811a8f7921ded3ae7d9e0035

commit 31909696c4620c431dd55f6cd15db65c4e9b98da
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 06:28:52 2020 +0000

    upstream: expose vasnmprintf(); ok (as part of other commit) markus
    
    deraadt
    
    OpenBSD-Commit-ID: 2e80cea441c599631a870fd40307d2ade5a7f9b5

commit 99ce9cefbe532ae979744c6d956b49f4b02aff82
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 04:23:11 2020 +0000

    upstream: avoid NULL dereference when attempting to convert invalid
    
    ssh.com private keys using "ssh-keygen -i"; spotted by Michael Forney
    
    OpenBSD-Commit-ID: 2e56e6d26973967d11d13f56ea67145f435bf298

commit 6c6072ba8b079e6f5caa38b011a6f4570c14ed38
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 1 15:09:26 2020 +1000

    See if SA_RESTART signals will interrupt select().
    
    On some platforms (at least older HP-UXes such as 11.11, possibly others)
    setting SA_RESTART on signal handers will cause it to not interrupt
    select(), at least for calls that do not specify a timeout.  Try to
    detect this and if found, don't use SA_RESTART.
    
    POSIX says "If SA_RESTART has been set for the interrupting signal, it
    is implementation-dependent whether select() restarts or returns with
    [EINTR]" so this behaviour is within spec.

commit 90a0b434ed41f9c505662dba8782591818599cb3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 1 13:55:03 2020 +1000

    fix reversed test

commit c0dfd18dd1c2107c73d18f70cd164f7ebd434b08
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 1 13:29:16 2020 +1000

    wrap sha2.h inclusion in #ifdef HAVE_SHA2_H

commit a01817a9f63dbcbbc6293aacc4019993a4cdc7e3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 28 04:59:29 2020 +0000

    upstream: adapt dummy FIDO middleware to API change; ok markus@
    
    OpenBSD-Regress-ID: 8bb84ee500c2eaa5616044314dd0247709a1790f

commit 261571ddf02ea38fdb5e4a97c69ee53f847ca5b7
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Apr 30 18:28:37 2020 +0000

    upstream: tweak previous; ok markus
    
    OpenBSD-Commit-ID: 41895450ce2294ec44a5713134491cc31f0c09fd

commit 5de21c82e1d806d3e401b5338371e354b2e0a66f
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Apr 30 17:12:20 2020 +0000

    upstream: bring back debug() removed in rev 1.74; noted by pradeep
    
    kumar
    
    OpenBSD-Commit-ID: 8d134d22ab25979078a3b48d058557d49c402e65

commit ea14103ce9a5e13492e805f7e9277516ff5a4273
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Apr 30 17:07:10 2020 +0000

    upstream: run the 2nd ssh with BatchMode for scp -3
    
    OpenBSD-Commit-ID: 77994fc8c7ca02d88e6d0d06d0f0fe842a935748

commit 59d2de956ed29aa5565ed5e5947a7abdb27ac013
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 28 04:02:29 2020 +0000

    upstream: when signing a challenge using a FIDO toke, perform the
    
    hashing in the middleware layer rather than in ssh code. This allows
    middlewares that call APIs that perform the hashing implicitly (including
    Microsoft's AFAIK). ok markus@
    
    OpenBSD-Commit-ID: c9fc8630aba26c75d5016884932f08a5a237f37d

commit c9d10dbc0ccfb1c7568bbb784f7aeb7a0b5ded12
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Apr 26 09:38:14 2020 +0000

    upstream: Fix comment typo. Patch from mforney at mforney.org.
    
    OpenBSD-Commit-ID: 3565f056003707a5e678e60e03f7a3efd0464a2b

commit 4d2c87b4d1bde019cdd0f00552fcf97dd8b39940
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Apr 25 06:59:36 2020 +0000

    upstream: We've standardized on memset over bzero, replace a couple
    
    that had slipped in.  ok deraadt markus djm.
    
    OpenBSD-Commit-ID: f5be055554ee93e6cc66b0053b590bef3728dbd6

commit 7f23f42123d64272a7b00754afa6b0841d676691
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 1 12:21:58 2020 +1000

    Include sys/byteorder.h for htons and friends.
    
    These are usually in netinet/in.h but on HP-UX they are not defined if
    _XOPEN_SOURCE_EXTENDED is set.  Only needed for netcat in the regression
    tests.

commit d27cba58c972d101a5de976777e518f34ac779cb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 1 09:21:52 2020 +1000

    Fix conditional for openssl-based chacha20.
    
    Fixes warnings or link errors when building against older OpenSSLs.
    ok djm

commit 20819b962dc1467cd6fad5486a7020c850efdbee
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 24 15:07:55 2020 +1000

    Error out if given RDomain if unsupported.
    
    If the config contained 'RDomain %D' on a platform that did not support
    it, the error would not be detected until runtime resulting in a broken
    sshd.  Detect this earlier and error out if found.  bz#3126, based on a
    patch from jjelen at redhat.com, tweaks and ok djm@

commit 2c1690115a585c624eed2435075a93a463a894e2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 24 03:33:21 2020 +0000

    upstream: Fix incorrect error message for "too many known hosts files."
    
    bz#3149, patch from jjelen at redhat.com.
    
    OpenBSD-Commit-ID: e0fcb07ed5cf7fd54ce340471a747c24454235e5

commit 3beb7276e7a8aedd3d4a49f9c03b97f643448c92
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 24 02:19:40 2020 +0000

    upstream: Remove leave_non_blocking() which is now dead code
    
    because nothing sets in_non_blocking_mode any more. Patch from
    michaael.meeks at collabora.com, ok djm@
    
    OpenBSD-Commit-ID: c403cefe97a5a99eca816e19cc849cdf926bd09c

commit 8654e3561772f0656e7663a0bd6a1a8cb6d43300
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Apr 23 21:28:09 2020 +0000

    upstream: ce examples of "Ar arg Ar arg" with "Ar arg arg" and
    
    stop the spread;
    
    OpenBSD-Commit-ID: af0e952ea0f5e2019c2ce953ed1796eca47f0705

commit 67697e4a8246dd8423e44b8785f3ee31fee72d07
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 24 11:10:18 2020 +1000

    Update .depend.

commit d6cc76176216fe3fac16cd20d148d75cb9c50876
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 22 14:07:00 2020 +1000

    Mailing list is now closed to non-subscribers.
    
    While there, add a reference to the bugzilla.  ok djm@

commit cecde6a41689d0ae585ec903b190755613a6de79
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 22 12:09:40 2020 +1000

    Put the values from env vars back.
    
    This merges the values from the recently removed environment into make's
    command line arguments since we actually need those.

commit 300c4322b92e98d3346efa0aec1c094c94d0f964
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 22 11:33:15 2020 +1000

    Pass configure's egrep through to test-exec.sh.
    
    Use it to create a wrapper function to call it from tests.  Fixes the
    keygen-comment test on platforms with impoverished default egrep (eg
    Solaris).

commit c8d9796cfe046f00eb8b2096d2b7028d6a523a84
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 22 10:56:44 2020 +1000

    Remove unneeded env vars from t-exec invocation.

commit 01d4cdcd4514e99a4b6eb9523cd832bbf008d1d7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Apr 21 23:14:58 2020 +0000

    upstream: Backslash '$' at then end of string. Prevents warning on
    
    some shells.
    
    OpenBSD-Regress-ID: 5dc27ab624c09d34078fd326b10e38c1ce9c741f

commit 8854724ccefc1fa16f10b37eda2e759c98148caa
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 21 18:27:23 2020 +1000

    Sync rev 1.49.
    
    Prevent infinite for loop since i went from ssize_t to size_t.  Patch from
    eagleoflqj via OpenSSH github PR#178, ok djm@, feedback & ok millert@

commit d00d07b6744d3b4bb7aca46c734ecd670148da23
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Apr 20 04:44:47 2020 +0000

    upstream: regression test for printing of private key fingerprints and
    
    key comments, mostly by loic AT venez.fr (slightly tweaked for portability)
    ok dtucker@
    
    OpenBSD-Regress-ID: 8dc6c4feaf4fe58b6d634cd89afac9a13fd19004

commit a98d5ba31e5e7e01317352f85fa63b846a960f8c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Apr 20 04:43:57 2020 +0000

    upstream: fix a bug I introduced in r1.406: when printing private key
    
    fingerprint of old-format key, key comments were not being displayed. Spotted
    by loic AT venez.fr, ok dtucker
    
    OpenBSD-Commit-ID: 2d98e4f9eb168eea733d17e141e1ead9fe26e533

commit 32f2d0aad42c15e19bd3b07496076ca891573a58
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 17 07:16:07 2020 +0000

    upstream: repair private key fingerprint printing to also print
    
    comment after regression caused by my recent pubkey loading refactor.
    Reported by loic AT venez.fr, ok dtucker@
    
    OpenBSD-Commit-ID: f8db49acbee6a6ccb2a4259135693b3cceedb89e

commit 094dd513f4b42e6a3cebefd18d1837eb709b4d99
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 17 07:15:11 2020 +0000

    upstream: refactor out some duplicate private key loading code;
    
    based on patch from loic AT venez.fr, ok dtucker@
    
    OpenBSD-Commit-ID: 5eff2476b0d8d0614924c55e350fb7bb9c84f45e

commit 4e04f46f248f1708e39b900b76c9693c820eff68
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Apr 17 06:12:41 2020 +0000

    upstream: add space beteen macro arg and punctuation;
    
    OpenBSD-Commit-ID: c93a6cbb4bf9468fc4c13e64bc1fd4efee201a44

commit 44ae009a0112081d0d541aeaa90088bedb6f21ce
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 17 04:27:03 2020 +0000

    upstream: auth2-pubkey r1.89 changed the order of operations to
    
    checking AuthorizedKeysFile first and falling back to AuthorizedKeysCommand
    if no key was found in a file. Document this order here; bz3134
    
    OpenBSD-Commit-ID: afce0872cbfcfc1d4910ad7722e50f792a1dce12

commit f96f17f920f38ceea6f3c5cb0b075c46b8929fdc
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 17 14:07:15 2020 +1000

    sys/sysctl.h is only used on OpenBSD
    
    so change the preprocessor test used to include it to check
    __OpenBSD__, matching the code that uses the symbols it declares.

commit 54688e937a69c7aebef8a3d50cbd4c6345bab2ca
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 17 03:38:47 2020 +0000

    upstream: fix reversed test that caused IdentitiesOnly=yes to not
    
    apply to keys loaded from a PKCS11Provider; bz3141, ok dtucker@
    
    OpenBSD-Commit-ID: e3dd6424b94685671fe84c9b9dbe352fb659f677

commit 267cbc87b5b6e78973ac4d3c7a6f807ed226928c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 17 03:34:42 2020 +0000

    upstream: mention that /etc/hosts.equiv and /etc/shosts.equiv are
    
    not considered for HostbasedAuthentication when the target user is root;
    bz3148
    
    OpenBSD-Commit-ID: fe4c1256929e53f23af17068fbef47852f4bd752

commit c90f72d29e84b4a2709078bf5546a72c29a65177
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 17 03:30:05 2020 +0000

    upstream: make IgnoreRhosts a tri-state option: "yes" ignore
    
    rhosts/shosts, "no" allow rhosts/shosts or (new) "shosts-only" to allow
    .shosts files but not .rhosts. ok dtucker@
    
    OpenBSD-Commit-ID: d08d6930ed06377a80cf53923c1955e9589342e9

commit 321c7147079270f3a154f91b59e66219aac3d514
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 17 03:23:13 2020 +0000

    upstream: allow the IgnoreRhosts directive to appear anywhere in a
    
    sshd_config, not just before any Match blocks; bz3148, ok dtucker@
    
    OpenBSD-Commit-ID: e042467d703bce640b1f42c5d1a62bf3825736e8

commit ca5403b085a735055ec7b7cdcd5b91f2662df94c
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Apr 11 20:20:09 2020 +0000

    upstream: add space between macro arg and punctuation;
    
    OpenBSD-Commit-ID: e579e4d95eef13059c30931ea1f09ed8296b819c

commit 8af0244d7b4a65eed2e62f9c89141c7c8e63f09d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 15 10:58:02 2020 +1000

    Add sys/syscall.h for syscall numbers.
    
    In some architecture/libc configurations we need to explicitly include
    sys/syscall.h for the syscall number (__NR_xxx) definitions.  bz#3085,
    patch from blowfist at xroutine.net.

commit 3779b50ee952078018a5d9e1df20977f4355df17
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Apr 11 10:16:11 2020 +0000

    upstream: Refactor private key parsing. Eliminates a fair bit of
    
    duplicated code and fixes oss-fuzz#20074 (NULL deref) caused by a missing key
    type check in the ECDSA_CERT parsing path.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: 4711981d88afb7196d228f7baad9be1d3b20f9c9

commit b6a4013647db67ec622c144a9e05dd768f1966b3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 10 00:54:03 2020 +0000

    upstream: Add tests for TOKEN expansion of LocalForward and
    
    RemoteForward.
    
    OpenBSD-Regress-ID: 90fcbc60d510eb114a2b6eaf4a06ff87ecd80a89

commit abc3e0a5179c13c0469a1b11fe17d832abc39999
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Apr 6 09:43:55 2020 +0000

    upstream: Add utf8.c for asmprintf used by krl.c
    
    OpenBSD-Regress-ID: 433708d11165afdb189fe635151d21659dd37a37

commit 990687a0336098566c3a854d23cce74a31ec6fe2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 10 00:52:07 2020 +0000

    upstream: Add TOKEN percent expansion to LocalFoward and RemoteForward
    
    when used for Unix domain socket forwarding.  Factor out the code for the
    config keywords that use the most common subset of TOKENS into its own
    function. bz#3014, ok jmc@ (man page bits) djm@
    
    OpenBSD-Commit-ID: bffc9f7e7b5cf420309a057408bef55171fd0b97

commit 2b13d3934d5803703c04803ca3a93078ecb5b715
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 8 00:10:37 2020 +0000

    upstream: let sshkey_try_load_public() load public keys from the
    
    unencrypted envelope of private key files if not sidecar public key file is
    present.
    
    ok markus@
    
    OpenBSD-Commit-ID: 252a0a580e10b9a6311632530d63b5ac76592040

commit d01f39304eaab0352793b490a25e1ab5f59a5366
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 8 00:09:24 2020 +0000

    upstream: simplify sshkey_try_load_public()
    
    ok markus@
    
    OpenBSD-Commit-ID: 05a5d46562aafcd70736c792208b1856064f40ad

commit f290ab0833e44355fc006e4e67b92446c14673ef
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 8 00:08:46 2020 +0000

    upstream: add sshkey_parse_pubkey_from_private_fileblob_type()
    
    Extracts a public key from the unencrypted envelope of a new-style
    OpenSSH private key.
    
    ok markus@
    
    OpenBSD-Commit-ID: 44d7ab446e5e8c686aee96d5897b26b3939939aa

commit 8d514eea4ae089626a55e11c7bc1745c8d9683e4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 8 00:07:19 2020 +0000

    upstream: simplify sshkey_parse_private_fileblob_type()
    
    Try new format parser for all key types first, fall back to PEM
    parser only for invalid format errors.
    
    ok markus@
    
    OpenBSD-Commit-ID: 0173bbb3a5cface77b0679d4dca0e15eb5600b77

commit 421169d0e758351b105eabfcebf42378ebf17217
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 8 00:05:59 2020 +0000

    upstream: check private key type against requested key type in
    
    new-style private decoding; ok markus@
    
    OpenBSD-Commit-ID: 04d44b3a34ce12ce5187fb6f6e441a88c8c51662

commit 6aabfb6d22b36d07f584cba97f4cdc4363a829da
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 8 00:04:32 2020 +0000

    upstream: check that pubkey in private key envelope matches actual
    
    private key
    
    (this public key is currently unusued)
    
    ok markus@
    
    OpenBSD-Commit-ID: 634a60b5e135d75f48249ccdf042f3555112049c

commit c0f5b2294796451001fd328c44f0d00f1114eddf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 8 00:01:52 2020 +0000

    upstream: refactor private key parsing a little
    
    Split out the base64 decoding and private section decryption steps in
    to separate functions. This will make the decryption step easier to fuzz
    as well as making it easier to write a "load public key from new-format
    private key" function.
    
    ok markus@
    
    OpenBSD-Commit-ID: 7de31d80fb9062aa01901ddf040c286b64ff904e

commit 8461a5b3db34ed0b5a4a18d82f64fd5ac8693ea8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 6 20:54:34 2020 +1000

    Include openssl-compat.h before checking ifdefs.
    
    Fixes problem where unsuitable chacha20 code in libressl would be used
    unintentionally.

commit 931c50c5883a9910ea1ae9a371e4e815ec56b035
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 6 10:04:56 2020 +1000

    fix inverted test for LibreSSL version

commit d1d5f728511e2338b7c994968d301d8723012264
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Apr 4 23:04:41 2020 +0000

    upstream: Indicate if we're using a cached key in trace output.
    
    OpenBSD-Regress-ID: 409a7b0e59d1272890fda507651c0c3d2d3c0d89

commit a398251a4627367c78bc483c70c2ec973223f82c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Apr 5 08:43:57 2020 +1000

    Use /usr/bin/xp4g/id if necessary.
    
    Solaris' native "id" doesn't support the options we use but the one
    in /usr/bin/xp4g does, so use that instead.

commit db0fdd48335b5b01114f78c1a73a195235910f81
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Apr 4 22:14:26 2020 +0000

    upstream: Some platforms don't have "hostname -s", so use cut to trim
    
    short hostname instead.
    
    OpenBSD-Regress-ID: ebcf36a6fdf287c9336b0d4f6fc9f793c05307a7

commit e7e59a9cc8eb7fd5944ded28f4d7e3ae0a5fdecd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 3 07:53:10 2020 +0000

    upstream: Compute hash locally and re-enable %C tests.
    
    OpenBSD-Regress-ID: 94d1366e8105274858b88a1f9ad2e62801e49770

commit abe2b245b3ac6c4801e99bc0f13289cd28211e22
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 3 17:25:46 2020 +1100

    prefer libcrypto chacha20-poly1305 where possible

commit bc5c5d01ad668981f9e554e62195383bc12e8528
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 3 05:43:11 2020 +0000

    upstream: Temporarily remove tests for '%C' since the hash contains the
    
    local hostname and it doesn't work on any machine except mine... spotted by
    djm@
    
    OpenBSD-Regress-ID: 2d4c3585b9fcbbff14f4a5a5fde51dbd0d690401

commit 81624026989654955a657ebf2a1fe8b9994f3c87
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 3 06:07:57 2020 +0000

    upstream: r1.522 deleted one too many lines; repair
    
    OpenBSD-Commit-ID: 1af8851fd7a99e4a887b19aa8f4c41a6b3d25477

commit 668cb3585ce829bd6e34d4a962c489bda1d16370
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Apr 3 05:53:52 2020 +0000

    upstream: sort -N and add it to usage();
    
    OpenBSD-Commit-ID: 5b00e8db37c2b0a54c7831fed9e5f4db53ada332

commit 338ccee1e7fefa47f3d128c2541e94c5270abe0c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 3 05:48:57 2020 +0000

    upstream: avoid another compiler warning spotted in -portable
    
    OpenBSD-Commit-ID: 1d29c51ac844b287c4c8bcaf04c63c7d9ba3b8c7

commit 9f8a42340bd9af86a99cf554dc39ecdf89287544
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 3 04:07:48 2020 +0000

    upstream: this needs utf8.c too
    
    OpenBSD-Regress-ID: 445040036cec714d28069a20da25553a04a28451

commit 92115ea7c3a834374720c350841fc729e7d5c8b2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 3 03:14:03 2020 +0000

    upstream: Add percent_expand test for 'Match Exec'.
    
    OpenBSD-Regress-ID: a41c14fd6a0b54d66aa1e9eebfb9ec962b41232f

commit de34a440276ae855c38deb20f926d46752c62c9d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 3 04:43:24 2020 +0000

    upstream: fix format string (use %llu for uint64, not %lld). spotted by
    
    Darren and his tinderbox tests
    
    OpenBSD-Commit-ID: 3b4587c3d9d46a7be9bdf028704201943fba96c2

commit 9cd40b829a5295cc81fbea8c7d632b2478db6274
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 3 04:34:15 2020 +0000

    upstream: Add a flag to re-enable verbose output when in batch
    
    mode; requested in bz3135; ok dtucker
    
    OpenBSD-Commit-ID: 5ad2ed0e6440562ba9c84b666a5bbddc1afe2e2b

commit 6ce51a5da5d333a44e7c74c027f3571f70c39b24
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 3 04:32:21 2020 +0000

    upstream: chacha20-poly1305 AEAD using libcrypto EVP_chacha20
    
    Based on patch from Yuriy M. Kaminskiy. ok + lots of assistance along the
    way at a2k20 tb@
    
    OpenBSD-Commit-ID: 5e08754c13d31258bae6c5e318cc96219d6b10f0

commit eba523f0a130f1cce829e6aecdcefa841f526a1a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 3 04:27:03 2020 +0000

    upstream: make Chacha20-POLY1305 context struct opaque; ok tb@ as
    
    part of a larger diff at a2k20
    
    OpenBSD-Commit-ID: a4609b7263284f95c9417ef60ed7cdbb7bf52cfd

commit ebd29e90129cf18fedfcfe1de86e324228669295
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 3 04:06:26 2020 +0000

    upstream: fix debug statement
    
    OpenBSD-Commit-ID: 42c6edeeda5ce88b51a20d88c93be3729ce6b916

commit 7b4d8999f2e1a0cb7b065e3efa83e6edccfc7d82
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 3 04:03:51 2020 +0000

    upstream: the tunnel-forwarding vs ExitOnForwardFailure fix that I
    
    committed earlier had an off-by-one. Fix this and add some debugging that
    would have made it apparent sooner.
    
    OpenBSD-Commit-ID: 082f8f72b1423bd81bbdad750925b906e5ac6910

commit eece243666d44ceb710d004624c5c7bdc05454bc
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 3 03:12:11 2020 +0000

    upstream: %C expansion just added to Match Exec should include
    
    remote user not local user.
    
    OpenBSD-Commit-ID: 80f1d976938f2a55ee350c11d8b796836c8397e2

commit d5318a784d016478fc8da90a38d9062c51c10432
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 3 02:33:31 2020 +0000

    upstream: Add regression test for percent expansions where possible.
    
    OpenBSD-Regress-ID: 7283be8b2733ac1cbefea3048a23d02594485288

commit 663e84bb53de2a60e56a44d538d25b8152b5c1cc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 3 02:40:32 2020 +0000

    upstream: make failures when establishing "Tunnel" forwarding terminate
    
    the connection when ExitOnForwardFailure is enabled; bz3116; ok dtucker
    
    OpenBSD-Commit-ID: ef4b4808de0a419c17579b1081da768625c1d735

commit ed833da176611a39d3376d62154eb88eb440d31c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 3 02:27:12 2020 +0000

    upstream: Make with config keywords support which
    
    percent_expansions more consistent.  - %C is moved into its own function and
    added to Match Exec.  - move the common (global) options into a macro.  This
    is ugly but it's    the least-ugly way I could come up with.  - move
    IdentityAgent and ForwardAgent percent expansion to before the    config dump
    to make it regression-testable.  - document all of the above
    
    ok jmc@ for man page bits, "makes things less terrible" djm@ for the rest.
    
    OpenBSD-Commit-ID: 4b65664bd6d8ae2a9afaf1a2438ddd1b614b1d75

commit 6ec7457171468da2bbd908b8cd63d298b0e049ea
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 3 02:26:56 2020 +0000

    upstream: give ssh-keygen the ability to dump the contents of a
    
    binary key revocation list: ssh-keygen -lQf /path bz#3132; ok dtucker
    
    OpenBSD-Commit-ID: b76afc4e3b74ab735dbde4e5f0cfa1f02356033b

commit af628b8a6c3ef403644d83d205c80ff188c97f0c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 3 02:25:21 2020 +0000

    upstream: add allocating variant of the safe utf8 printer; ok
    
    dtucker as part of a larger diff
    
    OpenBSD-Commit-ID: 037e2965bd50eacc2ffb49889ecae41552744fa0

commit d8ac9af645f5519ac5211e9e1e4dc1ed00e9cced
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 16 02:17:02 2020 +0000

    upstream: Cast lifetime to u_long for comparison to prevent unsigned
    
    comparison warning on 32bit arches.  Spotted by deraadt, ok djm.
    
    OpenBSD-Commit-ID: 7a75b2540bff5ab4fa00b4d595db1df13bb0515a

commit 0eaca933ae08b0a515edfccd5cc4a6b667034813
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 14 20:58:46 2020 +1100

    Include fido.h when checking for fido/credman.h.
    
    It's required for fido_dev_t, otherwise configure fails with
    when given --with-security-key-builtin.

commit c7c099060f82ffe6a36d8785ecf6052e12fd92f0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 13 03:18:45 2020 +0000

    upstream: some more speeling mistakes from
    
    OpenBSD-Regress-ID: 02471c079805471c546b7a69d9ab1d34e9a57443

commit 1d89232a4aa97fe935cd60b8d24d75c2f70d56c5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 13 04:16:27 2020 +0000

    upstream: improve error messages for some common PKCS#11 C_Login
    
    failure cases; based on patch from Jacob Hoffman-Andrews in bz3130; ok
    dtucker
    
    OpenBSD-Commit-ID: b8b849621b4a98e468942efd0a1c519c12ce089e

commit 5becbec023f2037394987f85ed7f74b9a28699e0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 13 04:01:56 2020 +0000

    upstream: use sshpkt_fatal() for kex_exchange_identification()
    
    errors. This ensures that the logged errors are consistent with other
    transport- layer errors and that the relevant IP addresses are logged. bz3129
    ok dtucker@
    
    OpenBSD-Commit-ID: 2c22891f0b9e1a6cd46771cedbb26ac96ec2e6ab

commit eef88418f9e5e51910af3c5b23b5606ebc17af55
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 13 03:24:49 2020 +0000

    upstream: Don't clear alarm timers in listening sshd. Previously
    
    these timers were used for regenerating the SSH1 ephemeral host keys but
    those are now gone so there's no need to clear the timers either.  ok
    deraadt@
    
    OpenBSD-Commit-ID: 280d2b885e4a1ce404632e8cc38fcb17be7dafc0

commit d081f017c20a3564255873ed99fd7d024cac540f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 13 03:17:07 2020 +0000

    upstream: spelling errors in comments; no code change from
    
    OpenBSD-Commit-ID: 166ea64f6d84f7bac5636dbd38968592cb5eb924

commit c084a2d040f160bc2b83f13297e3e3ca3f5dbac6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 13 03:12:17 2020 +0000

    upstream: when downloading FIDO2 resident keys from a token, don't
    
    prompt for a PIN until the token has told us that it needs one. Avoids
    double-prompting on devices that implement on-device authentication (e.g. a
    touchscreen PIN pad on the Trezor Model T). ok dtucker@
    
    OpenBSD-Commit-ID: 38b78903dd4422d7d3204095a31692fb69130817

commit 955c4cf4c6a1417c28d4e1040702c4d9bf63645b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 13 14:30:16 2020 +1100

    sync fnmatch.c with upstream to fix another typo

commit 397f217e8640e75bb719a8e87111b4bd848fb3df
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 13 14:24:23 2020 +1100

    another spelling error in comment

commit def31bc5427579ec3f7f2ce99f2da1338fdc0c9f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 13 14:23:07 2020 +1100

    spelling mistakes
    
    from https://fossies.org/linux/misc/openssh-8.2p1.tar.gz/codespell.html

commit 8bdc3bb7cf4c82c3344cfcb82495a43406e87e83
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:29:54 2020 +0000

    upstream: fix relative includes in sshd_config; ok djm
    
    OpenBSD-Commit-ID: fa29b0da3c93cbc3a1d4c6bcd58af43c00ffeb5b

commit e32ef97a56ae03febfe307688858badae3a70e5a
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:29:14 2020 +0000

    upstream: fix use-after-free in do_download_sk; ok djm
    
    OpenBSD-Commit-ID: 96b49623d297797d4fc069f1f09e13c8811f8863

commit 5732d58020309364bf31fa125354e399361006db
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:28:50 2020 +0000

    upstream: do not leak oprincipals; ok djm
    
    OpenBSD-Commit-ID: 4691d9387eab36f8fda48f5d8009756ed13a7c4c

commit 8fae395f34c2c52cdaf9919aa261d1848b4bb00b
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:28:27 2020 +0000

    upstream: initialize seconds for debug message; ok djm
    
    OpenBSD-Commit-ID: 293fbefe6d00b4812a180ba02e26170e4c855b81

commit 46e5c4c8ffcd1569bcd5d04803abaa2ecf3e4cff
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:27:50 2020 +0000

    upstream: correct return code; ok djm
    
    OpenBSD-Commit-ID: 319d09e3b7f4b2bc920c67244d9ff6426b744810

commit 31c39e7840893f1bfdcbe4f813b20d1d7e69ec3e
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:27:15 2020 +0000

    upstream: principalsp is optional, pubkey required; ok djm
    
    OpenBSD-Commit-ID: 2cc3ea5018c28ed97edaccd7f17d2cc796f01024

commit e26a31757c5df2f58687cb9a4853d1418f39728e
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:26:21 2020 +0000

    upstream: remove unused variables in ssh-pkcs11-helper; ok djm
    
    OpenBSD-Commit-ID: 13e572846d0d1b28f1251ddd2165e9cf18135ae1

commit 1b378c0d982d6ab522eda634b0e88cf1fca5e352
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:25:48 2020 +0000

    upstream: return correct error in sshsk_ed25519_sig; ok djm
    
    OpenBSD-Commit-ID: 52bf733df220303c260fee4f165ec64b4a977625

commit fbff605e637b068061ab6784ff03e3874890c092
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:25:12 2020 +0000

    upstream: fix possible null-deref in check_key_not_revoked; ok
    
    djm
    
    OpenBSD-Commit-ID: 80855e9d7af42bb6fcc16c074ba69876bfe5e3bf

commit bc30b446841fc16e50ed6e75c56ccfbd37b9f281
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:24:39 2020 +0000

    upstream: ssh_fetch_identitylist() returns the return value from
    
    ssh_request_reply() so we should also check against != 0 ok djm
    
    OpenBSD-Commit-ID: 28d0028769d03e665688c61bb5fd943e18614952

commit 7b4f70ddeb59f35283d77d8d9c834ca58f8cf436
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:23:17 2020 +0000

    upstream: sshkey_cert_check_authority requires reason to be set;
    
    ok djm
    
    OpenBSD-Commit-ID: 6f7a6f19540ed5749763c2f9530c0897c94aa552

commit 05efe270df1e925db0af56a806d18b5063db4b6d
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:21:28 2020 +0000

    upstream: passphrase depends on kdfname, not ciphername (possible
    
    null-deref); ok djm
    
    OpenBSD-Commit-ID: 0d39668edf5e790b5837df4926ee1141cec5471c

commit 1ddf5682f3992bdacd29164891abb71a19c2cf61
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:20:44 2020 +0000

    upstream: consistently check packet_timeout_ms against 0; ok djm
    
    OpenBSD-Commit-ID: e8fb8cb2c96c980f075069302534eaf830929928

commit 31f1ee54968ad84eb32375e4412e0318766b586b
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:20:02 2020 +0000

    upstream: initialize cname in case ai_canonname is NULL or too
    
    long; ok djm
    
    OpenBSD-Commit-ID: c27984636fdb1035d1642283664193e91aab6e37

commit a6134b02b5264b2611c8beae98bb392329452bba
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:19:21 2020 +0000

    upstream: fix uninitialized pointers for forward_cancel; ok djm
    
    OpenBSD-Commit-ID: 612778e6d87ee865d0ba97d0a335f141cee1aa37

commit 16d4f9961c75680aab374dee762a5baa0ad507af
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:16:21 2020 +0000

    upstream: exit on parse failures in input_service_request; ok djm
    
    OpenBSD-Commit-ID: 6a7e1bfded26051d5aa893c030229b1ee6a0d5d2

commit 5f25afe5216ba7f8921e04f79aa4ca0624eca820
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:15:38 2020 +0000

    upstream: fix null-deref on calloc failure; ok djm
    
    OpenBSD-Commit-ID: a313519579b392076b7831ec022dfdefbec8724a

commit ff2acca039aef16a15fce409163df404858f7aa5
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:15:04 2020 +0000

    upstream: exit if ssh_krl_revoke_key_sha256 fails; ok djm
    
    OpenBSD-Commit-ID: 0864ad4fe8bf28ab21fd1df766e0365c11bbc0dc

commit 31c860a0212af2d5b6a129e3e8fcead51392ee1d
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:14:13 2020 +0000

    upstream: pkcs11_register_provider: return < 0 on error; ok djm
    
    OpenBSD-Commit-ID: cfc8321315b787e4d40da4bdb2cbabd4154b0d97

commit 15be29e1e3318737b0768ca37d5b4a3fbe868ef0
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:13:29 2020 +0000

    upstream: sshsig: return correct error, fix null-deref; ok djm
    
    OpenBSD-Commit-ID: 1d1af7cd538b8b23e621cf7ab84f11e7a923edcd

commit 6fb6f186cb62a6370fba476b6a03478a1e95c30d
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:12:55 2020 +0000

    upstream: vasnmprintf allocates str and returns -1; ok djm
    
    OpenBSD-Commit-ID: dae4c9e83d88471bf3b3f89e3da7a107b44df11c

commit 714e1cbca17daa13f4f98978cf9e0695d4b2e0a4
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 6 18:11:10 2020 +0000

    upstream: sshpkt_fatal() does not return; ok djm
    
    OpenBSD-Commit-ID: 7dfe847e28bd78208eb227b37f29f4a2a0929929

commit 9b47bd7b09d191991ad9e0506bb66b74bbc93d34
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 28 01:07:28 2020 +0000

    upstream: no-touch-required certificate option should be an
    
    extension, not a critical option.
    
    OpenBSD-Commit-ID: 626b22c5feb7be8a645e4b9a9bef89893b88600d

commit dd992520bed35387fc010239abe1bdc0c2665e38
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 28 01:06:05 2020 +0000

    upstream: better error message when trying to use a FIDO key
    
    function and SecurityKeyProvider is empty
    
    OpenBSD-Commit-ID: e56602c2ee8c82f835d30e4dc8ee2e4a7896be24

commit b81e66dbe0345aef4717911abcb4f589fff33a0a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Feb 27 02:32:37 2020 +0000

    upstream: Drop leading space from line count that was confusing
    
    ssh-keygen's screen mode.
    
    OpenBSD-Commit-ID: 3bcae7a754db3fc5ad3cab63dd46774edb35b8ae

commit d5ba1c03278eb079438bb038266d80d7477d49cb
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Wed Feb 26 13:40:09 2020 +0000

    upstream: change explicit_bzero();free() to freezero()
    
    While freezero() returns early if the pointer is NULL the tests for
    NULL in callers are left to avoid warnings about passing an
    uninitialised size argument across a function boundry.
    
    ok deraadt@ djm@
    
    OpenBSD-Commit-ID: 2660fa334fcc7cd05ec74dd99cb036f9ade6384a

commit 9e3220b585c5be19a7431ea4ff8884c137b3a81c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Feb 26 11:46:51 2020 +0000

    upstream: Have sftp reject "-1" in the same way as ssh(1) and
    
    scp(1) do instead of accepting and silently ignoring it since protocol 1
    support has been removed.  Spotted by shivakumar2696 at gmail.com, ok
    deraadt@
    
    OpenBSD-Commit-ID: b79f95559a1c993214f4ec9ae3c34caa87e9d5de

commit ade8e67bb0f07b12e5e47e7baeafbdc898de639f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Feb 26 01:31:47 2020 +0000

    upstream: Remove obsolete XXX comment. ok deraadt@
    
    OpenBSD-Commit-ID: bc462cc843947feea26a2e21c750b3a7469ff01b

commit 7eb903f51eba051d7f65790bab92a28970ac1ccc
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 24 04:27:58 2020 +0000

    upstream: Fix typo. Patch from itoama at live.jp via github PR#173.
    
    OpenBSD-Commit-ID: 5cdaafab38bbdea0d07e24777d00bfe6f972568a

commit b2491c289dd1b557a18a2aca04eeff5c157fc5ef
Author: Nico Kadel-Garcia <nkadel@gmail.com>
Date:   Sat Oct 12 17:51:01 2019 -0400

    Switch %define to %global for redhat/openssh.spec

commit b18dcf6cca7c7aba1cc22e668e04492090ef0255
Author: mkontani <itoama@live.jp>
Date:   Fri Feb 21 00:54:49 2020 +0900

    fix some typos and sentence

commit 0001576a096f788d40c2c0a39121cff51bf961ad
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 21 00:04:43 2020 +0000

    upstream: Fix some typos and an incorrect word in docs. Patch from
    
    itoama at live.jp via github PR#172.
    
    OpenBSD-Commit-ID: 166ee8f93a7201fef431b9001725ab8b269d5874

commit 99ff8fefe4b2763a53778d06b5f74443c8701615
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Feb 20 05:58:08 2020 +0000

    upstream: Update moduli generation script to new ssh-keygen
    
    generation and screening command line flags.
    
    OpenBSD-Commit-ID: 5010ff08f7ad92082e87dde098b20f5c24921a8f

commit 700d16f5e534d6de5a3b7105a74a7a6f4487b681
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Feb 20 05:41:51 2020 +0000

    upstream: Import regenerated moduli.
    
    OpenBSD-Commit-ID: 7b7b619c1452a459310b0cf4391c5757c6bdbc0f

commit 4753b74ba0f09e4aacdaab5e184cd540352004d5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 20 16:42:50 2020 +1100

    Import regenerated moduli.

commit 11d427162778c18fa42917893a75d178679a2389
Author: HARUYAMA Seigo <haruyama@unixuser.org>
Date:   Fri Feb 14 16:14:23 2020 +0900

    Fix typos in INSTALL: s/avilable/available/ s/suppports/supports/

commit 264a966216137c9f4f8220fd9142242d784ba059
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Feb 18 08:58:33 2020 +0000

    upstream: Ensure that the key lifetime provided fits within the
    
    values allowed by the wire format (u32). Prevents integer wraparound of the
    timeout values. bz#3119, ok markus@ djm@
    
    OpenBSD-Commit-ID: 8afe6038b5cdfcf63360788f012a7ad81acc46a2

commit de1f3564cd85915b3002859873a37cb8d31ac9ce
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Feb 18 08:49:49 2020 +0000

    upstream: Detect and prevent simple configuration loops when using
    
    ProxyJump. bz#3057, ok djm@
    
    OpenBSD-Commit-ID: 077d21c564c886c98309d871ed6f8ef267b9f037

commit 30144865bfa06b12239cfabc37c45e5ddc369d97
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sun Feb 16 21:15:43 2020 +0000

    upstream: document -F none; with jmc@
    
    OpenBSD-Commit-ID: 0eb93b75473d2267aae9200e02588e57778c84f2

commit 011052de73f3dbc53f50927ccf677266a9ade4f6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 17 22:55:51 2020 +1100

    Remove unused variable warning.

commit 31c9348c5e4e94e9913ec64b3ca6e15f68ba19e5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 17 22:53:24 2020 +1100

    Constify aix_krb5_get_principal_name.
    
    Prevents warning about discarding type qualifiers on AIX.

commit 290c994336a2cfe03c5496bebb6580863f94b232
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 17 22:51:36 2020 +1100

    Check if TILDE is already defined and undef.
    
    Prevents redefinition warning on AIX.

commit 41a2e64ae480eda73ee0e809bbe743d203890938
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 17 22:51:00 2020 +1100

    Prevent unused variable warning.

commit d4860ec4efd25ba194337082736797fce0bda016
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 17 22:48:50 2020 +1100

    Check if getpeereid is actually declared.
    
    Check in sys/socket.h (AIX) and unistd.h (FreeBSD, DragonFLy and OS X).
    Prevents undeclared function warning on at least some versions of AIX.

commit 8aa3455b16fddea4c0144a7c4a1edb10ec67dcc8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 14 00:39:20 2020 +0000

    upstream: openssh-8.2
    
    OpenBSD-Commit-ID: 0a1340ff65fad0d84b997ac58dd1b393dec7c19b

commit 72f0ce33f0d5a37f31bad5800d1eb2fbdb732de6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 12 09:28:35 2020 +1100

    crank version numbers

commit b763ed05bd1f1f15ae1727c86a4498546bc36ca8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 11 12:51:24 2020 +1100

    Minor documentation update:
    
     - remove duplication of dependency information (it's all in INSTALL).
     - SSHFP is now an RFC.

commit 14ccfdb7248e33b1dc8bbac1425ace4598e094cb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 9 11:23:35 2020 +1100

    Check if UINT32_MAX is defined before redefining.

commit be075110c735a451fd9d79a864e01e2e0d9f19d2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 7 15:07:27 2020 +1100

    typo; reported by Phil Pennock

commit 963d71851e727ffdd2a97fe0898fad61d4a70ba1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 7 03:57:31 2020 +0000

    upstream: sync the description of the $SSH_SK_PROVIDER environment
    
    variable with that of the SecurityKeyProvider ssh/sshd_config(5) directive,
    as the latter was more descriptive.
    
    OpenBSD-Commit-ID: 0488f09530524a7e53afca6b6e1780598022552f

commit d4d9e1d40514e2746f9e05335d646512ea1020c6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 7 03:54:44 2020 +0000

    upstream: Add ssh -Q key-sig for all key and signature types.
    
    Teach ssh -Q to accept ssh_config(5) and sshd_config(5) algorithm keywords as
    an alias for the corresponding query.  Man page help jmc@, ok djm@.
    
    OpenBSD-Commit-ID: 1e110aee3db2fc4bc5bee2d893b7128fd622e0f8

commit fd68dc27864b099b552a6d9d507ca4b83afd6a76
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 7 03:27:54 2020 +0000

    upstream: fix two PIN entry bugs on FIDO keygen: 1) it would allow more
    
    than the intended number of prompts (3) and 2) it would SEGV too many
    incorrect PINs were entered; based on patch by Gabriel Kihlman
    
    OpenBSD-Commit-ID: 9c0011f28ba8bd8adf2014424b64960333da1718

commit 96bd895a0a0b3a36f81c14db8c91513578fc5563
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 6 22:48:23 2020 +0000

    upstream: When using HostkeyAlgorithms to merely append or remove
    
    algorithms from the default set (i.e. HostkeyAlgorithms=+/-...), retain the
    default behaviour of preferring those algorithms that have existing keys in
    known_hosts; ok markus
    
    OpenBSD-Commit-ID: 040e7fcc38ea00146b5d224ce31ce7a1795ee6ed

commit c7288486731734a864b58d024b1395029b55bbc5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 6 22:46:31 2020 +0000

    upstream: expand HostkeyAlgorithms prior to config dump, matching
    
    other algorithm lists; ok markus@
    
    OpenBSD-Commit-ID: a66f0fca8cc5ce30405a2867bc115fff600671d0

commit a6ac5d36efc072b15690c65039754f8e44247bdf
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Thu Feb 6 22:34:58 2020 +0000

    upstream: Add Include to the list of permitted keywords after a
    
    Match keyword. ok markus@
    
    OpenBSD-Commit-ID: 342e940538b13dd41e0fa167dc9ab192b9f6e2eb

commit a47f6a6c0e06628eed0c2a08dc31a8923bcc37ba
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Thu Feb 6 22:30:54 2020 +0000

    upstream: Replace "security key" with "authenticator" in program
    
    messages.
    
    This replaces "security key" in error/usage/verbose messages and
    distinguishes between "authenticator" and "authenticator-hosted key".
    
    ok djm@
    
    OpenBSD-Commit-ID: 7c63800e9c340c59440a054cde9790a78f18592e

commit 849a9b87144f8a5b1771de6c85e44bfeb86be9a9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 6 11:28:14 2020 +1100

    Don't look for UINT32_MAX in inttypes.h
    
    ... unless we are actually going to use it.  Fixes build on HP-UX
    without the potential impact to other platforms of a header change
    shortly before release.

commit a2437f8ed0c3be54ddd21630a93c68ebd168286f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 6 12:02:22 2020 +1100

    depend

commit 9716e8c4956acdd7b223d1642bfa376e07e7503d
Author: Michael Forney <mforney@mforney.org>
Date:   Wed Nov 27 19:17:26 2019 -0800

    Fix sha2 MAKE_CLONE no-op definition
    
    The point of the dummy declaration is so that MAKE_CLONE(...) can have
    a trailing semicolon without introducing an empty declaration. So,
    the macro replacement text should *not* have a trailing semicolon,
    just like DEF_WEAK.

commit d596b1d30dc158915a3979fa409d21ff2465b6ee
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 4 09:58:04 2020 +0000

    upstream: require FIDO application strings to start with "ssh:"; ok
    
    markus@
    
    OpenBSD-Commit-ID: 94e9c1c066d42b76f035a3d58250a32b14000afb

commit 501f3582438cb2cb1cb92be0f17be490ae96fb23
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 3 23:47:57 2020 +0000

    upstream: revert enabling UpdateHostKeys by default - there are still
    
    corner cases we need to address; ok markus
    
    OpenBSD-Commit-ID: ff7ad941bfdc49fb1d8baa95fd0717a61adcad57

commit 072f3b832d2a4db8d9880effcb6c4d0dad676504
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Feb 3 08:15:37 2020 +0000

    upstream: use better markup for challenge and write-attestation, and
    
    rejig the challenge text a little;
    
    ok djm
    
    OpenBSD-Commit-ID: 9f351e6da9edfdc907d5c3fdaf2e9ff3ab0a7a6f

commit 262eb05a22cb1fabc3bc1746c220566490b80229
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 3 21:22:15 2020 +1100

    mention libfido2 in dependencies section

commit ccd3b247d59d3bde16c3bef0ea888213fbd6da86
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 3 19:40:12 2020 +1100

    add clock_gettime64(2) to sandbox allowed syscalls
    
    bz3093

commit adffbe1c645ad2887ba0b6d24c194aa7a40c5735
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 2 09:45:34 2020 +0000

    upstream: Output (none) in debug in the case in the CheckHostIP=no case
    
    as suggested by markus@
    
    OpenBSD-Commit-ID: 4ab9117ee5261cbbd1868717fcc3142eea6385cf

commit 58c819096a2167983e55ae686486ce317b69b2d1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 2 09:22:22 2020 +0000

    upstream: Prevent possible null pointer deref of ip_str in debug.
    
    OpenBSD-Commit-ID: 37b252e2e6f690efed6682437ef75734dbc8addf

commit 0facae7bc8d3f8f9d02d0f6bed3d163ff7f39806
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sun Feb 2 07:36:50 2020 +0000

    upstream: shuffle the challenge keyword to keep the -O list sorted;
    
    OpenBSD-Commit-ID: 08efad608b790949a9a048d65578fae9ed5845fe

commit 6fb3dd0ccda1c26b06223b87bcd1cab9ec8ec3cc
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Feb 1 06:53:12 2020 +0000

    upstream: tweak previous;
    
    OpenBSD-Commit-ID: 0c42851cdc88583402b4ab2b110a6348563626d3

commit 92725d4d3fde675acc0ca040b48f3d0c7be73b7f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 1 17:25:09 2020 +1100

    Use sys-queue.h from compat library.
    
    Fixes build on platforms that don't have sys/queue.h (eg MUSL).

commit 677d0ece67634262b3b96c3cd6410b19f3a603b7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 31 23:25:08 2020 +0000

    upstream: regress test for sshd_config Include directive; from Jakub
    
    Jelen
    
    OpenBSD-Regress-ID: 0d9224de3297c7a5f51ba68d6e3725a2a9345fa4

commit d4f4cdd681ab6408a98419f398b75a55497ed324
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 31 23:13:04 2020 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: 564cf7a5407ecf5da2d94ec15474e07427986772

commit 245399dfb3ecebc6abfc2ef4ee2e650fa9f6942b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 31 23:11:25 2020 +0000

    upstream: force early logging to stderr if debug_flag (-d) is set;
    
    avoids missing messages from re-exec config passing
    
    OpenBSD-Commit-ID: 02484b8241c1f49010e7a543a7098e6910a8c9ff

commit 7365f28a66d1c443723fbe6f4a2612ea6002901e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 31 23:08:08 2020 +0000

    upstream: mistake in previous: filling the incorrect buffer
    
    OpenBSD-Commit-ID: 862ee84bd4b97b529f64aec5d800c3dcde952e3a

commit c2bd7f74b0e0f3a3ee9d19ac549e6ba89013abaf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 31 22:42:45 2020 +0000

    upstream: Add a sshd_config "Include" directive to allow inclusion
    
    of files. This has sensible semantics wrt Match blocks and accepts glob(3)
    patterns to specify the included files. Based on patch by Jakub Jelen in
    bz2468; feedback and ok markus@
    
    OpenBSD-Commit-ID: 36ed0e845b872e33f03355b936a4fff02d5794ff

commit ba261a1dd33266168ead4f8f40446dcece4d1600
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jan 31 22:25:59 2020 +0000

    upstream: spelling fix;
    
    OpenBSD-Commit-ID: 3c079523c4b161725a4b15dd06348186da912402

commit 771891a044f763be0711493eca14b6b0082e030f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 30 22:25:34 2020 +0000

    upstream: document changed default for UpdateHostKeys
    
    OpenBSD-Commit-ID: 25c390b21d142f78ac0106241d13441c4265fd2c

commit d53a518536c552672c00e8892e2aea28f664148c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 30 22:19:32 2020 +0000

    upstream: enable UpdateKnownHosts=yes if the configuration
    
    specifies only the default known_hosts files, otherwise select
    UpdateKnownHosts=ask; ok markus@
    
    OpenBSD-Commit-ID: ab401a5ec4a33d2e1a9449eae6202e4b6d427df7

commit bb63ff844e818d188da4fed3c016e0a4eecbbf25
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 30 18:54:42 2020 +1100

    Look in inttypes.h for UINT32_MAX.
    
    Should prevent warnings on at least some AIX versions.

commit afeb6a960da23f0a5cbc4b80cca107c7504e932a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 30 07:21:38 2020 +0000

    upstream: use sshpkt_fatal() instead of plain fatal() for
    
    ssh_packet_write_poll() failures here too as the former yields better error
    messages; ok dtucker@
    
    OpenBSD-Commit-ID: 1f7a6ca95bc2b716c2e948fc1370753be772d8e3

commit 65d6fd0a8a6f31c3ddf0c1192429a176575cf701
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 30 07:20:57 2020 +0000

    upstream: check the return value of ssh_packet_write_poll() and
    
    call sshpkt_fatal() if it fails; avoid potential busy-loop under some
    circumstances. Based on patch by Mike Frysinger; ok dtucker@
    
    OpenBSD-Commit-ID: c79fe5cf4f0cd8074cb6db257c1394d5139408ec

commit dce74eab0c0f9010dc84c62500a17771d0131ff3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 30 07:20:05 2020 +0000

    upstream: have sshpkt_fatal() save/restore errno before we
    
    potentially call strerror() (via ssh_err()); ok dtucker
    
    OpenBSD-Commit-ID: 5590df31d21405498c848245b85c24acb84ad787

commit 14ef4efe2bf4180e085ea6738fdbebc199458b0c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 29 08:17:49 2020 +0000

    upstream: markus suggests a simplification to previous
    
    OpenBSD-Commit-ID: 10bbfb6607ebbb9a018dcd163f0964941adf58de

commit 101ebc3a8cfa78d2e615afffbef9861bbbabf1ff
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 29 07:51:30 2020 +0000

    upstream: give more context to UpdateHostKeys messages, mentioning
    
    that the changes are validated by the existing trusted host key. Prompted by
    espie@ feedback and ok markus@
    
    OpenBSD-Commit-ID: b3d95f4a45f2692f4143b9e77bb241184dbb8dc5

commit 24c0f752adf9021277a7b0a84931bb5fe48ea379
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 28 08:01:34 2020 +0000

    upstream: changes to support FIDO attestation
    
    Allow writing to disk the attestation certificate that is generated by
    the FIDO token at key enrollment time. These certificates may be used
    by an out-of-band workflow to prove that a particular key is held in
    trustworthy hardware.
    
    Allow passing in a challenge that will be sent to the card during
    key enrollment. These are needed to build an attestation workflow
    that resists replay attacks.
    
    ok markus@
    
    OpenBSD-Commit-ID: 457dc3c3d689ba39eed328f0817ed9b91a5f78f6

commit 156bef36f93a48212383235bb8e3d71eaf2b2777
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 28 07:24:15 2020 +0000

    upstream: disable UpdateHostKeys=ask when in quiet mode; "work for
    
    me" matthieu@
    
    OpenBSD-Commit-ID: 60d7b5eb91accf935ed9852650a826d86db2ddc7

commit ec8a759b4045e54d6b38e690ffee4cbffc53c7b7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 28 12:57:25 2020 +1100

    compat for missing IPTOS_DSCP_LE in system headers

commit 4594c7627680c4f41c2ad5fe412e55b7cc79b10c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 28 01:49:36 2020 +0000

    upstream: make IPTOS_DSCP_LE available via IPQoS directive; bz2986,
    
    based on patch by veegish AT cyberstorm.mu
    
    OpenBSD-Commit-ID: 9902bf4fbb4ea51de2193ac2b1d965bc5d99c425

commit da22216b5db3613325aa7b639f40dc017e4c6f69
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 27 20:51:32 2020 +0000

    upstream: disable UpdateHostKeys=ask if command is specified; ok
    
    djm@ sthen@
    
    OpenBSD-Commit-ID: e5bcc45eadb78896637d4143d289f1e42c2ef5d7

commit 1e1db0544fdd788e2e3fc21d972a7ccb7de6b4ae
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 26 00:09:50 2020 +0000

    upstream: unbreak unittests for recent API / source file changes
    
    OpenBSD-Regress-ID: 075a899a01bbf7781d38bf0b33d8366faaf6d3c0

commit 0d1144769151edf65f74aee9a4c8545c37861695
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jan 26 15:09:15 2020 +1100

    Move definition of UINT32_MAX.
    
    This allows us to always define it if needed not just if we also
    define the type ourself.

commit f73ab8a811bc874c2fb403012aa8e4bfdcaf5ec7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 26 00:09:50 2020 +0000

    upstream: unbreak unittests for recent API / source file changes
    
    OpenBSD-Regress-ID: 075a899a01bbf7781d38bf0b33d8366faaf6d3c0

commit 0373f9eba2b63455dceedbd3ac3d5dca306789ff
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jan 26 14:09:17 2020 +1100

    Include signal.h to prevent redefintion of _NSIG.

commit 638a45b5c1e20a8539100ca44166caad8abf26f8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jan 26 13:40:51 2020 +1100

    Wrap stdint.h in tests inside HAVE_STDINT_H.

commit 74dfc2c859c906eaab1f88a27fd883115ffb928f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 26 00:14:45 2020 +0000

    upstream: for UpdateHostKeys, don't report errors for unsupported
    
    key types - just ignore them. spotted by and ok dtucker@
    
    OpenBSD-Commit-ID: 91769e443f6197c983932fc8ae9d39948727d473

commit b59618246c332e251160be0f1e0e88a7d4e2b0ae
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 26 00:13:20 2020 +0000

    upstream: downgrade error() for missing subsequent known_hosts
    
    files to debug() as it was intended to be; spotted by dtucker@
    
    OpenBSD-Commit-ID: 18cfea382cb52f2da761be524e309cc3d5354ef9

commit 469df611f778eec5950d556aabfe1d4efc227915
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 23:33:27 2020 +0000

    upstream: clarify that BatchMode applies to all interactive prompts
    
    (e.g. host key confirmation) and not just password prompts.
    
    OpenBSD-Commit-ID: 97b001883d89d3fb1620d2e6b747c14a26aa9818

commit de40876c4a5d7c519d3d7253557572fdfc13db76
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 23:28:06 2020 +0000

    upstream: tidy headers; some junk snuck into sshbuf-misc.c and
    
    sshbuf-io.c doesn't need SSHBUF_INTERNAL set
    
    OpenBSD-Commit-ID: 27a724d2e0b2619c1a1490f44093bbd73580d9e6

commit 6a107606355fa9547884cad6740e6144a7a7955b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 26 10:28:21 2020 +1100

    depend

commit 59d01f1d720ebede4da42882f592d1093dac7adc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 23:13:09 2020 +0000

    upstream: improve the error message for u2f enrollment errors by
    
    making ssh-keygen be solely responsible for printing the error message and
    convertint some more common error responses from the middleware to a useful
    ssherr.h status code. more detail remains visible via -v of course.
    
    also remove indepedent copy of sk-api.h declarations in sk-usbhid.c
    and just include it.
    
    feedback & ok markus@
    
    OpenBSD-Commit-ID: a4a8ffa870d9a3e0cfd76544bcdeef5c9fb1f1bb

commit 99aa8035554ddb976348d2a9253ab3653019728d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 23:02:13 2020 +0000

    upstream: factor out reading/writing sshbufs to dedicated
    
    functions; feedback and ok markus@
    
    OpenBSD-Commit-ID: dc09e5f1950b7acc91b8fdf8015347782d2ecd3d

commit 065064fcf455778b0918f783033b374d4ba37a92
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 22:49:38 2020 +0000

    upstream: add a comment describing the ranges of channel IDs that
    
    we use; requested by markus@
    
    OpenBSD-Commit-ID: 83a1f09810ffa3a96a55fbe32675b34ba739e56b

commit 69334996ae203c51c70bf01d414c918a44618f8e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 22:41:01 2020 +0000

    upstream: make sshd_config:ClientAliveCountMax=0 disable the
    
    connection killing behaviour, rather than killing the connection after
    sending the first liveness test probe (regardless of whether the client was
    responsive) bz2627; ok markus
    
    OpenBSD-Commit-ID: 5af79c35f4c9fa280643b6852f524bfcd9bccdaf

commit bf986a9e2792555e0879a3145fa18d2b49436c74
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 22:36:22 2020 +0000

    upstream: clarify order of AllowUsers/DenyUsers vs
    
    AllowGroups/DenyGroups; bz1690, ok markus@
    
    OpenBSD-Commit-ID: 5637584ec30db9cf64822460f41b3e42c8f9facd

commit 022ce92fa0daa9d78830baeb2bd2dc3f83c724ba
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 07:17:18 2020 +0000

    upstream: when AddKeysToAgent=yes is set and the key contains no
    
    comment, add the key to the agent with the key's path as the comment. bz2564
    
    OpenBSD-Commit-ID: 8dd8ca9340d7017631a27f4ed5358a4cfddec16f

commit 0b813436bbf6546638b10c1fa71f54691bcf5e63
Author: tedu@openbsd.org <tedu@openbsd.org>
Date:   Sat Jan 25 07:09:14 2020 +0000

    upstream: group14-sha1 is no longer a default algorithm
    
    OpenBSD-Commit-ID: a96f04d5e9c2ff760c6799579dc44f69b4ff431d

commit 3432b6e05d5c583c91c566c5708fed487cec79ac
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 07:02:51 2020 +0000

    upstream: reword HashKnownHosts description a little more; some
    
    people found the wording confusing (bz#2560)
    
    OpenBSD-Commit-ID: ac30896598694f07d498828690aecd424c496988

commit f80d7d6aa98d6eddc5df02412efee6db75673d4c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 07:01:00 2020 +0000

    upstream: weaken the language for what HashKnownHosts provides with
    
    regards to known_hosts name privacy, it's not practical for this option to
    offer any guarantee that hostnames cannot be recovered from a disclosed
    known_hosts file (e.g. by brute force).
    
    OpenBSD-Commit-ID: 13f1e3285f8acf7244e9770074296bcf446c6972

commit 846446bf3e7421e6671a4afd074bdf15eecd7832
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 06:40:20 2020 +0000

    upstream: the GatewayPorts vs -R listen address selection logic is
    
    still confusing people, so add another comment explaining the special
    handling of "localhost"; bz#3258
    
    OpenBSD-Commit-ID: e6bf0f0fbf1c7092bf0dbd9c6eab105970b5b53a

commit 734f2f83f5ff86f2967a99d67be9ce22dd0394dd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 06:03:10 2020 +0000

    upstream: mention that permitopen=/PermitOpen do no name to address
    
    translation; prompted by bz3099
    
    OpenBSD-Commit-ID: 0dda8e54d566b29855e76bebf9cfecce573f5c23

commit e1e97cae19ff07b7a7f7e82556bc048c3c54af63
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 25 16:30:22 2020 +1100

    include tunnel device path in error message

commit 0ecd20bc9f0b9c7c697c9eb014613516c8f65834
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 04:48:26 2020 +0000

    upstream: unrevert this:
    
    > revision 1.217
    > date: 2019/11/27 03:34:04;  author: dtucker;  state: Exp;  lines: +5 -7;  commitid: wkiMn49XJyjzoJIs;
    > Make channel_id u_int32_t and remove unnecessary check and cast that were
    > left over from the type conversion.  Noted by t-hashida@amiya.co.jp in
    > bz#3098, ok markus@ djm@
    
    Darren was right the first time; ok dtucker@ "agreed" markus@
    
    OpenBSD-Commit-ID: 641dd1b99a6bbd85b7160da462ae1be83432c7c8

commit a0c81d2402eedc514b9c9f25ef9604eb0576b86a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jan 25 02:57:53 2020 +0000

    upstream: Move setting $NC into test-exec since it's now used by
    
    multiple tests, and in -portable we use our own local copy to avoid
    portability problems.
    
    OpenBSD-Regress-ID: ceb78445fcaac317bec2fc51b3f0d9589048c114

commit e16dfa94f86358033531c4a97dcb51508ef84d49
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jan 25 13:05:42 2020 +1100

    Put EC key export inside OPENSSL_HAS_ECC.
    
    Fixes link error when building against an OpenSSL that does not have
    ECC.

commit 94a2e5951b374e1a89761ceaff72e66eb1946807
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jan 25 00:27:56 2020 +0000

    upstream: Wait a bit longer for the multiplex master to become ready
    
    since on very slow hosts the current delay is not sufficient and the test
    will fail.
    
    OpenBSD-Regress-ID: 6d90c7475d67ac3a95610b64af700629ece51a48

commit b2df804f571d77b07059f087b90955ffbc2f67d4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 24 10:08:17 2020 +0000

    upstream: Add a connection test for proxycommand. This would have
    
    caught the problem caused by ssh.c rev 1.507 wherein Host and Hostname were
    swapped.  Prompted by beck@
    
    OpenBSD-Regress-ID: d218500ae6aca4c479c27318fb5b09ebc00f7aae

commit c6f06fd38a257b9fcc7d6760f8fb6d505dccb628
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 00:22:31 2020 +0000

    upstream: set UpdateKnownHosts=ask by default; bz#2894; ok
    
    markus@
    
    OpenBSD-Commit-ID: f09cb3177f3a14c96428e14f347e976a8a531fee

commit 7955633a554397bc24913cec9fd7285002935f7e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 00:21:08 2020 +0000

    upstream: allow UpdateKnownHosts=yes to function when multiple
    
    known_hosts files are in use. When updating host keys, ssh will now search
    subsequent known_hosts files, but will add new/changed host keys to the first
    specified file only. bz#2738
    
    ok markus@
    
    OpenBSD-Commit-ID: 6ded6d878a03e57d5aa20bab9c31f92e929dbc6c

commit e5a278a62ab49dffe96929fa8d8506c6928dba90
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 00:06:48 2020 +0000

    upstream: process security key provider via realpath() in agent,
    
    avoids malicious client from being able to cause agent to load arbitrary
    libraries into ssh-sk-helper.
    
    reported by puck AT puckipedia.com; ok markus
    
    OpenBSD-Commit-ID: 1086643df1b7eee4870825c687cf0c26a6145d1c

commit 89a8d4525e8edd9958ed3df60cf683551142eae0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 25 00:03:36 2020 +0000

    upstream: expose PKCS#11 key labels/X.509 subjects as comments
    
    Extract the key label or X.509 subject string when PKCS#11 keys
    are retrieved from the token and plumb this through to places where
    it may be used as a comment.
    
    based on https://github.com/openssh/openssh-portable/pull/138
    by Danielle Church
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: cae1fda10d9e10971dea29520916e27cfec7ca35

commit a8c05c640873621681ab64d2e47a314592d5efa2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 24 23:56:01 2020 +0000

    upstream: tweak proctitle to include sshd arguments, as these are
    
    frequently used to distinguish between multiple independent instances of the
    server. New proctitle looks like this:
    
    $ pgrep -lf sshd
    12844 sshd: /usr/sbin/sshd -f /etc/ssh/sshd_config [listener] 0 of 10-100 startups
    
    requested by sthen@ and aja@; ok aja@
    
    OpenBSD-Commit-ID: cf235a561c655a3524a82003cf7244ecb48ccc1e

commit 8075fccbd4f70a4371acabcfb47562471ff0de6f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 24 23:54:40 2020 +0000

    upstream: add xextendf() to extend a string with a format
    
    (reallocating as necessary). ok aja@ as part of a larger diff
    
    OpenBSD-Commit-ID: 30796b50d330b3e0e201747fe40cdf9aa70a77f9

commit d15c8adf2c6f1a6b4845131074383eb9c3d05c3d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 24 05:33:01 2020 +0000

    upstream: minor tweaks to ssh-keygen -Y find-principals:
    
    emit matched principals one per line to stdout rather than as comma-
    separated and with a free-text preamble (easy confusion opportunity)
    
    emit "not found" error to stderr
    
    fix up argument testing for -Y operations and improve error message for
    unsupported operations
    
    OpenBSD-Commit-ID: 3d9c9a671ab07fc04a48f543edfa85eae77da69c

commit c3368a5d5ec368ef6bdf9971d6330ca0e3bdca06
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 24 00:28:57 2020 +0000

    upstream: remove ssh-rsa (SHA1) from the list of allowed CA
    
    signature algorithms ok markus
    
    OpenBSD-Commit-ID: da3481fca8c81e6951f319a86b7be67502237f57

commit 4a41d245d6b13bd3882c8dc058dbd2e2b39a9f67
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 24 00:27:04 2020 +0000

    upstream: when signing a certificate with an RSA key, default to
    
    a safe signature algorithm (rsa-sha-512) if not is explicitly specified by
    the user; ok markus@
    
    OpenBSD-Commit-ID: e05f638f0be6c0266e1d3d799716b461011e83a9

commit 8dfb6a202c96cdf037c8ce05e53e32e0e0b7b454
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 24 00:00:31 2020 +0000

    upstream: allow PEM export of DSA and ECDSA keys; bz3091, patch
    
    from Jakub Jelen ok markus@
    
    OpenBSD-Commit-ID: a58edec8b9f07acab4b962a71a5125830d321b51

commit 72a8bea2d748c8bd7f076a8b39a52082c79ae95f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 23 23:31:52 2020 +0000

    upstream: ssh-keygen -Y find-principals fixes based on feedback
    
    from Markus:
    
    use "principals" instead of principal, as allowed_signers lines may list
    multiple.
    
    When the signing key is a certificate, emit only principals that match
    the certificate principal list.
    
    NB. the command -Y name changes: "find-principal" => "find-principals"
    
    ok markus@
    
    OpenBSD-Commit-ID: ab575946ff9a55624cd4e811bfd338bf3b1d0faf

commit 0585b5697201f5d8b32e6f1b0fee7e188268d30d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 24 01:29:23 2020 +0000

    upstream: Do not warn about permissions on symlinks.
    
    OpenBSD-Regress-ID: 339d4cbae224bd8743ffad9c3afb0cf3cb66c357

commit 415192348a5737a960f6d1b292a17b64d55b542c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 23 11:19:12 2020 +0000

    upstream: Handle zlib compression being disabled now that it's
    
    optional.
    
    OpenBSD-Regress-ID: 0af4fbc5168e62f89d0350de524bff1cb00e707a

commit fbce7c1a898ae75286349822950682cf46346121
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 23 10:53:04 2020 +0000

    upstream: Fix typo in comment.
    
    OpenBSD-Commit-ID: d1d7a6553208bf439378fd1cf686a828aceb353a

commit ba247af8e9e302910e22881ef9d307a8afeef036
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 23 10:19:59 2020 +0000

    upstream: When checking for unsafe directories, ignore non-directories
    
    (ie symlinks, where permissions are not relevant).
    
    OpenBSD-Regress-ID: fb6cfc8b022becb62b2dcb99ed3f072b3326e501

commit 74deb7029be4c00810443114aac9308875a81dae
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 23 22:17:24 2020 +1100

    zlib is now optional.

commit 633a2af47ee90291aaf93969aeee1e5046074c7c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 23 22:16:51 2020 +1100

    Plumb WITH_ZLIB into configure.
    
    This allows zlib support to be disabled by ./configure --without-zlib.

commit 7f8e66fea8c4e2a910df9067cb7638999b7764d5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 23 10:24:29 2020 +0000

    upstream: Make zlib optional. This adds a "ZLIB" build time option
    
    that allows building without zlib compression and associated options.  With
    feedback from markus@, ok djm@
    
    OpenBSD-Commit-ID: 44c6e1133a90fd15a3aa865bdedc53bab28b7910

commit 69ac4e33023b379e9a8e9b4b6aeeffa6d1fcf6fa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 23 07:54:04 2020 +0000

    upstream: remove trailing period characters from pub/priv key
    
    pathnames - they make them needlessly more difficult to cut and paste without
    error; ok markus@ & dtucker@
    
    OpenBSD-Commit-ID: abdcfd1a5723fcac0711feee7665edc66ae2335a

commit 945bf52c3c815d95b1e842ebf6c910c3524bd5bb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 23 21:06:45 2020 +1100

    Fix a couple of mysig_t leftovers.

commit 84226b447d45fe4542613de68c2ca59a890d7c01
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 23 18:55:24 2020 +1100

    Remove mysignal wrapper.
    
    We switched the main code to use sigaction(), so the wrapper is no
    longer used.

commit 5533c2fb7ef21172fa3708d66b03faa2c6b3d93f
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Jan 23 07:16:38 2020 +0000

    upstream: new sentence, new line;
    
    OpenBSD-Commit-ID: b6c3f2f36ec77e99198619b38a9f146655281925

commit 3bf2a6ac791d64046a537335a0f1d5e43579c5ad
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 23 07:10:22 2020 +0000

    upstream: Replace all calls to signal(2) with a wrapper around
    
    sigaction(2). This wrapper blocks all other signals during the handler
    preventing races between handlers, and sets SA_RESTART which should reduce
    the potential for short read/write operations.
    
    OpenBSD-Commit-ID: 5e047663fd77a40d7b07bdabe68529df51fd2519

commit e027c044c796f3a01081a91bee55741204283f28
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 23 04:54:34 2020 +0000

    upstream: missing header change from previous; spotted by dtucker@
    
    OpenBSD-Commit-ID: 321ce74c0a5bbd0f02fa3f20cb5cf2a952c6b96f

commit 7e1323102b1b04eef391b01e180710a2d408a7ab
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 23 03:42:41 2020 +0000

    upstream: Check for and warn about StrictModes permission problems. ok tb@
    
    OpenBSD-Regress-ID: 4841704ccdee50ee7efc6035bc686695c6ac2991

commit 84de1c27f845d15c859db44e7070a46f45504b66
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 23 03:35:07 2020 +0000

    upstream: Also test PuTTY chacha20.
    
    OpenBSD-Regress-ID: 7af6a0e8763b05f1f8eee6bca5f31fcb16151040

commit c7ed15a39695ecd5f1f21842d8d9cd22246d4ee2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 23 03:24:38 2020 +0000

    upstream: Also test PuTTY ecdh kex methods.
    
    OpenBSD-Regress-ID: ec4017dce612131842398a03e93007a869c2c133

commit c4b3a128954ee1b7fbcbda167baf8aca1a3d1c84
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 23 02:46:49 2020 +0000

    upstream: Remove unsupported algorithms from list of defaults at run
    
    time and remove ifdef and distinct settings for OPENSSL=no case.
    
    This will make things much simpler for -portable where the exact set
    of algos depends on the configuration of both OpenSSH and the libcrypto
    it's linked against (if any).  ok djm@
    
    OpenBSD-Commit-ID: e0116d0183dcafc7a9c40ba5fe9127805c5dfdd2

commit 56cffcc09f8a2e661d2ba02e61364ae6f998b2b1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 23 02:43:48 2020 +0000

    upstream: add a new signature operations "find-principal" to look
    
    up the principal associated with a signature from an allowed-signers file.
    Work by Sebastian Kinne; ok dtucker@
    
    OpenBSD-Commit-ID: 6f782cc7e18e38fcfafa62af53246a1dcfe74e5d

commit 65cf8730de6876a56595eef296e07a86c52534a6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jan 22 07:38:30 2020 +0000

    upstream: Ignore whitespace when checking explict fingerprint.
    
    When confirming a host key using the fingerprint itself, ignore leading and
    trailing whitespace. ok deraadt@ djm@
    
    OpenBSD-Commit-ID: cafd7f803bbdcd40c3a8f8f1a77747e6b6d8c011

commit 8d3af6ebdf524b34087a0a3ae415b5141ba10572
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jan 22 07:31:27 2020 +0000

    upstream: Increase keyscan timeout from default. On slow hosts 3
    
    concurrent keyscans can hit the default 5 second timeout, so increase to 15
    seconds.
    
    OpenBSD-Regress-ID: 16383dec166af369b7fb9948572856f5d544c93f

commit 6c30c9adbeeed09a8a9e7a69974cfa1f1ddd1e9e
Author: tedu@openbsd.org <tedu@openbsd.org>
Date:   Wed Jan 22 04:58:23 2020 +0000

    upstream: remove diffie-hellman-group14-sha1 from default kex to
    
    see what happens. general mostly ok
    
    OpenBSD-Commit-ID: 216b7b8462d2ef5f4531f26cb2cb839b2153dad9

commit 4a32c0ca44a2dc2a358f69b5d43c08e528b44b39
Author: claudio@openbsd.org <claudio@openbsd.org>
Date:   Wed Jan 22 04:51:51 2020 +0000

    upstream: For ssh-keygen -lF only add a space after key fingerprint
    
    when there is a comment. This makes copy-paste of fingerprints into ssh
    easier. OK djm@
    
    OpenBSD-Commit-ID: fa01d95624f65c1eb4dc7c575d20d77c78010dfd

commit 37d3b736506760e4ebc7fe56255f7b8ea823a00c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 22 04:49:16 2020 +0000

    upstream: some __func__ and strerror(errno) here; no functional
    
    change
    
    OpenBSD-Commit-ID: 6c3ddd5f848b99ea560b31d3fba99ceed66cef37

commit e2031b05c74c98b141179ceab13a323cf17d01e5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 22 02:25:21 2020 +0000

    upstream: factor out parsing of allowed-signers lines
    
    OpenBSD-Commit-ID: 85ee6aeff608371826019ea85e55bfa87f79d06e

commit 47160e1de8c2f638f0ef41cef42c976417b61778
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 22 10:30:13 2020 +1100

    unbreak fuzzer support for recent ssh-sk.h changes

commit 70d38c3cfd4550e8ee66cc3bf1b91aa339c91df5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 21 22:39:57 2020 +0000

    upstream: expose the number of currently-authenticating connections
    
    along with the MaxStartups limit in the proctitle; suggestion from Philipp
    Marek, w/ feedback from Craig Miskell ok dtucker@
    
    OpenBSD-Commit-ID: a4a6db2dc1641a5df8eddf7d6652176e359dffb3

commit a78c66d5d2144bd49779bc80a647346bd3d7233d
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Tue Jan 21 12:40:04 2020 +0000

    upstream: document the default value of the ControlPersist option;
    
    ok dtucker@ djm@
    
    OpenBSD-Commit-ID: 0788e7f2b5a9d4e36d3d2ab378f73329320fef66

commit b46a6325849e40aa2e4b0d962a6f00f708f6576a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 22 09:28:32 2020 +1100

    remove accidental change in f8c11461

commit 80d3bebcab96fe1d177e45906e10db16895da01d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 21 11:06:09 2020 +0000

    upstream: don't #ifdef out the KRL code when compiling without
    
    libcrypto support; it works just fine and disabling it breaks a few tests. ok
    dtucker@
    
    OpenBSD-Commit-ID: 65f6272c4241eb4b04de78b012fe98b2b555ad44

commit f8c11461aa6db168fc5e7eeae448b4cbbf59642a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 21 08:06:27 2020 +0000

    upstream: pass SSH_SK_HELPER explicitly past $SUDO to avoid it getting
    
    cleared; with dtucker@
    
    OpenBSD-Regress-ID: 03178a0580324bf0dff28f7eac6c3edbc5407f8e

commit b5fcb0ac1cc0ef01aeec1c089146298654ab3ae0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 21 07:07:31 2020 +0000

    upstream: check access(ssh-sk-helper, X_OK) to provide friendly
    
    error message for misconfigured helper paths
    
    OpenBSD-Commit-ID: 061bcc262155d12e726305c91394ac0aaf1f8341

commit 56bced43c14dc6fa2bfa1816007e441644105609
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jan 21 06:09:56 2020 +0000

    upstream: Document sntrup4591761x25519-sha512@tinyssh.org. Patch
    
    from jtesta@positronsecurity.com via github PR#151.
    
    OpenBSD-Commit-ID: f3d48168623045c258245c340a5a2af7dbb74edc

commit 4a05d789b86314fef7303824f69defbc6b96ed60
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 21 05:56:56 2020 +0000

    upstream: fix ssh-keygen not displaying authenticator touch
    
    prompt; reported by jmc@
    
    OpenBSD-Commit-ID: 04d4f582fc194eb3897ebcbfe286c49958ba2859

commit 881aded0389d999375f926051491a944c6d8752b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 21 05:56:27 2020 +0000

    upstream: a little more verbosity in sign_and_send_pubkey() debug
    
    messages
    
    OpenBSD-Commit-ID: 6da47a0e6373f6683006f49bc2a516d197655508

commit b715fdc71bbd009d0caff691ab3fc04903c4aee8
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sat Jan 18 21:16:43 2020 +0000

    upstream: one more replacement "(security) key" -> "(FIDO)
    
    authenticator"
    
    OpenBSD-Commit-ID: 031bca03c1d1f878ab929facd561911f1bc68dfd

commit 84911da1beeb6ed258a43468efb316cd39fb6855
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sat Jan 18 15:45:41 2020 +0000

    upstream: undo merge error and replace the term "security key"
    
    again
    
    OpenBSD-Commit-ID: 341749062c089cc360a7877e9ee3a887aecde395

commit e8c06c4ee708720efec12cd1a6f78a3c6d76b7f0
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Fri Jan 17 20:13:47 2020 +0000

    upstream: Document loading of resident keys from a FIDO
    
    authenticator.
    
    * Rename -O to -K to keep "-O option" available.
    * Document -K.
    * Trim usage() message down to synopsis, like all other commands.
    
    ok markus@
    
    OpenBSD-Commit-ID: 015c2c4b28f8e19107adc80351b44b23bca4c78a

commit 0d005d6372a067b59123dec8fc6dc905f2c09e1e
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Tue Jan 14 15:07:30 2020 +0000

    upstream: sync ssh-keygen.1 and ssh-keygen's usage() with each
    
    other and reality ok markus@
    
    OpenBSD-Commit-ID: cdf64454f2c3604c25977c944e5b6262a3bcce92

commit b8a4ca2ebfddab862f7eb1ea2a07fb9f70330429
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sat Jan 11 16:23:10 2020 +0000

    upstream: revise the fix for reversed arguments on
    
    expand_proxy_command()
    
    Always put 'host' before 'host_arg' for consistency.  ok markus@ djm@
    
    OpenBSD-Commit-ID: 1ba5b25472779f1b1957295fcc6907bb961472a3

commit 57b181eaf2d34fd0a1b51ab30cb6983df784de5a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 10 23:43:26 2020 +0000

    upstream: pass the log-on-stderr flag and log level through to
    
    ssh-sk-helper, making debugging a bit easier. ok markus@
    
    OpenBSD-Commit-ID: 2e7aea6bf5770d3f38b7c7bba891069256c5a49a

commit a8bd5fdbdb7581afc7123a042a7cd6ca25357388
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 21 12:32:16 2020 +1100

    Wrap copy_environment_blacklist() in #ifdef
    
    It's only needed for USE_PAM or HAVE_CYGWIN cases and will cause compiler
    warnings otherwise.

commit 10ecc647fc1db8d2dde9f6b9b826b201dfc48b62
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 21 12:20:05 2020 +1100

    depend

commit b3f7009c9ffa5891283ed96e043001e09934a8d4
Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date:   Mon Jan 20 11:56:48 2020 +0100

    Fix missing prototype warning for copy_environment
    
    This function is only used in this file, and only on Cygwin, so make
    it static and hide it behind HAVE_CYGWIN.  Prevents missing prototype
    warning.

commit 0c428c0e991e2c4fabc48cf5d9b8f84c9412e0c3
Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date:   Mon Jan 20 13:58:11 2020 +0100

    configure.ac: fix ldns test
    
    When running ./configure --with-ldns, if ldns-config cannot be found, we
    add -Iyes/include to CPPFLAGS and -Lyes/lib to LDFLAGS. Fix that.

commit 6089abf715e2784751c9f62697e09bb103295b93
Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date:   Mon Jan 20 12:13:26 2020 +0100

    Make sshpam_password_change_required static.
    
    sshpam_password_change_required is only used in auth-pam.c, so make it
    static to prevent a mising prototype warning.

commit 5a9b9c82851b7bc219dc3a65962a80803c76c102
Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date:   Mon Jan 20 12:24:51 2020 +0100

    sandbox-darwin.c: fix missing prototypes.
    
    Include the right header just like the other sandbox files.
    Fixes missing prototype warnings for ssh_sandbox_* functions.

commit 335dc93526942a650f6c69666b3f6ca44d0a2910
Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date:   Mon Jan 20 11:09:27 2020 +0100

    Fix a few warnings when on Mac OS X.
    
    Include stdlib.h for calloc, malloc, free and setenv.

commit 0488dc2d3050ea1a99ef5cf44afc50ffbf3f1315
Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date:   Mon Jan 20 10:32:23 2020 +0100

    Fix building without openssl.
    
    This fixes the following when there are no openssl headers on the system:
    ssh-ecdsa-sk.c:34:10: fatal error: 'openssl/bn.h' file not found

commit e6b7157b4ef29c83ec3a2d1d7c927e4b8898f9bb
Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date:   Wed Jan 15 16:08:55 2020 +0100

    Add config.log to .gitignore

commit 515e10ddf9644010b88cfd7ecf601f4306d42232
Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date:   Wed Jan 15 16:16:31 2020 +0100

    Fix typo in README.md, s/crytpo/crypto/

commit 1af3354aea3c4bfa5b5ecfb5d1ff3ad231c2073c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jan 15 16:22:36 2020 +1100

    Wrap stdint.h in ifdef HAVE_STDINT_H.

commit 429170f273ce1b0140f8111a45ba69390d98de3a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jan 14 14:41:47 2020 +1100

    Wrap stdint.h inside HAVE_STDINT_H.

commit a0989b60211b6f1c2313e1397c526d883a23a075
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jan 14 14:26:41 2020 +1100

    Include compat header for definitions.

commit e0cedcad51fe02683943bf4f1ad2961aa3f35313
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jan 14 09:42:52 2020 +1100

    Improve search for 'struct timespec'.
    
    Make struct timespec test consistent with existing timeval test.
    Include time.h for timespec in compat header where required.

commit acaf9e058594310001ce64468ed2923dc6323e81
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jan 14 12:43:03 2020 +1100

    Update depend to remove rmd160.h.

commit 26b2675b0c3e3efea11a52609073aec01736ec84
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jan 14 07:24:46 2020 +1100

    Remove configure test & compat code for ripemd160.
    
    RIPEMD160 support was removed upstream in 2017, however we still had
    a configure test and compat code for it, so clean those up now.

commit ed3ad71b17adcd1fb4431d145f53cee1c6a1135e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 9 03:28:38 2020 +0000

    upstream: fix reversed arguments on expand_proxy_command(); spotted
    
    by anton@
    
    OpenBSD-Commit-ID: db1c32478a01dfbc9c4db171de0f25907bea5775

commit cd53476383f0cf475f40ba8ac8deb6b76dd5ce4e
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Jan 6 07:43:28 2020 +0000

    upstream: put the fido options in a list, and tidy up the text a
    
    little; ok djm
    
    OpenBSD-Commit-ID: 491ce15ae52a88b7a6a2b3b6708a14b4aacdeebb

commit 30f704ebc0e9e32b3d12f5d9e8c1b705fdde2c89
Author: Jeremy Drake <github@jdrake.com>
Date:   Fri Oct 11 18:31:05 2019 -0700

    Deny (non-fatal) ipc in preauth privsep child.
    
    As noted in openssh/openssh-portable#149, i386 does not have have
    _NR_shmget etc.  Instead, it has a single ipc syscall (see man 2 ipc,
    https://linux.die.net/man/2/ipc).  Add this syscall, if present, to the
    list of syscalls that seccomp will deny non-fatally.

commit b110cefdfbf5a20f49b774a55062d6ded2fb6e22
Author: Khem Raj <raj.khem@gmail.com>
Date:   Tue Jan 7 16:26:45 2020 -0800

    seccomp: Allow clock_gettime64() in sandbox.
    
    This helps sshd accept connections on mips platforms with
    upcoming glibc ( 2.31 )

commit 3cc60c899a92a469e5118310ba6b74cb57215618
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 6 02:39:30 2020 +0000

    upstream: missing else in check_enroll_options()
    
    OpenBSD-Commit-ID: e058fb918fda56ddbbf0bee910101004cec421d4

commit ff5784e2698d6c41e9f39ce4df24968c1beeb2bb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 6 02:24:28 2020 +0000

    upstream: fix error message
    
    OpenBSD-Commit-ID: 1eb52025658eb78ea6223181e552862198d3d505

commit dd2acc8b862c09751621995fba2d5fa6f4e24cc9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 6 02:07:50 2020 +0000

    upstream: adapt sk-dummy to SK API changes
    
    also, make it pull prototypes directly from sk-api.c and #error
    if the expected version changes. This will make any future regress
    test breakage because of SK API changes much more apparent
    
    OpenBSD-Regress-ID: 79b07055de4feb988e31da71a89051ad5969829d

commit c312ca077cd2a6c15545cd6b4d34ee2f69289174
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 6 02:00:46 2020 +0000

    upstream: Extends the SK API to accept a set of key/value options
    
    for all operations. These are intended to future-proof the API a little by
    making it easier to specify additional fields for without having to change
    the API version for each.
    
    At present, only two options are defined: one to explicitly specify
    the device for an operation (rather than accepting the middleware's
    autoselection) and another to specify the FIDO2 username that may
    be used when generating a resident key. These new options may be
    invoked at key generation time via ssh-keygen -O
    
    This also implements a suggestion from Markus to avoid "int" in favour
    of uint32_t for the algorithm argument in the API, to make implementation
    of ssh-sk-client/helper a little easier.
    
    feedback, fixes and ok markus@
    
    OpenBSD-Commit-ID: 973ce11704609022ab36abbdeb6bc23c8001eabc

commit 2ab335712d084d9ccaf3f53afc3fa9535329da87
Author: beck@openbsd.org <beck@openbsd.org>
Date:   Sun Jan 5 16:28:22 2020 +0000

    upstream: fix CanonicalizeHostname, broken by rev 1.507
    
    Issue noticed and reported by Pierre-Olivier Martel <pom@apple.com>
    ok dtucker@ markus@ djm@
    
    OpenBSD-Commit-ID: 749f3168ec520609c35b0c4e1984e5fa47f16094

commit 69e44ba701b90b0f530d64c3fe4363ea86e50cd3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jan 6 09:02:53 2020 +1100

    Fix typo: 'you' -> 'your'.
    
    bz#3108 from jmckitrick@gmail.com.

commit 7652a57662969bd5c61448b3843ec6d407ad12be
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jan 6 08:56:46 2020 +1100

    Remove auth-skey.c.
    
    S/Key support was removed in OpenSSH 7.8 but this file was missed.

commit c593cc5e826c9f4ec506e22b629d37cabfaacff9
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jan 3 07:33:33 2020 +0000

    upstream: the download resident keys option is -K (upper) not -k
    
    (lower); ok djm
    
    OpenBSD-Commit-ID: 71dc28a3e1fa7c553844abc508845bcf5766e091

commit ff31f15773ee173502eec4d7861ec56f26bba381
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 3 03:02:26 2020 +0000

    upstream: what bozo decided to use 2020 as a future date in a regress
    
    test?
    
    OpenBSD-Regress-ID: 3b953df5a7e14081ff6cf495d4e8d40e153cbc3a

commit 680eb7749a39d0e4d046e66cac4e51e8e3640b75
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 3 02:46:19 2020 +0000

    upstream: implement recent SK API change to support resident keys
    
    and PIN prompting in the dummy middleware that we use for the tests. Should
    fix breakage spotted by dtucker@
    
    OpenBSD-Regress-ID: 379cf9eabfea57aaf7f3f59dafde59889566c484

commit 86834fe6b54ac57b8528c30cf0b27e5cac5b7af7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 2 13:25:38 2020 +0000

    upstream: Update keygen moduli screen test to match recent command
    
    line option change to ssh-keygen(1).
    
    OpenBSD-Regress-ID: 744a72755004377e9669b662c13c6aa9ead8a0c3

commit 9039971887cccd95b209c479296f772a3a93e8e7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 2 22:40:09 2020 +0000

    upstream: ability to download FIDO2 resident keys from a token via
    
    "ssh-keygen -K". This will save public/private keys into the current
    directory.
    
    This is handy if you move a token between hosts.
    
    feedback & ok markus@
    
    OpenBSD-Commit-ID: d57c1f9802f7850f00a117a1d36682a6c6d10da6

commit 878ba4350d57e905d6bb1865d8ff31bdfe5deab4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 2 22:38:33 2020 +0000

    upstream: add sshkey_save_public(), to save a public key; ok
    
    markus@
    
    OpenBSD-Commit-ID: 5d6f96a966d10d7fa689ff9aa9e1d6767ad5a076

commit 3b1382ffd5e71eff78db8cef0f3cada22ff29409
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Dec 30 16:10:00 2019 +0000

    upstream: simplify the list for moduli options - no need for
    
    -compact;
    
    OpenBSD-Commit-ID: 6492c72280482c6d072be46236b365cb359fc280

commit 0248ec7c763dee9ff730a589e3d166eac5c74d7c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 2 13:41:31 2020 +1100

    ssh-sk-null.cc needs extern "C" {}

commit 5ca4b414effe4b56f0cfe3058c92391aa8a43871
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 2 10:56:29 2020 +1100

    add dummy ssh-sk API for linking with fuzzers

commit c4b2664be7ba25e4c233315b25212dec29b727ab
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 30 21:04:09 2019 +1100

    refresh depend

commit 3093d12ff80927cf45da08d9f262a26680fb14ee
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 30 09:49:52 2019 +0000

    upstream: Remove the -x option currently used for
    
    FIDO/U2F-specific key flags. Instead these flags may be specified via -O.
    
    ok markus@
    
    OpenBSD-Commit-ID: f23ebde2a8a7e1bf860a51055a711cffb8c328c1

commit ef65e7dbaa8fac3245aa2bfc9f7e09be7cba0d9d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 30 09:25:29 2019 +0000

    upstream: document SK API changes in PROTOCOL.u2f
    
    ok markus@
    
    OpenBSD-Commit-ID: 52622363c103a3c4d3d546050480ffe978a32186

commit 43ce96427b76c4918e39af654e2fc9ee18d5d478
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 30 09:24:45 2019 +0000

    upstream: translate and return error codes; retry on bad PIN
    
    Define some well-known error codes in the SK API and pass
    them back via ssh-sk-helper.
    
    Use the new "wrong PIN" error code to retry PIN prompting during
    ssh-keygen of resident keys.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: 9663c6a2bb7a0bc8deaccc6c30d9a2983b481620

commit d433596736a2cd4818f538be11fc94783f5c5236
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 30 09:24:03 2019 +0000

    upstream: improve some error messages; ok markus@
    
    OpenBSD-Commit-ID: 4ccd8ddabb8df4f995107dd3b7ea58220e93cb81

commit c54cd1892c3e7f268b21e1f07ada9f0d9816ffc0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 30 09:23:28 2019 +0000

    upstream: SK API and sk-helper error/PIN passing
    
    Allow passing a PIN via the SK API (API major crank) and let the
    ssh-sk-helper API follow.
    
    Also enhance the ssh-sk-helper API to support passing back an error
    code instead of a complete reply. Will be used to signal "wrong PIN",
    etc.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: a1bd6b0a2421646919a0c139b8183ad76d28fb71

commit 79fe22d9bc2868c5118f032ec1200ac9c2e3aaef
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 30 09:22:49 2019 +0000

    upstream: implement loading resident keys in ssh-add
    
    "ssh-add -O" will load resident keys from a FIDO2 token and add them
    to a ssh-agent.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: 608104ae957a7d65cb84e0a3a26c8f60e0df3290

commit 27753a8e21887d47fe6b5c78a4aed0efe558a850
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 30 09:21:59 2019 +0000

    upstream: implement loading of resident keys in ssh-sk-helper
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: b273c23769ea182c55c4a7b8f9cbd9181722011a

commit 14cea36df397677b8f8568204300ef654114fd76
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 30 09:21:16 2019 +0000

    upstream: resident keys support in SK API
    
    Adds a sk_load_resident_keys() function to the security key
    API that accepts a security key provider and a PIN and returns
    a list of keys.
    
    Implement support for this in the usbhid middleware.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: 67e984e4e87f4999ce447a6178c4249a9174eff0

commit 2fe05fcb4a2695f190b4fcf27770b655586ab349
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 30 09:20:36 2019 +0000

    upstream: Factor out parsing of struct sk_enroll_response
    
    We'll reuse this for extracting resident keys from a device.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: 9bc1efd9c6897eac4df0983746cf6578c1542273

commit 4532bd01d57ee13c3ca881eceac1bf9da96a4d7e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 30 09:19:52 2019 +0000

    upstream: basic support for generating FIDO2 resident keys
    
    "ssh-keygen -t ecdsa-sk|ed25519-sk -x resident" will generate a
    device-resident key.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: 8e1b3c56a4b11d85047bd6c6c705b7eef4d58431

commit 3e60d18fba1b502c21d64fc7e81d80bcd08a2092
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 30 03:30:09 2019 +0000

    upstream: remove single-letter flags for moduli options
    
    Move all moduli generation options to live under the -O flag.
    
    Frees up seven single-letter flags.
    
    NB. this change break existing ssh-keygen commandline syntax for moduli-
    related operations. Very few people use these fortunately.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: d498f3eaf28128484826a4fcb343612764927935

commit 1e645fe767f27725dc7fd7864526de34683f7daf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 30 03:28:41 2019 +0000

    upstream: prepare for use of ssh-keygen -O flag beyond certs
    
    Move list of available certificate options in ssh-keygen.1 to the
    CERTIFICATES section.
    
    Collect options specified by -O but delay parsing/validation of
    certificate options until we're sure that we're acting as a CA.
    
    ok markus@
    
    OpenBSD-Commit-ID: 33e6bcc29cfca43606f6fa09bd84b955ee3a4106

commit 20ccd854245c598e2b47cc9f8d4955d645195055
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Dec 27 08:28:44 2019 +0000

    upstream: sort -Y internally in the options list, as is already
    
    done in synopsis;
    
    OpenBSD-Commit-ID: 86d033c5764404057616690d7be992e445b42274

commit 5b6c954751dd3677466cda7adb92e4f05446c96c
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Dec 27 08:25:07 2019 +0000

    upstream: in the options list, sort -Y and -y;
    
    OpenBSD-Commit-ID: 24c2e6a3aeab6e050a0271ffc73fdff91c10dcaa

commit 141df487ba699cfd1ec3dcd98186e7c956e99024
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sat Dec 21 20:22:34 2019 +0000

    upstream: Replace the term "security key" with "(FIDO)
    
    authenticator".
    
    The polysemous use of "key" was too confusing.  Input from markus@.
    ok jmc@
    
    OpenBSD-Commit-ID: 12eea973a44c8232af89f86e4269d71ae900ca8f

commit fbd9729d4eadf2f7097b6017156387ac64302453
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Dec 21 02:33:07 2019 +0000

    upstream: unit tests for ForwardAgent=/path; from Eric Chiang
    
    OpenBSD-Regress-ID: 24f693f78290b2c17725dab2c614dffe4a88c8da

commit e5b7cf8edca7e843adc125621e1dab14507f430a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 16 02:39:05 2019 +0000

    upstream: test security key host keys in addition to user keys
    
    OpenBSD-Regress-ID: 9fb45326106669a27e4bf150575c321806e275b1

commit 40be78f503277bd91c958fa25ea9ef918a2ffd3d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Dec 21 02:19:13 2019 +0000

    upstream: Allow forwarding a different agent socket to the path
    
    specified by $SSH_AUTH_SOCK, by extending the existing ForwardAgent option to
    accepting an explicit path or the name of an environment variable in addition
    to yes/no.
    
    Patch by Eric Chiang, manpage by me; ok markus@
    
    OpenBSD-Commit-ID: 98f2ed80bf34ea54d8b2ddd19ac14ebbf40e9265

commit 416f15372bfb5be1709a0ad1d00ef5d8ebfb9e0e
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Fri Dec 20 20:28:55 2019 +0000

    upstream: SSH U2F keys can now be used as host keys. Fix a garden
    
    path sentence. ok markus@
    
    OpenBSD-Commit-ID: 67d7971ca1a020acd6c151426c54bd29d784bd6b

commit 68010acbcfe36167b3eece3115f3a502535f80df
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 20 02:42:42 2019 +0000

    upstream: Move always unsupported keywords to be grouped with the other
    
    ones. Move oSecurityProvider to match the order in the OpCodes enum. Patch
    from openbsd@academicsolutions.ch, ok djm@
    
    OpenBSD-Commit-ID: 061e4505861ec1e02ba3a63e3d1b3be3cad458ec

commit 8784b02dc49e1c98df4e7aca466be2f652ed4ad1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 20 02:29:21 2019 +0000

    upstream: Remove obsolete opcodes from the configuation enum.
    
    Patch from openbsd@academicsolutions.ch, ok djm@
    
    OpenBSD-Commit-ID: 395c202228872ce8d9044cc08552ac969f51e01b

commit 345be6091bdc9be09c90a937d1320f97c01fab2a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 20 02:11:38 2019 +0000

    upstream: Remove now-obsolete config options from example in
    
    comment.  Patch from openbsd@academicsolutions.ch, ok djm@
    
    OpenBSD-Commit-ID: 35862beb0927b1cb0af476ec23cc07f6e3006101

commit ae024b22c4fd68e7f39681d605585889f9511108
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Thu Dec 19 15:09:30 2019 +0000

    upstream: Document that security key-hosted keys can act as host
    
    keys.
    
    Update the list of default host key algorithms in ssh_config.5 and
    sshd_config.5.  Copy the description of the SecurityKeyProvider
    option to sshd_config.5.
    
    ok jmc@
    
    OpenBSD-Commit-ID: edadf3566ab5e94582df4377fee3b8b702c7eca0

commit bc2dc091e0ac4ff6245c43a61ebe12c7e9ea0b7f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Dec 19 03:50:01 2019 +0000

    upstream: "Forward security" -> "Forward secrecy" since that's the
    
    correct term. Add "MAC" since we use that acronym in other man pages.  ok
    naddy@
    
    OpenBSD-Commit-ID: c35529e511788586725fb63bda3459e10738c5f5

commit e905f7260d72bc0e33ef5f10a0db737ff6e77ba7
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Tue Dec 17 16:21:07 2019 +0000

    upstream: cut obsolete lists of crypto algorithms from outline of
    
    how SSH works ok markus@ jmc@
    
    OpenBSD-Commit-ID: 8e34973f232ab48c4d4f5d07df48d501708b9160

commit f65cf1163ff01531ae02f3f9210391d0d692f699
Author: tobhe@openbsd.org <tobhe@openbsd.org>
Date:   Mon Dec 16 13:58:53 2019 +0000

    upstream: strdup may return NULL if memory allocation fails. Use
    
    the safer xstrdup which fatals on allocation failures.
    
    ok markus@
    
    OpenBSD-Commit-ID: 8b608d387120630753cbcb8110e0b019c0c9a0d0

commit 57634bfc5708477826c0be265ddc59b9d83e4886
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 16 03:16:58 2019 +0000

    upstream: sort sk-* methods behind their plain key methods cousins
    
    for now
    
    OpenBSD-Commit-ID: c97e22c2b28c0d12ee389b8b4ef5f2ada7908828

commit b8df8fe920e697edcc69c520390b78c3b7ad9d84
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Dec 17 19:46:15 2019 +1100

    Mac OS X has PAM too.

commit bf8de8b8251af69b5ce96a8faa69145af156af4d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Dec 17 19:37:06 2019 +1100

    Show portable tarball pattern in example.

commit a19ef613e98141cc37c8acdeebe285b9dbe2531e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Dec 17 19:35:59 2019 +1100

    OpenSSL is now optional.

commit 1a7217ac063e48cf0082895aeee81ed2b8a57191
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 15 18:58:33 2019 +0000

    upstream: adapt to ssh-sk-client change
    
    OpenBSD-Regress-ID: 40481999a5928d635ab2e5b029e8239c112005ea

commit a7fc1df246e80bfdabd09b069b91c72f9c578ca8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Dec 11 18:47:14 2019 +0000

    upstream: it's no longer possible to disable privilege separation
    
    in sshd, so don't double the tests' work by trying both off/on
    
    OpenBSD-Regress-ID: d366665466dbd09e9b707305da884be3e7619c68

commit 3145d38ea06820a66c0f5e068f49af14fd2b7ac1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 15 20:59:23 2019 +0000

    upstream: don't treat HostKeyAgent=none as a path either; avoids
    
    spurious warnings from the cfgparse regress test
    
    OpenBSD-Commit-ID: ba49ea7a5c92b8a16cb9c2e975dbb163853afc54

commit 747e25192f436e71dd39e15d65aa32bca967533a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 15 20:57:15 2019 +0000

    upstream: do not attempt to find an absolute path for sshd_config
    
    SecurityKeyProvider=internal - unbreaks cfgparse regress test
    
    OpenBSD-Commit-ID: d2ddcf525c0dc3c8339522360c10b3c70f1fd641

commit 9b6e30b96b094ad787511a5b989253e3b8fe1789
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 15 19:47:10 2019 +0000

    upstream: allow ssh-keyscan to find security key hostkeys
    
    OpenBSD-Commit-ID: 1fe822a7f714df19a7e7184e3a3bbfbf546811d3

commit 56584cce75f3d20aaa30befc7cbd331d922927f3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 15 18:57:30 2019 +0000

    upstream: allow security keys to act as host keys as well as user
    
    keys.
    
    Previously we didn't do this because we didn't want to expose
    the attack surface presented by USB and FIDO protocol handling,
    but now that this is insulated behind ssh-sk-helper there is
    less risk.
    
    ok markus@
    
    OpenBSD-Commit-ID: 77b068dd133b8d87e0f010987bd5131e640ee64c

commit 5af6fd5461bb709304e6979c8b7856c7af921c9e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Dec 16 13:55:56 2019 +1100

    Allow clock_nanosleep_time64 in seccomp sandbox.
    
    Needed on Linux ARM.  bz#3100, patch from jjelen@redhat.com.

commit fff8ff6dd580e1a72ba09a6775d185175cdc8d13
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Dec 15 18:27:02 2019 +1100

    Put SK ECDSA bits inside ifdef OPENSSL_HAS_ECC.
    
    Fixes build when linking against OpenSSLs built with no-ec.

commit 9244990ecdcfa36bb9371058111685b05f201c1e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 14 09:21:46 2019 +1100

    remove a bunch of ENABLE_SK #ifdefs
    
    The ssh-sk-helper client API gives us a nice place to disable
    security key support when it is wasn't enabled at compile time,
    so we don't need to check everywere.
    
    Also, verification of security key signatures can remain enabled
    all the time - it has no additional dependencies. So sshd can
    accept security key pubkeys in authorized_keys, etc regardless of
    the host's support for dlopen, etc.

commit a33ab1688b5c460a7e2a301418241ce1b13b2638
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 14 09:15:06 2019 +1100

    ssh-sk-client.c needs includes.h

commit 633778d567ad50b63d2a3bca5e1b97d279d236d9
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 14 08:40:33 2019 +1100

    only link ssh-sk-helper against libfido2

commit 7b47b40b170db4d6f41da0479575f6d99dd7228a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 14 08:20:52 2019 +1100

    adapt Makefile to ssh-sk-client everywhere

commit f45f3a8a12e2bee601046b916e6c5cd6eae08048
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 14 07:53:11 2019 +1100

    fixup

commit d21434766764d5babf99fc3937c19b625c0f6334
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 13 20:16:56 2019 +0000

    upstream: actually commit the ssh-sk-helper client code; ok markus
    
    OpenBSD-Commit-ID: fd2ea776a5bbbf4d452989d3c3054cf25a5e0589

commit 611073fb40ecaf4ac65094e403edea3a08deb700
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 13 19:11:14 2019 +0000

    upstream: perform security key enrollment via ssh-sk-helper too.
    
    This means that ssh-keygen no longer needs to link against ssh-sk-helper, and
    only ssh-sk-helper needs libfido2 and /dev/uhid* access;
    
    feedback & ok markus@
    
    OpenBSD-Commit-ID: 9464233fab95708d2ff059f8bee29c0d1f270800

commit 612b1dd1ec91ffb1e01f58cca0c6eb1d47bf4423
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 13 19:09:37 2019 +0000

    upstream: allow sshbuf_put_stringb(buf, NULL); ok markus@
    
    OpenBSD-Commit-ID: 91482c1ada9adb283165d48dafbb88ae91c657bd

commit b52ec0ba3983859514aa7b57d6100fa9759fe696
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 13 19:09:10 2019 +0000

    upstream: use ssh-sk-helper for all security key signing operations
    
    This extracts and refactors the client interface for ssh-sk-helper
    from ssh-agent and generalises it for use by the other programs.
    This means that most OpenSSH tools no longer need to link against
    libfido2 or directly interact with /dev/uhid*
    
    requested by, feedback and ok markus@
    
    OpenBSD-Commit-ID: 1abcd3aea9a7460eccfbf8ca154cdfa62f1dc93f

commit c33d46868c3d88e04a92610cdb429094aeeb5847
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Dec 11 22:19:47 2019 +0000

    upstream: add a note about the 'extensions' field in the signed
    
    object
    
    OpenBSD-Commit-ID: 67c01e0565b258e0818c1ccfe1f1aeaf9a0d4c7b

commit a62f4e1960691f3aeb1f972e009788b29e2ae464
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 10 23:37:31 2019 +0000

    upstream: some more corrections for documentation problems spotted
    
    by Ron Frederick
    
    document certifiate private key format
    correct flags type for sk-ssh-ed25519@openssh.com keys
    
    OpenBSD-Commit-ID: fc4e9a1ed7f9f7f9dd83e2e2c59327912e933e74

commit 22d4beb79622fc82d7111ac941269861fc7aef8d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 10 23:21:56 2019 +0000

    upstream: loading security keys into ssh-agent used the extension
    
    constraint "sk-provider@openssh.com", not "sk@openssh.com"; spotted by Ron
    Frederick
    
    OpenBSD-Commit-ID: dbfba09edbe023abadd5f59c1492df9073b0e51d

commit 75f7f22a43799f6d25dffd9d6683de1601da05a3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 10 22:43:19 2019 +0000

    upstream: add security key types to list of keys allowed to act as
    
    CAs; spotted by Ron Frederick
    
    OpenBSD-Commit-ID: 9bb0dfff927b4f7aa70679f983f84c69d45656c3

commit 516605f2d596884cedc2beed6b262716ec76f63d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 10 22:37:20 2019 +0000

    upstream: when acting as a CA and using a security key as the CA
    
    key, remind the user to touch they key to authorise the signature.
    
    OpenBSD-Commit-ID: fe58733edd367362f9766b526a8b56827cc439c1

commit c4036fe75ea5a4d03a2a40be1f3660dcbbfa01b2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 10 22:36:08 2019 +0000

    upstream: chop some unnecessary and confusing verbiage from the
    
    security key protocol description; feedback from Ron Frederick
    
    OpenBSD-Commit-ID: 048c9483027fbf9c995e5a51b3ac502989085a42

commit 59175a350fe1091af7528b2971e3273aa7ca7295
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 6 03:06:08 2019 +0000

    upstream: fix setting of $SSH_ASKPASS_PROMPT - it shouldn't be set
    
    when asking passphrases, only when confirming the use of a key (i.e. for
    ssh-agent keys added with "ssh-add -c keyfile")
    
    OpenBSD-Commit-ID: 6643c82960d9427d5972eb702c917b3b838ecf89

commit 36eaa356d391a23a2d4e3a8aaa0223abc70b9822
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 6 02:55:21 2019 +0000

    upstream: bring the __func__
    
    OpenBSD-Commit-ID: 71a3a45b0fe1b8f680ff95cf264aa81f7abbff67

commit 483cc723d1ff3b7fdafc6239348040a608ebc78d
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Nov 30 07:07:59 2019 +0000

    upstream: tweak the Nd lines for a bit of consistency; ok markus
    
    OpenBSD-Commit-ID: 876651bdde06bc1e72dd4bd7ad599f42a6ce5a16

commit afffd310360b155df2133d1f5f1ab2f4e939b570
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Dec 11 13:22:06 2019 +1100

    Check if memmem is declared in system headers.
    
    If the system (or one of the dependencies) implements memmem but does
    not define the header, we would not declare it either resulting in
    compiler warnings.  Check for declaration explicitly.  bz#3102.

commit ad8cd420797695f3b580aea1034b9de60bede9b9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Dec 11 13:12:01 2019 +1100

    Sort depends.

commit 5e3abff39e01817f6866494416f2ada25c316018
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Dec 11 13:09:34 2019 +1100

    Sort .depend when rebuilding.
    
    This makes diffs more stable between makedepend implementations.

commit 5df9d1f5c0943367d9b68435f4c82224ce11a73f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Dec 11 13:06:43 2019 +1100

    Update depend to include sk files.

commit 9a967c5bbfca35835165f7d8a6165009f5b21872
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Dec 9 20:25:26 2019 +1100

    Describe how to build libcrypto as PIC.
    
    While there, move the OpenSSL 1.1.0g caveat closer to the other version
    information.

commit b66fa5da25c4b5b67cf9f0ce7af513f5a6a6a686
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Dec 9 17:23:22 2019 +1100

    Recommend running LibreSSL or OpenSSL self-tests.

commit fa7924008e838cded7e8a561356ffe5e06e0ed64
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Dec 6 14:17:26 2019 +1100

    Wrap ECC specific bits in ifdef.
    
    Fixes tests when built against an OpenSSL configured with no-ec.

commit 2ff822eabd7d4461743f22d3b9ba35ab76069df5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 29 20:21:36 2019 +1100

    Wrap sha2.h include in ifdef.
    
    Fixes build --without-openssl on at least Fedora.

commit 443848155ffcda65a6077aac118c861b503a093f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 29 15:10:21 2019 +1100

    compile sk-dummy.so with no-PIE version of LDFLAGS
    
    This lets it pick up the -L path to libcrypto for example.

commit 37f5b5346e4cc6a894245aa89d2930649bb7045b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 29 14:48:46 2019 +1100

    includes.h for sk-dummy.c, dummy

commit b218055e59a7c1a1816f7a55ca18e3f3c05d63a4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 29 12:32:23 2019 +1100

    (yet) another x-platform fix for sk-dummy.so
    
    Check for -fPIC support from compiler
    
    Compile libopenbsd-compat -fPIC
    
    Don't mix -fPIE and -fPIC when compiling

commit 0dedb703adcd98d0dbc4479f5f312a2bd3df2850
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 29 11:53:57 2019 +1100

    needs includes.h for WITH_OPENSSL

commit ef3853bb94c2c72e7eda0de6cec0bcb1da62058f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 29 11:52:23 2019 +1100

    another attempt at sk-dummy.so working x-platform
    
    include a fatal() implementation to satisfy libopenbsd-compat
    
    clean up .lo and .so files
    
    .gitignore .lo and .so files

commit d46ac56f1cbd5a855a2d5e7309f90d383dcf6431
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 29 00:13:29 2019 +0000

    upstream: lots of dependencies go away here with ed25519 no longer
    
    needing the ssh_digest API.
    
    OpenBSD-Regress-ID: 785847ec78cb580d141e29abce351a436d6b5d49

commit 7404b81f25a4a7847380c0f0cf7f1bea5f0a5cd3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 29 00:11:21 2019 +0000

    upstream: perform hashing directly in crypto_hash_sha512() using
    
    libcrypto or libc SHA512 functions rather than calling ssh_digest_memory();
    avoids many dependencies on ssh code that complicate standalone use of
    ed25519, as we want to do in sk-dummy.so
    
    OpenBSD-Commit-ID: 5a3c37593d3ba7add037b587cec44aaea088496d

commit d39a865b7af93a7a9b5a64cf7cf0ef4396c80ba3
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Nov 28 12:24:31 2019 +0000

    upstream: improve the text for -A a little; input from naddy and
    
    djm
    
    OpenBSD-Commit-ID: f9cdfb1d6dbb9887c4bf3bb25f9c7a94294c988d

commit 9a0e01bd0c61f553ead96b5af84abd73865847b8
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Nov 28 12:23:25 2019 +0000

    upstream: reshuffle the text to read better; input from naddy,
    
    djmc, and dtucker
    
    OpenBSD-Commit-ID: a0b2aca2b67614dda3d6618ea097bf0610c35013

commit 5ca52c0f2e5e7f7d01d8d557b994b5c2087bed00
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 28 18:09:07 2019 +1100

    $< doesn't work as` I thought; explicily list objs

commit 18e84bfdc5906a73405c3b42d7f840013bbffe34
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 28 05:20:54 2019 +0000

    upstream: tweak wording
    
    OpenBSD-Commit-ID: bd002ca1599b71331faca735ff5f6de29e32222e

commit 8ef5bf9d03aa0f047711cff47f5ffbe3b33ff8c9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 28 13:12:30 2019 +1100

    missing .SUFFIXES line makes make sad

commit 323da82b8ea993b7f2c5793fd53b4f5ca105d19d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 28 09:53:42 2019 +1100

    (hopefully) fix out of tree builds of sk-dummy.so

commit d8b2838c5d19bf409d44ede4d32df8ee47aeb4cd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 27 22:32:11 2019 +0000

    upstream: remove stray semicolon after closing brace of function;
    
    from Michael Forney
    
    OpenBSD-Commit-ID: fda95acb799bb160d15e205ee126117cf33da3a7

commit 6e1d1bbf5a3eca875005e0c87f341a0a03799809
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Nov 27 05:38:43 2019 +0000

    upstream: Revert previous commit. The channels code still uses int
    
    in many places for channel ids so the INT_MAX check still makes sense.
    
    OpenBSD-Commit-ID: 532e4b644791b826956c3c61d6ac6da39bac84bf

commit 48989244658b9748b6801034ff4ffbdfc6b1520f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 27 16:03:12 2019 +1100

    wire sk-dummy.so into test suite

commit f79364bacaebde4f1c260318ab460fceacace02f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 27 05:00:17 2019 +0000

    upstream: use error()+_exit() instead of fatal() to avoid running
    
    cleanup handlers in child process; spotted via weird regress failures in
    portable
    
    OpenBSD-Commit-ID: 6902a9bb3987c7d347774444f7979b8a9ba7f412

commit 70ec5e5e2681bcd409a9df94a2fec6f57a750945
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Nov 27 03:34:04 2019 +0000

    upstream: Make channel_id u_int32_t and remove unnecessary check
    
    and cast that were left over from the type conversion.  Noted by
    t-hashida@amiya.co.jp in bz#3098, ok markus@ djm@
    
    OpenBSD-Commit-ID: 3ad105b6a905284e780b1fd7ff118e1c346e90b5

commit ad44ca81bea83657d558aaef5a1d789a9032bac3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 26 23:43:10 2019 +0000

    upstream: test FIDO2/U2F key types; ok markus@
    
    OpenBSD-Regress-ID: 367e06d5a260407619b4b113ea0bd7004a435474

commit c6efa8a91af1d4fdb43909a23a0a4ffa012155ad
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 26 23:41:23 2019 +0000

    upstream: add dummy security key middleware based on work by
    
    markus@
    
    This will allow us to test U2F/FIDO2 support in OpenSSH without
    requiring real hardware.
    
    ok markus@
    
    OpenBSD-Regress-ID: 88b309464b8850c320cf7513f26d97ee1fdf9aae

commit 8635afa1cdc21366d61730d943f3cf61861899c8
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Nov 26 22:42:26 2019 +0000

    upstream: tweak previous;
    
    OpenBSD-Commit-ID: a4c097364c75da320f1b291568db830fb1ee4883

commit e0d38ae9bc8c0de421605b9021d8144e4d8ff22b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 26 03:04:27 2019 +0000

    upstream: more debugging; behind DEBUG_SK
    
    OpenBSD-Commit-ID: a978896227118557505999ddefc1f4c839818b60

commit 9281d4311b8abc63b88259f354944c53f9b0b3c7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 25 21:47:49 2019 +1100

    unbreak fuzzers for recent security key changes

commit c5f1cc993597fed0a9013743556b1567f476c677
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 25 10:32:35 2019 +0000

    upstream: unbreak tests for recent security key changes
    
    OpenBSD-Regress-ID: 2cdf2fcae9962ca4d711338f3ceec3c1391bdf95

commit 64988266820cc90a45a21672be9d762cbde8d34d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 25 06:53:04 2019 +0000

    upstream: unbreak after security key support landed
    
    OpenBSD-Regress-ID: 3ab578b0dbeb2aa6d9969b54a9c1bad329c0dcba

commit e65e25c81e22ea622e89a142a303726a3882384f
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Thu Nov 21 05:18:47 2019 +0000

    upstream: Remove workaround for broken 'openssl rsa -text' output
    
    that was fixed in libcrypto/rsa/rsa_ameth.c r1.24.
    
    ok dtucker inoguchi
    
    OpenBSD-Regress-ID: c260edfac177daa8fcce90141587cf04a95c4f5f

commit 21377ec2a9378579ba4b44a681af7bbca77581f4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 25 10:23:36 2019 +0000

    upstream: redundant test
    
    OpenBSD-Commit-ID: 38fa7806c528a590d91ae560e67bd8b246c2d7a3

commit 664deef95a2e770812533439b8bdd3f3c291ae59
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 25 00:57:51 2019 +0000

    upstream: document the "no-touch-required" certificate extension;
    
    ok markus, feedback deraadt
    
    OpenBSD-Commit-ID: 47640122b13f825e9c404ea99803b2372246579d

commit 26cb128b31efdd5395153f4943f5be3eddc07033
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 25 00:57:27 2019 +0000

    upstream: Print a key touch reminder when generating a security
    
    key. Most keys require a touch to authorize the operation.
    
    OpenBSD-Commit-ID: 7fe8b23edbf33e1bb81741b9f25e9a63be5f6b68

commit daeaf4136927c2a82af1399022103d67ff03f74a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 25 00:55:58 2019 +0000

    upstream: allow "ssh-keygen -x no-touch-required" when generating a
    
    security key keypair to request one that does not require a touch for each
    authentication attempt. The default remains to require touch.
    
    feedback deraadt; ok markus@
    
    OpenBSD-Commit-ID: 887e7084b2e89c0c62d1598ac378aad8e434bcbd

commit 2e71263b80fec7ad977e098004fef7d122169d40
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 25 00:54:23 2019 +0000

    upstream: add a "no-touch-required" option for authorized_keys and
    
    a similar extension for certificates. This option disables the default
    requirement that security key signatures attest that the user touched their
    key to authorize them.
    
    feedback deraadt, ok markus
    
    OpenBSD-Commit-ID: f1fb56151ba68d55d554d0f6d3d4dba0cf1a452e

commit 0fddf2967ac51d518e300408a0d7e6adf4cd2634
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 25 00:52:46 2019 +0000

    upstream: Add a sshd_config PubkeyAuthOptions directive
    
    This directive has a single valid option "no-touch-required" that
    causes sshd to skip checking whether user presence was tested before
    a security key signature was made (usually by the user touching the
    key).
    
    ok markus@
    
    OpenBSD-Commit-ID: 46e434a49802d4ed82bc0aa38cb985c198c407de

commit b7e74ea072919b31391bc0f5ff653f80b9f5e84f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 25 00:51:37 2019 +0000

    upstream: Add new structure for signature options
    
    This is populated during signature verification with additional fields
    that are present in and covered by the signature. At the moment, it is
    only used to record security key-specific options, especially the flags
    field.
    
    with and ok markus@
    
    OpenBSD-Commit-ID: 338a1f0e04904008836130bedb9ece4faafd4e49

commit d2b0f88178ec9e3f11b606bf1004ac2fe541a2c3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 25 00:38:17 2019 +0000

    upstream: memleak in error path
    
    OpenBSD-Commit-ID: 93488431bf02dde85a854429362695d2d43d9112

commit e2c0a21ade5e0bd7f0aab08d7eb9457f086681e9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Nov 22 06:50:30 2019 +0000

    upstream: Wait for FD to be readable or writeable during a nonblocking
    
    connect, not just readable.  Prevents a timeout when the server doesn't
    immediately send a banner (eg multiplexers like sslh) but is also slightly
    quicker for other connections since, unlike ssh1, ssh2 doesn't specify
    that the client should parse the server banner before sending its own.
    Patch from mnissler@chromium.org, ok djm@
    
    OpenBSD-Commit-ID: aba9cd8480d1d9dd31d0ca0422ea155c26c5df1d

commit 2f95d43dc222ce194622b706682e8de07c9cfb42
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 20 16:34:11 2019 +1100

    Include openssl compat header.
    
    Fixes warning for ECDSA_SIG_set0 on OpenSSL versions prior to 1.1.

commit a70d92f236576c032a45c39e68ca0d71e958d19d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 19 22:23:19 2019 +0000

    upstream: adjust on-wire signature encoding for ecdsa-sk keys to
    
    better match ec25519-sk keys. Discussed with markus@ and Sebastian Kinne
    
    NB. if you are depending on security keys (already?) then make sure you
    update both your clients and servers.
    
    OpenBSD-Commit-ID: 53d88d8211f0dd02a7954d3af72017b1a79c0679

commit 26369a5f7d9c4e4ef44a3e04910126e1bcea43d8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 19 22:21:15 2019 +0000

    upstream: a little more information from the monitor when signature
    
    verification fails.
    
    OpenBSD-Commit-ID: e6a30071e0518cac512f9e10be3dc3500e2003f3

commit 4402d6c9b5bf128dcfae2429f1d41cdaa8849b6b
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Nov 19 16:02:32 2019 +0000

    upstream: revert previous: naddy pointed out what's meant to
    
    happen. rethink needed...
    
    OpenBSD-Commit-ID: fb0fede8123ea7f725fd65e00d49241c40bd3421

commit 88056f881315233e990e4e04a815f8f96b4674e1
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Nov 19 14:54:47 2019 +0000

    upstream: -c and -s do not make sense with -k; reshuffle -k into
    
    the main synopsis/usage; ok djm
    
    OpenBSD-Commit-ID: f881ba253da015398ae8758d973e3390754869bc

commit 2cf262c21f35296c2ff718cfdb52e0473a1c3983
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Mon Nov 18 23:17:48 2019 +0000

    upstream: document '$' environment variable expansion for
    
    SecurityKeyProvider; ok djm@
    
    OpenBSD-Commit-ID: 76db507ebd336a573e1cd4146cc40019332c5799

commit f0edda81c5ebccffcce52b182c3033531a1aab71
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Mon Nov 18 23:16:49 2019 +0000

    upstream: more missing mentions of ed25519-sk; ok djm@
    
    OpenBSD-Commit-ID: f242e53366f61697dffd53af881bc5daf78230ff

commit 189550f5bc85148e85f4caa1f6b2fc623149a4ee
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Mon Nov 18 16:10:05 2019 +0000

    upstream: additional missing stdarg.h includes when built without
    
    WITH_OPENSSL; ok djm@
    
    OpenBSD-Commit-ID: 881f9a2c4e2239849cee8bbf4faec9bab128f55b

commit 723a5369864b338c48d22854bc2bb4ee5c083deb
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Mon Nov 18 16:08:57 2019 +0000

    upstream: add the missing WITH_OPENSSL ifdefs after the ED25519-SK
    
    addition; ok djm@
    
    OpenBSD-Commit-ID: a9545e1c273e506cf70e328cbb9d0129b6d62474

commit 478f4f98e4e93ae4ed1a8911dec4e5b75ea10f30
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 19 08:52:24 2019 +1100

    remove all EC algs from proposals, no just sk ones
    
    ok dtucker@

commit 6a7ef310da100f876a257b7367e3b0766dac3994
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 18 22:22:04 2019 +1100

    filter PUBKEY_DEFAULT_PK_ALG for ECC algorithms
    
    Remove ECC algorithms from the PUBKEY_DEFAULT_PK_ALG list when
    compiling without ECC support in libcrypto.

commit 64f56f1d1af3947a71a4c391f2c08747d19ee591
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Nov 18 09:15:17 2019 +0000

    upstream: LibreSSL change the format for openssl rsa -text output from
    
    "publicExponent" to "Exponent" so accept either.  with djm.
    
    OpenBSD-Regress-ID: b7e6c4bf700029a31c98be14600d4472fe0467e6

commit 4bfc0503ad94a2a7190686a89649567c20b8534f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 18 06:58:00 2019 +0000

    upstream: fix a bug that prevented serialisation of ed25519-sk keys
    
    OpenBSD-Commit-ID: 066682b79333159cac04fcbe03ebd9c8dcc152a9

commit d88205417084f523107fbe1bc92061635cd57fd2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 18 06:39:36 2019 +0000

    upstream: Fix incorrect error message when key certification fails
    
    OpenBSD-Commit-ID: 7771bd77ee73f7116df37c734c41192943a73cee

commit 740c4bc9875cbb4b9fc03fd5eac19df080f20df5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 18 06:39:02 2019 +0000

    upstream: fix bug that prevented certification of ed25519-sk keys
    
    OpenBSD-Commit-ID: 64c8cc6f5de2cdd0ee3a81c3a9dee8d862645996

commit 85409cbb505d8c463ab6e2284b4039764c7243de
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 18 06:24:17 2019 +0000

    upstream: allow *-sk key types to be turned into certificates
    
    OpenBSD-Commit-ID: cd365ee343934862286d0b011aa77fa739d2a945

commit e2e1283404e06a22ac6135d057199e70dcadb8dd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 18 04:55:02 2019 +0000

    upstream: mention ed25519-sk key/cert types here too; prompted by
    
    jmc@
    
    OpenBSD-Commit-ID: e281977e4a4f121f3470517cbd5e483eee37b818

commit 97dc5d1d82865a7d20f1eb193b5c62ce684024e5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 18 04:50:45 2019 +0000

    upstream: mention ed25519-sk in places where it is accepted;
    
    prompted by jmc@
    
    OpenBSD-Commit-ID: 076d386739ebe7336c2137e583bc7a5c9538a442

commit 130664344862a8c7afd3e24d8d36ce40af41a99f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 18 04:34:47 2019 +0000

    upstream: document ed25519-sk pubkey, private key and certificate
    
    formats
    
    OpenBSD-Commit-ID: 795a7c1c80315412e701bef90e31e376ea2f3c88

commit 71856e1142fc01628ce53098f8cfc74765464b35
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 18 04:29:50 2019 +0000

    upstream: correct order or ecdsa-sk private key fields
    
    OpenBSD-Commit-ID: 4d4a0c13226a79f0080ce6cbe74f73b03ed8092e

commit 93fa2a6649ae3e0626cbff25c985a4573d63e3f2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 18 04:16:53 2019 +0000

    upstream: correct description of fields in pub/private keys (was
    
    missing curve name); spotted by Sebastian Kinne
    
    OpenBSD-Commit-ID: 2a11340dc7ed16200342d384fb45ecd4fcce26e7

commit b497e920b409250309c4abe64229237b8f2730ba
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 18 15:05:04 2019 +1100

    Teach the GTK2/3 ssh-askpass the new prompt hints
    
    ssh/ssh-agent now sets a hint environment variable $SSH_ASKPASS_PROMPT
    when running the askpass program. This is intended to allow the
    askpass to vary its UI across the three cases it supports: asking for
    a passphrase, confirming the use of a key and (recently) reminding
    a user to touch their security key.
    
    This adapts the gnome-ssh-askpass[23] to use these hints. Specifically,
    for SSH_ASKPASS_PROMPT=confirm it will skip the text input box and show
    only "yes"/"no" buttons. For SSH_ASKPASS_PROMPT=none (used to remind
    users to tap their security key), it shows only a "close" button.
    
    Help wanted: adapt the other askpass programs in active use, including
    x11-ssh-askpass, lxqt-openssh-askpass, etc.

commit 857f49e91eeae6feb781ef5f5e26c38ca3d953ec
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 18 14:15:26 2019 +1100

    Move ifdef OPENSSL_HAS_ECC.
    
    Found by -Wimplicit-fallthrough: one ECC case was not inside the ifdef.
    ok djm@

commit 6cf1c40096a79e5eedcf897c7cdb46bb32d4a3ee
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 18 14:14:18 2019 +1100

    Enable -Wimplicit-fallthrough if supported
    
    Suggested by djm.

commit 103c51fd5f5ddc01cd6b5c1132e711765b921bf5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 18 01:59:48 2019 +0000

    upstream: missing break in getopt switch; spotted by Sebastian Kinne
    
    OpenBSD-Commit-ID: f002dbf14dba5586e8407e90f0141148ade8e8fc

commit 9a1225e8ca2ce1fe809910874935302234399a6d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Nov 16 23:17:20 2019 +0000

    upstream: tweak debug message
    
    OpenBSD-Commit-ID: 2bf336d3be0b7e3dd97920d7e7471146a281d2b9

commit 4103a3ec7c68493dbc4f0994a229507e943a86d3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Nov 16 22:42:30 2019 +0000

    upstream: a little debug() in the security key interface
    
    OpenBSD-Commit-ID: 4c70300609a5c8b19707207bb7ad4109e963b0e8

commit 05daa211de926f66f50b7380d637f84dc6341574
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Nov 16 22:36:48 2019 +0000

    upstream: always use ssh-sk-helper, even for the internal USB HID
    
    support. This avoid the need for a wpath pledge in ssh-agent.
    
    reported by jmc@
    
    OpenBSD-Commit-ID: 19f799c4d020b870741d221335dbfa5e76691c23

commit d431778a561d90131814f986b646299f9af33c8c
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Nov 15 15:41:01 2019 +0000

    upstream: fix typos in sk_enroll
    
    OpenBSD-Commit-ID: faa9bf779e008b3e64e2eb1344d9b7d83b3c4487

commit af90aec0443ec51e6b2d804cb91771d3905f8a6f
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Nov 15 11:16:28 2019 +0000

    upstream: double word;
    
    OpenBSD-Commit-ID: 43d09bafa4ea9002078cb30ca9adc3dcc0b9c2b9

commit fd1a96490cef7f945a1b3b5df4e90c8a1070f425
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 15 06:00:20 2019 +0000

    upstream: remove most uses of BN_CTX
    
    We weren't following the rules re BN_CTX_start/BN_CTX_end and the places
    we were using it didn't benefit from its use anyway. ok dtucker@
    
    OpenBSD-Commit-ID: ea9ba6c0d2e6f6adfe00b309a8f41842fe12fc7a

commit 39b87104cdd47baf79ef77dc81de62cea07d119f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 15 18:56:54 2019 +1100

    Add wrappers for other ultrix headers.
    
    Wrappers protect against multiple inclusions for headers that don't do
    it themselves.

commit 134a74f4e0cf750931f1125beb2a3f40c54c8809
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 15 18:55:13 2019 +1100

    Add SSIZE_MAX when we define ssize_t.

commit 9c6d0a3a1ed77989d8c5436d8c3cc6c7045c0197
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 15 17:13:19 2019 +1100

    Remove ultrix realpath hack.

commit c63fba5e3472307167850bbd84187186af7fa9f0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 15 05:37:27 2019 +0000

    upstream: unshield security key privkey before attempting signature
    
    in agent. spotted by dtucker@
    
    OpenBSD-Commit-ID: fb67d451665385b8a0a55371231c50aac67b91d2

commit d165bb5396e3f718480e6039ca2cf77f5a2c2885
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Nov 15 05:26:56 2019 +0000

    upstream: rewrite c99-ism
    
    OpenBSD-Commit-ID: d0c70cca29cfa7e6d9f7ec1d6d5dabea112499b3

commit 03e06dd0e6e1c0a9f4b4b9de7def8a44dcbf93a7
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Nov 15 05:25:52 2019 +0000

    upstream: only clang understands those new -W options
    
    OpenBSD-Commit-ID: d9b910e412d139141b072a905e66714870c38ac0

commit 5c0bc273cba53f822b7d777bbb6c35d160d3b505
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 15 16:08:00 2019 +1100

    configure flag to built-in security key support
    
    Require --with-security-key-builtin before enabling the built-in
    security key support (and consequent dependency on libfido2).

commit fbcb9a7fa55300b8bd4c18bee024c6104c5a25d7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 15 16:06:30 2019 +1100

    upstream commit
    
    revision 1.48
    date: 2019/02/04 16:45:40;  author: millert;  state: Exp;  lines: +16 -17;  commitid: cpNtVC7erojNyctw;
    Make gl_pathc, gl_matchc and gl_offs size_t in glob_t to match POSIX.
    This requires a libc major version bump.  OK deraadt@

commit 2cfb11abac85885de0cb888bbeb9a3e4303105ea
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 15 16:05:07 2019 +1100

    upstream commit
    
    revision 1.47
    date: 2017/05/08 14:53:27;  author: millert;  state: Exp;  lines: +34 -21;  commitid: sYfxfyUHAfarP8sE;
    Fix exponential CPU use with repeated '*' operators by changing '*'
    handling to be interative instead of recursive.
    Fix by Yves Orton, ported to OpenBSD glob.c by Ray Lai.  OK tb@

commit 228dd595c7882bb9b161dbb7d4dca15c8a5f03f5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 15 16:04:28 2019 +1100

    upstream commit
    
    revision 1.46
    date: 2015/12/28 22:08:18;  author: mmcc;  state: Exp;  lines: +5 -9;  commitid: 0uXuF2O13NH9q2e1;
    Remove NULL-checks before free() and a few related dead assignments.
    
    ok and valuable input from millert@

commit a16f748690139b9f452485d97511ad5e578f59b2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 15 16:02:43 2019 +1100

    upstream commit
    
    revision 1.44
    date: 2015/09/14 16:09:13;  author: tedu;  state: Exp;  lines: +3 -5;  commitid: iWfSX2BIn0sLw62l;
    remove null check before free. from Michael McConville
    ok semarie

commit fd37cdeafe25adfcdc752280f535d28de7997ff1
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 15 16:02:27 2019 +1100

    upstream commit
    
    revision 1.43
    date: 2015/06/13 16:57:04;  author: deraadt;  state: Exp;  lines: +4 -4;  commitid: zOUKuqWBdOPOz1SZ;
    in glob() initialize the glob_t before the first failure check.
    from j@pureftpd.org
    ok millert stsp

commit fd62769c3882adea118dccaff80a06009874a2d1
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 15 16:01:20 2019 +1100

    upstream commit
    
    revision 1.42
    date: 2015/02/05 12:59:57;  author: millert;  state: Exp;  lines: +2 -1;  commitid: DTQbfd4poqBW8iSJ;
    Include stdint.h, not limits.h to get SIZE_MAX.  OK guenther@

commit 2b6cba7ee2b8b36f393be739c860a9d2e5d8eb48
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 15 16:00:07 2019 +1100

    upstream commit
    
    revision 1.41
    date: 2014/10/08 05:35:27;  author: deraadt;  state: Exp;  lines: +3 -3;  commitid: JwTGarRLHQKDgPh2;
    obvious realloc -> reallocarray conversion

commit ab3600665387ae34785498558c4409e27f495b0b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 15 04:12:32 2019 +0000

    upstream: don't consult dlopen whitelist for internal security key
    
    provider; spotted by dtucker@
    
    OpenBSD-Commit-ID: bfe5fbd17e4ff95dd85b9212181652b54444192e

commit 19f8ec428db835f68c1cfd63587e9880ccd6486c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 15 15:08:28 2019 +1100

    upstream commit
    
    revision 1.40
    date: 2013/09/30 12:02:34;  author: millert;  state: Exp;  lines: +14 -15;
    Use PATH_MAX, NAME_MAX and LOGIN_NAME_MAX not MAXPATHNAMELEN,
    MAXNAMLEN or MAXLOGNAME where possible.  OK deraadt@

commit bb7413db98e418d4af791244660abf6c829783f5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 15 15:07:30 2019 +1100

    upstream commit
    
    revision 1.39
    date: 2012/01/20 07:09:42;  author: tedu;  state: Exp;  lines: +4 -4;
    the glob stat limit is way too low.  bump to 2048.
    while here, failed stats should count against the limit too.
    ok deraadt sthen stsp

commit 01362cf7cb979525c014714e2bccf799a46e772e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 15 03:41:57 2019 +0000

    upstream: U2F tokens may return FIDO_ERR_USER_PRESENCE_REQUIRED when
    
    probed to see if they own a key handle. Handle this case so the find_device()
    look can work for them. Reported by Michael Forney
    
    OpenBSD-Commit-ID: 2ccd5b30a6ddfe4dba228b7159bf168601bd9166

commit cf62307bc9758105913dcb91b418e4968ac2244d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 15 14:01:00 2019 +1100

    Add libfido2 to INSTALL.

commit 69fbda1894349d1f420c842dfcbcc883239d1aa7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 15 13:42:15 2019 +1100

    libcrypto is now optional.

commit 45ffa369886e37930776d7c15dd8b973242d6ecc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 15 02:38:07 2019 +0000

    upstream: show the "please touch your security key" notifier when
    
    using the (default) build-in security key support.
    
    OpenBSD-Commit-ID: 4707643aaa7124501d14e92d1364b20f312a6428

commit 49dc9fa928d77807c53bdc2898db7fb515fe5eb3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 15 02:37:24 2019 +0000

    upstream: close the "touch your security key" notifier on the error
    
    path too
    
    OpenBSD-Commit-ID: c7628bf80505c1aefbb1de7abc8bb5ee51826829

commit 22a82712e89bf17c27427aeba15795fb4011a0c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 15 02:20:06 2019 +0000

    upstream: correct function name in debug message
    
    OpenBSD-Commit-ID: 2482c99d2ce448f39282493050f8a01e3ffc39ab

commit 018e2902a65c22faded215a7c588492c948f108c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 15 00:32:40 2019 +0000

    upstream: follow existing askpass logic for security key notifier:
    
    fall back to _PATH_SSH_ASKPASS_DEFAULT if no $SSH_ASKPASS environment
    variable is set.
    
    OpenBSD-Commit-ID: cda753726b13fb797bf7a9f7a0b3022d9ade4520

commit 575d0042a94997c1eeb86a6dcfb30b3c7bdbcba3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 14 21:56:52 2019 +0000

    upstream: remove debugging goop that snuck in to last commit
    
    OpenBSD-Commit-ID: 8ea4455a2d9364a0a04f9e4a2cbfa4c9fcefe77e

commit 63a5b24f2dbdc9a4bf2182ac3db26731ddc617e8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 15 11:21:26 2019 +1100

    don't fatal if libfido2 not found
    
    spotted by dtucker@

commit 129952a81c00c332721b4ba3ede868c720ad7f4e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 15 11:17:12 2019 +1100

    correct object dependency

commit 6bff9521ab9a9f7396d635755c342b72373bb4f9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 14 21:27:29 2019 +0000

    upstream: directly support U2F/FIDO2 security keys in OpenSSH by
    
    linking against the (previously external) USB HID middleware. The dlopen()
    capability still exists for alternate middlewares, e.g. for Bluetooth, NFC
    and test/debugging.
    
    OpenBSD-Commit-ID: 14446cf170ac0351f0d4792ba0bca53024930069

commit 4f5e331cb8e11face3025aa6578662dde489c3ad
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Nov 13 22:00:21 2019 +0000

    upstream: in order to be able to figure out the number of
    
    signatures left on a shielded key, we need to transfer the number of
    signatures left from the private to the public key. ok djm@
    
    OpenBSD-Commit-ID: 8a5d0d260aeace47d372695fdae383ce9b962574

commit dffd02e297e6c2a4e86775f293eb1b0ff01fb3df
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Nov 13 20:25:45 2019 +0000

    upstream: fix check for sig_s; noted by qsa at qualys.com
    
    OpenBSD-Commit-ID: 34198084e4afb424a859f52c04bb2c9668a52867

commit fc173aeb1526d4268db89ec5dfebaf8750dd26cd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Nov 13 11:25:11 2019 +0000

    upstream: When clients get denied by MaxStartups, send a
    
    noification prior to the SSH2 protocol banner according to RFC4253 section
    4.2.  ok djm@ deraadt@ markus@
    
    OpenBSD-Commit-ID: e5dabcb722d54dea18eafb336d50b733af4f9c63

commit bf219920b70cafbf29ebc9890ef67d0efa54e738
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Nov 13 07:53:10 2019 +0000

    upstream: fix shield/unshield for xmss keys: - in ssh-agent we need
    
    to delay the call to shield   until we have received key specific options. -
    when serializing xmss keys for shield we need to deal with   all optional
    components (e.g. state might not be loaded). ok djm@
    
    OpenBSD-Commit-ID: cc2db82524b209468eb176d6b4d6b9486422f41f

commit 40598b85d72a509566b7b2a6d57676c7231fed34
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed Nov 13 05:42:26 2019 +0000

    upstream: remove size_t gl_pathc < 0 test, it is invalid. the
    
    return value from glob() is sufficient. discussed with djm
    
    OpenBSD-Commit-ID: c91203322db9caaf7efaf5ae90c794a91070be3c

commit 72687c8e7c38736e3e64e833ee7aa8f9cd9efed1
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed Nov 13 04:47:52 2019 +0000

    upstream: stdarg.h required more broadly; ok djm
    
    OpenBSD-Commit-ID: b5b15674cde1b54d6dbbae8faf30d47e6e5d6513

commit 1e0b248d47c96be944868a735553af8482300a07
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 14 16:08:17 2019 +1100

    Put sshsk_sign call inside ifdef ENABLE_SK.
    
    Fixes build against OpenSSL configured without ECC.

commit 546274a6f89489d2e6be8a8b62f2bb63c87a61fd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 13 23:27:31 2019 +1100

    Remove duplicate __NR_clock_nanosleep

commit b1c82f4b8adf3f42476d8a1f292df33fb7aa1a56
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 13 23:19:35 2019 +1100

    seccomp: Allow clock_nanosleep() in sandbox.
    
    seccomp: Allow clock_nanosleep() to make OpenSSH working with latest
    glibc.  Patch from Jakub Jelen <jjelen@redhat.com> via bz #3093.

commit 2b523d23804c13cb68db135b919fcf312c42b580
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 13 11:56:56 2019 +1100

    Include stdarg.h for va_list in xmalloc.h.

commit 245dcbdca5374296bdb9c48be6e24bdf6b1c0af7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 13 11:19:26 2019 +1100

    Put headers inside ifdef _AIX.
    
    Prevents compile errors due to missing definitions (eg va_list) on
    non-AIX platforms.

commit a4cc579c6ad2b2e54bdd6cc0d5e12c2288113a56
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 13 10:41:41 2019 +1100

    Fix comment in match_usergroup_pattern_list.
    
    Spotted by balu.gajjala@gmail.com via bz#3092.

commit fccff339cab5aa66f2554e0188b83f980683490b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 12 22:38:19 2019 +0000

    upstream: allow an empty attestation certificate returned by a
    
    security key enrollment - these are possible for tokens that only offer self-
    attestation. This also needs support from the middleware.
    
    ok markus@
    
    OpenBSD-Commit-ID: 135eeeb937088ef6830a25ca0bbe678dfd2c57cc

commit e44bb61824e36d0d181a08489c16c378c486a974
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 12 22:36:44 2019 +0000

    upstream: security keys typically need to be tapped/touched in
    
    order to perform a signature operation. Notify the user when this is expected
    via the TTY (if available) or $SSH_ASKPASS if we can.
    
    ok markus@
    
    OpenBSD-Commit-ID: 0ef90a99a85d4a2a07217a58efb4df8444818609

commit 4671211068441519011ac0e38c588317f4157ba1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 12 22:35:02 2019 +0000

    upstream: pass SSH_ASKPASS_PROMPT hint to y/n key confirm too
    
    OpenBSD-Commit-ID: 08d46712e5e5f1bad0aea68e7717b7bec1ab8959

commit 5d1c1590d736694f41b03e686045f08fcae20d62
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 12 22:34:20 2019 +0000

    upstream: dd API for performing one-shot notifications via tty or
    
    SSH_ASKPASS
    
    OpenBSD-Commit-ID: 9484aea33aff5b62ce3642bf259546c7639f23f3

commit 166927fd410823eec8a7b2472463db51e0e6fef5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 12 22:32:48 2019 +0000

    upstream: add xvasprintf()
    
    OpenBSD-Commit-ID: e5e3671c05c121993b034db935bce1a7aa372247

commit 782093ec6cf64cc6c4078410093359869ea9329f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Nov 13 09:08:55 2019 +1100

    Remove leftover if statement from sync.

commit b556cc3cbf0c43f073bb41bba4e92ca709a1ec13
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Nov 12 19:34:40 2019 +0000

    upstream: remove extra layer for ed25519 signature; ok djm@
    
    OpenBSD-Commit-ID: 7672d9d0278b4bf656a12d3aab0c0bfe92a8ae47

commit 3fcf69ace19e75cf9dcd7206f396adfcb29611a8
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Nov 12 19:34:00 2019 +0000

    upstream: check sig_r and sig_s for ssh-sk keys; ok djm
    
    OpenBSD-Commit-ID: 1a1e6a85b5f465d447a3800f739e35c5b74e0abc

commit 2c55744a56de0ffc81fe445a1e7fc5cd308712b3
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Nov 12 19:33:08 2019 +0000

    upstream: enable ed25519 support; ok djm
    
    OpenBSD-Commit-ID: 1a399c5b3ef15bd8efb916110cf5a9e0b554ab7e

commit fd1a3b5e38721b1d69aae2d9de1a1d9155dfa5c7
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Nov 12 19:32:30 2019 +0000

    upstream: update sk-api to version 2 for ed25519 support; ok djm
    
    OpenBSD-Commit-ID: 77aa4d5b6ab17987d8a600907b49573940a0044a

commit 7c32b51edbed5bd57870249c0a45dffd06be0002
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Nov 12 19:31:45 2019 +0000

    upstream: implement sshsk_ed25519_assemble(); ok djm
    
    OpenBSD-Commit-ID: af9ec838b9bc643786310b5caefc4ca4754e68c6

commit fe05a36dc0ea884c8c2395d53d804fe4f4202b26
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Nov 12 19:31:18 2019 +0000

    upstream: implement sshsk_ed25519_inner_sig(); ok djm
    
    OpenBSD-Commit-ID: f422d0052c6d948fe0e4b04bc961f37fdffa0910

commit e03a29e6554cd0c9cdbac0dae53dd79e6eb4ea47
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Nov 12 19:30:50 2019 +0000

    upstream: rename sshsk_ecdsa_sign() to sshsk_sign(); ok djm
    
    OpenBSD-Commit-ID: 1524042e09d81e54c4470d7bfcc0194c5b46fe19

commit bc7b5d6187de625c086b5f639b25bbad17bbabfc
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Nov 12 19:30:21 2019 +0000

    upstream: factor out sshsk_ecdsa_inner_sig(); ok djm@
    
    OpenBSD-Commit-ID: 07e41997b542f670a15d7e2807143fe01efef584

commit cef84a062db8cfeece26f067235dc440f6992c17
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Nov 12 19:29:54 2019 +0000

    upstream: factor out sshsk_ecdsa_assemble(); ok djm@
    
    OpenBSD-Commit-ID: 2313761a3a84ccfe032874d638d3c363e0f14026

commit 7c096c456f33f3d2682736d4735cc10e790276e9
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Nov 12 19:29:24 2019 +0000

    upstream: implement ssh-ed25519-sk verification; ok djm@
    
    OpenBSD-Commit-ID: 37906d93948a1e3d237c20e713d6ca8fbf7d13f6

commit ba5fb02bed1e556d0ce7b1740ae8a5f87b737491
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 13 08:48:30 2019 +1100

    ignore ssh-sk-helper

commit 78c96498947f711141f493a40d202c482cc59438
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Mon Nov 11 19:53:37 2019 +0000

    upstream: skip demanding -fstack-protector-all on hppa. we never
    
    wrote a stack protector for reverse-stack architectures, and i don't think
    anyone else did either. a warning per compiled file is just annoying.
    
    OpenBSD-Commit-ID: 14806a59353152f843eb349e618abbf6f4dd3ada

commit aa1c9e37789f999979fe59df74ce5c8424861ac8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 8 03:54:02 2019 +0000

    upstream: duplicate 'x' character in getopt(3) optstring
    
    OpenBSD-Commit-ID: 64c81caa0cb5798de3621eca16b7dd22e5d0d8a7

commit aa4c640dc362816d63584a16e786d5e314e24390
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Thu Nov 7 08:38:38 2019 +0000

    upstream: Fill in missing man page bits for U2F security key support:
    
    Mention the new key types, the ~/.ssh/id_ecdsa_sk file, ssh's
    SecurityKeyProvider keyword, the SSH_SK_PROVIDER environment variable,
    and ssh-keygen's new -w and -x options.
    
    Copy the ssh-sk-helper man page from ssh-pkcs11-helper with minimal
    substitutions.
    
    ok djm@
    
    OpenBSD-Commit-ID: ef2e8f83d0c0ce11ad9b8c28945747e5ca337ac4

commit b236b27d6dada7f0542214003632b4e9b7aa1380
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 3 00:10:43 2019 +1100

    Put sftp-realpath in libssh.a
    
    and remove it from the specific binary targets.

commit 382c18c20cdcec45b5d21ff25b4a5e0df91a68c4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 3 00:09:21 2019 +1100

    statfs might be defined in sys/mount.h.
    
    eg on old NetBSDs.

commit 03ffc0951c305c8e3b5fdc260d65312a57f8f7ea
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Nov 2 23:25:01 2019 +1100

    Put stdint.h inside ifdef HAVE_STDINT_H.

commit 19cb64c4b42d4312ce12091fd9436dbd6898998c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Nov 2 22:45:44 2019 +1100

    Rebuild .depend.

commit 3611bfe89b92ada5914526d8ff0919aeb967cfa7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Nov 2 22:42:05 2019 +1100

    Define __BSD_VISIBLE in fnmatch.h.
    
    .. since we use symbols defined only when it is when using the compat
    fnmatch.

commit f5cc5816aaddb8eca3cba193f53e99d6a0b37d05
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Nov 2 16:39:38 2019 +1100

    Only enable U2F if OpenSSL supports ECC.
    
    This requires moving the U2F bits to below the OpenSSL parts so we have
    the required information.  ok djm@

commit ad38406fc95fa223b0ef2edf8ff50508f8ab1cb6
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Fri Nov 1 12:10:43 2019 +0000

    upstream: fix miscellaneous text problems; ok djm@
    
    OpenBSD-Commit-ID: 0cbf411a14d8fa0b269b69cbb1b4fc0ca699fe9f

commit 9cac151c2dc76b8e5b727b2fa216f572e372170f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 1 18:26:07 2019 +1100

    Add flags needed to build and work on Ultrix.

commit 0e3c5bc50907d2058407641b5a3581b7eda91b7e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 1 18:24:29 2019 +1100

    Hook up fnmatch for platforms that don't have it.

commit b56dbfd9d967e5b6ce7be9f81f206112e19e1030
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 1 18:17:42 2019 +1100

    Add missing bracket in realpath macro.

commit 59ccb56f15e5e530e7c1b5a0b361749d8c6217d5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 1 17:32:47 2019 +1100

    Import fnmatch.c from OpenBSD.

commit 79d46de9fbea0f3c0e8ae7cf84effaba089071b0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 1 15:22:32 2019 +1100

    Use sftp_realpath if no native realpath.

commit bb4f003ed8c5f61ec74a66bcedc8ab19bf5b35c4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 1 15:06:16 2019 +1100

    Configure flags for haiku from haikuports.
    
    Should build with the default flags with ./configure

commit 4332b4fe49360679647a8705bc08f4e81323f6b4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 1 03:54:33 2019 +0000

    upstream: fix a race condition in the SIGCHILD handler that could turn
    
    in to a kill(-1); bz3084, reported by Gao Rui, ok dtucker@
    
    OpenBSD-Commit-ID: ac2742e04a69d4c34223505b6a32f6d686e18896

commit 03f9205f0fb49ea2507eacc143737a8511ae5a4e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 1 14:49:25 2019 +1100

    conditionalise SK sign/verify on ENABLE_SK
    
    Spotted by Darren and his faux-Vax

commit 5eb7b9563ff818e17de24231bf2d347d9db302c5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 1 14:41:07 2019 +1100

    Add prototype for localtime_r if needed.

commit d500b59a825f6a58f2abf7b04eb1992d81e45d58
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 1 13:42:12 2019 +1100

    Check if IP_TOS is defined before using.

commit 764d51e04460ec0da12e05e4777bc90c116accb9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 1 13:34:49 2019 +1100

    autoconf pieces for U2F support
    
    Mostly following existing logic for PKCS#11 - turning off support
    when either libcrypto or dlopen(3) are unavailable.

commit 45f17a159acfc5a8e450bfbcc2cffe72950ed7a3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 1 02:32:05 2019 +0000

    upstream: remove duplicate PUBKEY_DEFAULT_PK_ALG on !WITH_OPENSSL path
    
    OpenBSD-Commit-ID: 95a7cafad2a4665d57cabacc28031fabc0bea9fc

commit db8d13f7925da7337df87248995c533e111637ec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 1 02:06:52 2019 +0000

    upstream: more additional source files
    
    OpenBSD-Regress-ID: 8eaa25fb901594aee23b76eda99dca5b8db94c6f

commit f89c5df65dd307739ff22319c2cf847d3b0c5ab4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 1 02:04:25 2019 +0000

    upstream: additional source files here too
    
    OpenBSD-Regress-ID: 8809f8e1c8f7459e7096ab6b58d8e56cb2f483fd

commit 02275afa1ecbfbd39f27d34c97090e76bec232ec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 1 02:03:27 2019 +0000

    upstream: additional source files here too
    
    OpenBSD-Regress-ID: 09297e484327f911fd353489518cceaa0c1b95ce

commit dfc8f01b9886c7999e6e20acf3f7492cb8c80796
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 1 01:57:59 2019 +0000

    upstream: adapt to extra sshkey_sign() argument and additional
    
    dependencies
    
    OpenBSD-Regress-ID: 7a25604968486c4d6f81d06e8fbc7d17519de50e

commit afa59e26eeb44a93f36f043f60b936eaddae77c4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 1 01:55:41 2019 +0000

    upstream: skip security-key key types for tests until we have a
    
    dummy U2F middleware to use.
    
    OpenBSD-Regress-ID: 37200462b44334a4ad45e6a1f7ad1bd717521a95

commit de871e4daf346a712c78fa4ab8f18b231a47cb85
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Nov 1 00:52:35 2019 +0000

    upstream: sort;
    
    OpenBSD-Commit-ID: 8264b0be01ec5a60602bd50fd49cc3c81162ea16

commit 2aae149a34b1b5dfbef423d3b7999a96818969bb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 31 21:37:33 2019 +0000

    upstream: undo debugging bits that shouldn't have been committed
    
    OpenBSD-Commit-ID: 4bd5551b306df55379afe17d841207990eb773bf

commit 3420e0464bd0e8fedcfa5fd20ad37bdc740ad5b4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 1 09:24:58 2019 +1100

    depend

commit b923a90abc7bccb11a513dc8b5c0f13a0ea9682c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 31 21:28:27 2019 +0000

    upstream: fix -Wshadow warning
    
    OpenBSD-Commit-ID: 3441eb04f872a00c2483c11a5f1570dfe775103c

commit 9a14c64c38fc14d0029f1c7bc70cf62cc7f0fdf9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 31 21:23:19 2019 +0000

    upstream: Refactor signing - use sshkey_sign for everything,
    
    including the new U2F signatures.
    
    Don't use sshsk_ecdsa_sign() directly, instead make it reachable via
    sshkey_sign() like all other signature operations. This means that
    we need to add a provider argument to sshkey_sign(), so most of this
    change is mechanically adding that.
    
    Suggested by / ok markus@
    
    OpenBSD-Commit-ID: d5193a03fcfa895085d91b2b83d984a9fde76c8c

commit 07da39f71d36fb547749a5b16aa8892e621a7e4a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 31 21:22:01 2019 +0000

    upstream: ssh-agent support for U2F/FIDO keys
    
    feedback & ok markus@
    
    OpenBSD-Commit-ID: bb544a44bc32e45d2ec8bf652db2046f38360acb

commit eebec620c9519c4839d781c4d5b6082152998f82
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 31 21:20:38 2019 +0000

    upstream: ssh AddKeysToAgent support for U2F/FIDO keys
    
    feedback & ok markus@
    
    OpenBSD-Commit-ID: ac08e45c7f995fa71f8d661b3f582e38cc0a2f91

commit 486164d060314a7f8bca2a00f53be9e900c5e74d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 31 21:19:56 2019 +0000

    upstream: ssh-add support for U2F/FIDO keys
    
    OpenBSD-Commit-ID: 7f88a5181c982687afedf3130c6ab2bba60f7644

commit b9dd14d3091e31fb836f69873d3aa622eb7b4a1c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 31 21:19:14 2019 +0000

    upstream: add new agent key constraint for U2F/FIDO provider
    
    feedback & ok markus@
    
    OpenBSD-Commit-ID: d880c380170704280b4003860a1744d286c7a172

commit 884416bdb10468f1252e4d7c13d51b43dccba7f6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 31 21:18:28 2019 +0000

    upstream: ssh client support for U2F/FIDO keys
    
    OpenBSD-Commit-ID: eb2cfa6cf7419a1895e06e398ea6d41516c5b0bc

commit 01a0670f69c5b86e471e033b92145d6c7cc77c58
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 31 21:17:49 2019 +0000

    upstream: Separate myproposal.h userauth pubkey types
    
    U2F/FIDO keys are not supported for host authentication, so we need
    a separate list for user keys.
    
    feedback & ok markus@
    
    OpenBSD-Commit-ID: 7fe2e6ab85f9f2338866e5af8ca2d312abbf0429

commit 23f38c2d8cda3fad24e214e1f0133c42435b54ee
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 31 21:17:09 2019 +0000

    upstream: ssh-keygen support for generating U2F/FIDO keys
    
    OpenBSD-Commit-ID: 6ce04f2b497ac9dd8c327f76f1e6c724fb1d1b37

commit ed3467c1e16b7396ff7fcf12d2769261512935ec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 31 21:16:20 2019 +0000

    upstream: U2F/FIDO middleware interface
    
    Supports enrolling (generating) keys and signatures.
    
    feedback & ok markus@
    
    OpenBSD-Commit-ID: 73d1dd5939454f9c7bd840f48236cba41e8ad592

commit 02bb0768a937e50bbb236efc2bbdddb1991b1c85
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 31 21:15:14 2019 +0000

    upstream: Initial infrastructure for U2F/FIDO support
    
    Key library support: including allocation, marshalling public/private
    keys and certificates, signature validation.
    
    feedback & ok markus@
    
    OpenBSD-Commit-ID: a17615ba15e0f7932ac4360cb18fc9a9544e68c7

commit 57ecc10628b04c384cbba2fbc87d38b74cd1199d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 31 21:14:17 2019 +0000

    upstream: Protocol documentation for U2F/FIDO keys in OpenSSH
    
    OpenBSD-Commit-ID: 8f3247317c2909870593aeb306dff848bc427915

commit f4fdcd2b7a2bbf5d8770d44565173ca5158d4dcb
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 1 08:36:16 2019 +1100

    Missing unit test files

commit 1bcd1169c5221688418fa38606e9c69055b72451
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 29 19:45:03 2019 +1100

    Add implementation of localtime_r.

commit 2046ed16c1202431b0307674c33a123a113e8297
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Oct 29 07:47:27 2019 +0000

    upstream: Signal handler cleanup: remove leftover support for
    
    unreliable signals and now-unneeded save and restore of errno.  ok deraadt@
    markus@
    
    OpenBSD-Commit-ID: 01dd8a1ebdd991c8629ba1f5237283341a93cd88

commit 70fc9a6ca4dd33cb2dd400a4dad5db9683a3d284
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Oct 22 08:50:35 2019 +0000

    upstream: fixes from lucas;
    
    OpenBSD-Commit-ID: 4c4bfd2806c5bbc753788ffe19c5ee13aaf418b2

commit 702368aa4381c3b482368257ac574a87b5a80938
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Oct 22 07:06:35 2019 +0000

    upstream: Import regenerated moduli file.
    
    OpenBSD-Commit-ID: 58ec755be4e51978ecfee73539090eb68652a987

commit 5fe81da22652f8caa63e9e3a1af519a85d36337e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 28 21:19:47 2019 +1100

    Fix ifdefs to not mask needed bits.

commit 7694e9d2fb5785bbdd0920dce7a160bd79feaf00
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 28 17:05:36 2019 +1100

    Only use RLIMIT_NOFILE if it's defined.

commit d561b0b2fa2531b4cc3bc70a7d657c6485c9fd0b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 28 16:09:04 2019 +1100

    Make sure we have struct statfs before using.

commit 2912596aecfcf48e5115c7a906d1e664f7717a4b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 28 16:06:59 2019 +1100

    Define UINT32_MAX if needed.

commit 7169e31121e8c8cc729b55154deb722ae495b316
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 28 16:00:45 2019 +1100

    Move utimensat definition into timespec section.
    
    Since utimensat uses struct timespec, move it to the section where we
    define struct timespec when needed.

commit 850ec1773d656cbff44d78a79e369dc262ce5853
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 28 15:57:22 2019 +1100

    Wrap OpenSSL bits in WITH_OPENSSL.

commit 6fc7e1c6fec3ba589869ae98e968c0e5e2e4695b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 28 15:53:25 2019 +1100

    Wrap poll.h includes in HAVE_POLL_H.

commit 9239a18f96905cc1a353e861e33af093652f24e7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 24 14:39:49 2019 +1100

    Add a function call stackprotector tests.
    
    Including a function call in the test programs for the gcc stack
    protector flag tests exercises more of the compiler and makes it more
    likely it'll detect problems.

commit b9705393be4612fd5e29d0cd8e7cf2b66ed19eb7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 22 18:09:22 2019 +1100

    Import regenerated moduli file.

commit 76ed2199491397e0f9902ade80d5271e4a9b2630
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 16 06:05:39 2019 +0000

    upstream: potential NULL dereference for revoked hostkeys; reported
    
    by krishnaiah bommu
    
    OpenBSD-Commit-ID: 35ff685e7cc9dd2e3fe2e3dfcdcb9bc5c79f6506

commit 6500c3bc71bf4fe14972c1177e6b93f1164d07a4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 16 06:03:30 2019 +0000

    upstream: free buf before return; reported by krishnaiah bommu
    
    OpenBSD-Commit-ID: 091bb23a6e913af5d4f72c50030b53ce1cef4de1

commit d7d116b6d9e6cb79cc235e9801caa683d3db3181
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 14 06:00:02 2019 +0000

    upstream: memleak in error path; spotted by oss-fuzz, ok markus@
    
    OpenBSD-Commit-ID: d6ed260cbbc297ab157ad63931802fb1ef7a4266

commit 9b9e3ca6945351eefb821ff783a4a8e6d9b98b9a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 11 14:12:16 2019 +1100

    Re-add SA_RESTART to mysignal.
    
    This makes mysignal implement reliable BSD semantics according to
    Stevens' APUE.  This was first attempted in 2001 but was reverted
    due to problems with HP-UX 10.20 and select() and possibly grantpt().
    Modern systems should be fine with it, but if any current platforms have
    a problem with it now we can disable it just for those.  ok djm@

commit 0bd312a362168c1eae3cd6b3889395a78e6fd0f8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Oct 10 09:42:03 2019 +1100

    Fix ifdef typo for declaration of memmem.
    
    Fixes build on IRIX.  bz#3081.

commit 01ce1cd402d5eecde2bba35b67e08f5b266b37fd
Author: Abhishek Arya <inferno@chromium.org>
Date:   Tue Oct 8 20:19:18 2019 -0700

    Update README.md

commit 1ba130ac8fb2884307f658126f04578f8aef409e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 9 13:49:35 2019 +1100

    add a fuzzer for private key parsing

commit cdf1d0a9f5d18535e0a18ff34860e81a6d83aa5c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 9 11:31:03 2019 +1100

    prepare for 8.1 release

commit 3b4e56d740b74324e2d7542957cad5a11518f455
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 9 00:04:57 2019 +0000

    upstream: openssh-8.1
    
    OpenBSD-Commit-ID: 3356bb34e2aa287f0e6d6773c9ae659dc680147d

commit 29e0ecd9b4eb3b9f305e2240351f0c59cad9ef81
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 9 00:04:42 2019 +0000

    upstream: fix an unreachable integer overflow similar to the XMSS
    
    case, and some other NULL dereferences found by fuzzing.
    
    fix with and ok markus@
    
    OpenBSD-Commit-ID: 0f81adbb95ef887ce586953e1cb225fa45c7a47b

commit a546b17bbaeb12beac4c9aeed56f74a42b18a93a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 9 00:02:57 2019 +0000

    upstream: fix integer overflow in XMSS private key parsing.
    
    Reported by Adam Zabrocki via SecuriTeam's SSH program.
    
    Note that this code is experimental and not compiled by default.
    
    ok markus@
    
    OpenBSD-Commit-ID: cd0361896d15e8a1bac495ac583ff065ffca2be1

commit c2cc25480ba36ab48c1a577bebb12493865aad87
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Oct 8 22:40:39 2019 +0000

    upstream: Correct type for end-of-list sentinel; fixes initializer
    
    warnings on some platforms.  ok deraadt.
    
    OpenBSD-Commit-ID: a990dbc2dac25bdfa07e79321349c73fd991efa2

commit e827aedf8818e75c0016b47ed8fc231427457c43
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 7 23:10:38 2019 +0000

    upstream: reversed test yielded incorrect debug message
    
    OpenBSD-Commit-ID: 78bb512d04cfc238adb2c5b7504ac93eecf523b3

commit 8ca491d29fbe26e5909ce22b344c0a848dc28d55
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 8 17:05:57 2019 +1100

    depend

commit 86a0323374cbd404629e75bb320b3fa1c16aaa6b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Oct 9 09:36:06 2019 +1100

    Make MAKE_CLONE no-op macro more correct.
    
    Similar to the previous change to DEF_WEAK, some compilers don't like
    the empty statement, so convert into a no-op function prototype.

commit cfc1897a2002ec6c4dc879b24e8b3153c87ea2cf
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 9 09:06:35 2019 +1100

    wrap stdint.h include in HAVE_STDINT_H
    
    make the indenting a little more consistent too..
    
    Fixes Solaris 2.6; reported by Tom G. Christensen

commit 13b3369830a43b89a503915216a23816d1b25744
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 8 15:32:02 2019 +1100

    avoid "return (value)" in void-declared function
    
    spotted by Tim Rice; ok dtucker

commit 0c7f8d2326d812b371f7afd63aff846973ec80a4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 8 14:44:50 2019 +1100

    Make DEF_WEAK more likely to be correct.
    
    Completely nop-ing out DEF_WEAK leaves an empty statemment which some
    compilers don't like.  Replace with a no-op function template.  ok djm@

commit b1e79ea8fae9c252399677a28707661d85c7d00c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Oct 6 11:49:50 2019 +0000

    upstream: Instead of running sed over the whole log to remove CRs,
    
    remove them only where it's needed (and confuses test(1) on at least OS X in
    portable).
    
    OpenBSD-Regress-ID: a6ab9b4bd1d33770feaf01b2dfb96f9e4189d2d0

commit 8dc7d6b75a7f746fdd056acd41dffc0a13557a4c
Author: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>
Date:   Tue May 9 13:33:30 2017 -0300

    Enable specific ioctl call for EP11 crypto card (s390)
    
    The EP11 crypto card needs to make an ioctl call, which receives an
    specific argument. This crypto card is for s390 only.
    
    Signed-off-by: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>

commit 07f2c7f34951c04d2cd796ac6c80e47c56c4969e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 4 04:31:59 2019 +0000

    upstream: fix memory leak in error path; bz#3074 patch from
    
    krishnaiah.bommu@intel.com, ok dtucker
    
    OpenBSD-Commit-ID: d031853f3ecf47b35a0669588f4d9d8e3b307b3c

commit b7fbc75e119170f4d15c94a7fda4a1050e0871d6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 4 04:13:39 2019 +0000

    upstream: space
    
    OpenBSD-Commit-ID: 350648bcf00a2454e7ef998b7d88e42552b348ac

commit 643ab68c79ac1644f4a31e36928c2bfc8a51db3c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 4 03:39:19 2019 +0000

    upstream: more sshsig regress tests: check key revocation, the
    
    check-novalidate signature test mode and signing keys in ssh-agent.
    
    From Sebastian Kinne (slightly tweaked)
    
    OpenBSD-Regress-ID: b39566f5cec70140674658cdcedf38752a52e2e2

commit 714031a10bbe378a395a93cf1040f4ee1451f45f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Oct 4 03:26:58 2019 +0000

    upstream: Check for gmtime failure in moduli generation. Based on
    
    patch from krishnaiah.bommu@intel.com, ok djm@
    
    OpenBSD-Commit-ID: 4c6a4cde0022188ac83737de08da0e875704eeaa

commit 6918974405cc28ed977f802fd97a9c9a9b2e141b
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Oct 3 17:07:50 2019 +0000

    upstream: use a more common options order in SYNOPSIS and sync
    
    usage(); while here, no need for Bk/Ek;
    
    ok dtucker
    
    OpenBSD-Commit-ID: 38715c3f10b166f599a2283eb7bc14860211bb90

commit feff96b7d4c0b99307f0459cbff128aede4a8984
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 2 09:50:50 2019 +0000

    upstream: thinko in previous; spotted by Mantas
    
    =?UTF-8?q?=20Mikul=C4=97nas?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: ffa3f5a45e09752fc47d9041e2203ee2ec15b24d

commit b5a89eec410967d6b712665f8cf0cb632928d74b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 2 08:07:13 2019 +0000

    upstream: make signature format match PROTOCO
    
    =?UTF-8?q?=20as=20a=20string,=20not=20raw=20bytes.=20Spotted=20by=20Manta?=
    =?UTF-8?q?s=20Mikul=C4=97nas?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: 80fcc6d52893f80c6de2bedd65353cebfebcfa8f

commit dc6f81ee94995deb11bbf7e19801022c5f6fd90a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 2 08:05:50 2019 +0000

    upstream: ban empty namespace strings for s
    
    =?UTF-8?q?shsig;=20spotted=20by=20Mantas=20Mikul=C4=97nas?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: 7c5bcf40bed8f4e826230176f4aa353c52aeb698

commit fa5bd8107e0e2b3e1e184f55d0f9320c119f65f0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Oct 2 14:30:55 2019 +1000

    Put ssherr.h back as it's actually needed.

commit 3ef92a657444f172b61f92d5da66d94fa8265602
Author: Lonnie Abelbeck <lonnie@abelbeck.com>
Date:   Tue Oct 1 09:05:09 2019 -0500

    Deny (non-fatal) shmget/shmat/shmdt in preauth privsep child.
    
    New wait_random_seeded() function on OpenSSL 1.1.1d uses shmget, shmat, and shmdt
    in the preauth codepath, deny (non-fatal) in seccomp_filter sandbox.

commit edd1d3a6261aecbf9a55944fd7be1db83571b46e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 2 10:54:28 2019 +1000

    remove duplicate #includes
    
    Prompted by Jakub Jelen

commit 13c508dfed9f25e6e54c984ad00a74ef08539e70
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 2 10:51:15 2019 +1000

    typo in comment

commit d0c3ac427f6c52b872d6617421421dd791664445
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 2 00:42:30 2019 +0000

    upstream: remove some duplicate #includes
    
    OpenBSD-Commit-ID: ed6827ab921eff8027669848ef4f70dc1da4098c

commit 084682786d9275552ee93857cb36e43c446ce92c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 1 10:22:53 2019 +0000

    upstream: revert unconditional forced login implemented in r1.41 of
    
    ssh-pkcs11.c; r1.45 added a forced login as a fallback for cases where the
    token returns no objects and this is less disruptive for users of tokens
    directly in ssh (rather than via ssh-agent) and in ssh-keygen
    
    bz3006, patch from Jakub Jelen; ok markus
    
    OpenBSD-Commit-ID: 33d6df589b072094384631ff93b1030103b3d02e

commit 6c91d42cce3f055917dc3fd2c305dfc5b3b584b3
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sun Sep 29 16:31:57 2019 +0000

    upstream: group and sort single letter options; ok deraadt
    
    OpenBSD-Commit-ID: e1480e760a2b582f79696cdcff70098e23fc603f

commit 3b44bf39ff4d7ef5d50861e2e9dda62d2926d2fe
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Sep 27 20:03:24 2019 +0000

    upstream: fix the DH-GEX text in -a; because this required a comma,
    
    i added a comma to the first part, for balance...
    
    OpenBSD-Commit-ID: 2c3464e9e82a41e8cdfe8f0a16d94266e43dbb58

commit 3e53ef28fab53094e3b19622ba0e9c3d5fe71273
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Tue Sep 24 12:50:46 2019 +0000

    upstream: identity_file[] should be PATH_MAX, not the arbitrary
    
    number 1024
    
    OpenBSD-Commit-ID: e775f94ad47ce9ab37bd1410d7cf3b7ea98b11b7

commit 90d4b2541e8c907793233d9cbd4963f7624f4174
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Sep 20 18:50:58 2019 +0000

    upstream: new sentence, new line;
    
    OpenBSD-Commit-ID: c35ca5ec07be460e95e7406af12eee04a77b6698

commit fbec7dba01b70b49ac47f56031310865dff86200
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Sep 30 18:01:12 2019 +1000

    Include stdio.h for snprintf.
    
    Patch from vapier@gentoo.org.

commit 0a403bfde71c4b82147473298d3a60b4171468bd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Sep 30 14:11:42 2019 +1000

    Add SKIP_LTESTS for skipping specific tests.

commit 4d59f7a5169c451ebf559aedec031ac9da2bf80c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 27 05:25:12 2019 +0000

    upstream: Test for empty result in expected bits. Remove CRs from log
    
    as they confuse tools on some platforms.  Re-enable the 3des-cbc test.
    
    OpenBSD-Regress-ID: edf536d4f29fc1ba412889b37247a47f1b49d250

commit 7c817d129e2d48fc8a6f7965339313023ec45765
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 27 15:26:22 2019 +1000

    Re-enable dhgex test.
    
    Since we've added larger fallback groups to dh.c this test will pass
    even if there is no moduli file installed on the system.

commit c1e0a32fa852de6d1c82ece4f76add0ab0ca0eae
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Sep 24 21:17:20 2019 +1000

    Add more ToS bits, currently only used by netcat.

commit 5a273a33ca1410351cb484af7db7c13e8b4e8e4e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Sep 19 15:41:23 2019 +1000

    Privsep is now required.

commit 8aa2aa3cd4d27d14e74b247c773696349472ef20
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 16 03:23:02 2019 +0000

    upstream: Allow testing signature syntax and validity without verifying
    
    that a signature came from a trusted signer. To discourage accidental or
    unintentional use, this is invoked by the deliberately ugly option name
    "check-novalidate"
    
    from Sebastian Kinne
    
    OpenBSD-Commit-ID: cea42c36ab7d6b70890e2d8635c1b5b943adcc0b

commit 7047d5afe3103f0f07966c05b810682d92add359
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 13 04:52:34 2019 +0000

    upstream: clarify that IdentitiesOnly also applies to the default
    
    ~/.ssh/id_* keys; bz#3062
    
    OpenBSD-Commit-ID: 604be570e04646f0f4a17026f8b2aada6a585dfa

commit b36ee3fcb2f1601693b1b7fd60dd6bd96006ea75
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 13 04:36:43 2019 +0000

    upstream: Plug mem leaks on error paths, based in part on github
    
    pr#120 from David Carlier.  ok djm@.
    
    OpenBSD-Commit-ID: c57adeb1022a8148fc86e5a88837b3b156dbdb7e

commit 2aefdf1aef906cf7548a2e5927d35aacb55948d4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 13 04:31:19 2019 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: 57a71dd5f4cae8d61e0ac631a862589fb2bfd700

commit fbe24b142915331ceb2a3a76be3dc5b6d204fddf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 13 04:27:35 2019 +0000

    upstream: allow %n to be expanded in ProxyCommand strings
    
    From Zachary Harmany via github.com/openssh/openssh-portable/pull/118
    ok dtucker@
    
    OpenBSD-Commit-ID: 7eebf1b7695f50c66d42053d352a4db9e8fb84b6

commit 2ce1d11600e13bee0667d6b717ffcc18a057b821
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 13 04:07:42 2019 +0000

    upstream: clarify that ConnectTimeout applies both to the TCP
    
    connection and to the protocol handshake/KEX. From Jean-Charles Longuet via
    Github PR140
    
    OpenBSD-Commit-ID: ce1766abc6da080f0d88c09c2c5585a32b2256bf

commit df780114278f406ef7cb2278802a2660092fff09
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Sep 9 02:31:19 2019 +0000

    upstream: Fix potential truncation warning. ok deraadt.
    
    OpenBSD-Commit-ID: d87b7e3a94ec935e8194e7fce41815e22804c3ff

commit ec0e6243660bf2df30c620a6a0d83eded376c9c6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 13 13:14:39 2019 +1000

    memleak of buffer in sshpam_query
    
    coverity report via Ed Maste; ok dtucker@

commit c17e4638e5592688264fc0349f61bfc7b4425aa5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 13 13:12:42 2019 +1000

    explicitly test set[ug]id() return values
    
    Legacy !_POSIX_SAVED_IDS path only; coverity report via Ed Maste
    ok dtucker@

commit 91a2135f32acdd6378476c5bae475a6e7811a6a2
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Fri Sep 6 14:45:34 2019 +0000

    upstream: Allow prepending a list of algorithms to the default set
    
    by starting the list with the '^' character, e.g.
    
    HostKeyAlgorithms ^ssh-ed25519
    Ciphers ^aes128-gcm@openssh.com,aes256-gcm@openssh.com
    
    ok djm@ dtucker@
    
    OpenBSD-Commit-ID: 1e1996fac0dc8a4b0d0ff58395135848287f6f97

commit c8bdd2db77ac2369d5cdee237656f266c8f41552
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 6 07:53:40 2019 +0000

    upstream: key conversion should fail for !openssl builds, not fall
    
    through to the key generation code
    
    OpenBSD-Commit-ID: b957436adc43c4941e61d61958a193a708bc83c9

commit 823f6c37eb2d8191d45539f7b6fa877a4cb4ed3d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 6 06:08:11 2019 +0000

    upstream: typo in previous
    
    OpenBSD-Commit-ID: 7c3b94110864771a6b80a0d8acaca34037c3c96e

commit 6a710d3e06fd375e2c2ae02546b9541c488a2cdb
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 8 14:48:11 2019 +1000

    needs time.h for --without-openssl

commit f61f29afda6c71eda26effa54d3c2e5306fd0833
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 7 19:25:00 2019 +1000

    make unittests pass for no-openssl case

commit 105e1c9218940eb53473f55a9177652d889ddbad
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 6 05:59:41 2019 +0000

    upstream: avoid compiling certain files that deeply depend on
    
    libcrypto when WITH_OPENSSL isn't set
    
    OpenBSD-Commit-ID: 569f08445c27124ec7c7f6c0268d844ec56ac061

commit 670104b923dd97b1c06c0659aef7c3e52af571b2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 6 05:23:55 2019 +0000

    upstream: fixes for !WITH_OPENSSL compilation; ok dtucker@
    
    OpenBSD-Commit-ID: 7fd68eaa9e0f7482b5d4c7e8d740aed4770a839f

commit be02d7cbde3d211ec2ed2320a1f7d86b2339d758
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 6 04:53:27 2019 +0000

    upstream: lots of things were relying on libcrypto headers to
    
    transitively include various system headers (mostly stdlib.h); include them
    explicitly
    
    OpenBSD-Commit-ID: 5b522f4f2d844f78bf1cc4f3f4cc392e177b2080

commit d05aaaaadcad592abfaa44540928e0c61ef72ebb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 6 03:30:42 2019 +0000

    upstream: remove leakmalloc reference; we used this early when
    
    refactoring but not since
    
    OpenBSD-Commit-ID: bb28ebda8f7c490b87b37954044a6cdd43a7eb2c

commit 1268f0bcd8fc844ac6c27167888443c8350005eb
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 6 04:24:06 2019 +0000

    upstream: Check for RSA support before using it for the user key,
    
    otherwise use ed25519 which is supported when built without OpenSSL.
    
    OpenBSD-Regress-ID: 3d23ddfe83c5062f00ac845d463f19a2ec78c0f7

commit fd7a2dec652b9efc8e97f03f118f935dce732c60
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 6 14:07:10 2019 +1000

    Provide explicit path to configure-check.
    
    On some platforms (at least OpenBSD) make won't search VPATH for target
    files, so building out-of-tree will fail at configure-check.  Provide
    explicit path.  ok djm@

commit 00865c29690003b4523cc09a0e104724b9f911a4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 6 01:58:50 2019 +0000

    upstream: better error code for bad arguments; inspired by
    
    OpenBSD-Commit-ID: dfc263b6041de7f0ed921a1de0b81ddebfab1e0a

commit afdf27f5aceb4973b9f5308f4310c6e3fd8db1fb
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 5 21:38:40 2019 +1000

    revert config.h/config.h.in freshness checks
    
    turns out autoreconf and configure don't touch some files if their content
    doesn't change, so the mtime can't be relied upon in a makefile rule

commit a97609e850c57bd2cc2fe7e175fc35cb865bc834
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 5 20:54:39 2019 +1000

    extend autoconf freshness test
    
    make it cover config.h.in and config.h separately

commit 182297c10edb21c4856c6a38326fd04d81de41a5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 5 20:34:54 2019 +1000

    check that configure/config.h is up to date
    
    Ensure they are newer than the configure.ac / aclocal.m4 source

commit 7d6034bd020248e9fc0f8c39c71c858debd0d0c1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 5 10:05:51 2019 +0000

    upstream: if a PKCS#11 token returns no keys then try to login and
    
    refetch them. Based on patch from Jakub Jelen; bz#2430 ok markus@
    
    OpenBSD-Commit-ID: ab53bd6ddd54dd09e54a8bfbed1a984496f08b43

commit 76f09bd95917862101b740afb19f4db5ccc752bf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 5 09:35:19 2019 +0000

    upstream: sprinkle in some explicit errors here, otherwise the
    
    percolate all the way up to dispatch_run_fatal() and lose all meaninful
    context
    
    to help with bz#3063; ok dtucker@
    
    OpenBSD-Commit-ID: 5b2da83bb1c4a3471444b7910b2120ae36438a0a

commit 0ea332497b2b2fc3995f72f6bafe9d664c0195b3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 5 09:25:13 2019 +0000

    upstream: only send ext_info for KEX_INITIAL; bz#2929 ok dtucker
    
    OpenBSD-Commit-ID: 00f5c6062f6863769f5447c6346f78c05d2e4a63

commit f23d91f9fa7f6f42e70404e000fac88aebfe3076
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Sep 5 05:47:23 2019 +0000

    upstream: macro fix; ok djm
    
    OpenBSD-Commit-ID: e891dd6c7996114cb32f0924cb7898ab55efde6e

commit 8b57337c1c1506df2bb9f039d0628a6de618566b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 5 15:46:39 2019 +1000

    update fuzzing makefile to more recent clang

commit ae631ad77daf8fd39723d15a687cd4b1482cbae8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 5 15:45:32 2019 +1000

    fuzzer for sshsig allowed_signers option parsing

commit 69159afe24120c97e5ebaf81016c85968afb903e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 5 05:42:59 2019 +0000

    upstream: memleak on error path; found by libfuzzer
    
    OpenBSD-Commit-ID: 34d44cb0fb5bdb5fcbc6b02b804e71b20a7a5fc7

commit bab6feb01f9924758ca7129dba708298a53dde5f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 5 04:55:32 2019 +0000

    upstream: expose allowed_signers options parsing code in header for
    
    fuzzing
    
    rename to make more consistent with philosophically-similar auth
    options parsing API.
    
    OpenBSD-Commit-ID: 0c67600ef04187f98e2912ca57b60c22a8025b7c

commit 4f9d75fbafde83d428e291516f8ce98e6b3a7c4b
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Wed Sep 4 20:31:15 2019 +0000

    upstream: Call comma-separated lists as such to clarify semantics.
    
    Options such as Ciphers take values that may be a list of ciphers; the
    complete list, not indiviual elements, may be prefixed with a dash or plus
    character to remove from or append to the default list, respectively.
    
    Users might read the current text as if each elment took an optional prefix,
    so tweak the wording from "values" to "list" to prevent such ambiguity for
    all options supporting these semantics.
    
    Fix instances missed in first commit.  ok jmc@ kn@
    
    OpenBSD-Commit-ID: 7112522430a54fb9f15a7a26d26190ed84d5e417

commit db1e6f60f03641b2d17e0ab062242609f4ed4598
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Sep 4 05:56:54 2019 +0000

    upstream: tweak previous;
    
    OpenBSD-Commit-ID: 0abd728aef6b5b35f6db43176aa83b7e3bf3ce27

commit 0f44e5956c7c816f6600f2a47be4d7bb5a8d711d
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Tue Sep 3 20:51:49 2019 +0000

    upstream: repair typo and editing mishap
    
    OpenBSD-Commit-ID: d125ab720ca71ccf9baf83e08ddc8c12a328597e

commit f4846dfc6a79f84bbc6356ae3184f142bacedc24
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 5 11:09:28 2019 +1000

    Fuzzer harness for sshsig

commit b08a6bc1cc7750c6f8a425d1cdbd86552fffc637
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 3 18:45:42 2019 +1000

    oops; missed including the actual file

commit 1a72c0dd89f09754df443c9576dde624a17d7dd0
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 3 18:44:10 2019 +1000

    portability fixes for sshsig

commit 6d6427d01304d967e58544cf1c71d2b4394c0522
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 3 08:37:45 2019 +0000

    upstream: regress test for sshsig; feedback and ok markus@
    
    OpenBSD-Regress-ID: 74c0974f2cdae8d9599b9d76a09680bae55d8a8b

commit 59650f0eaf65115afe04c39abfb93a4fc994ec55
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 3 08:37:06 2019 +0000

    upstream: only add plain keys to prevent any certs laying around
    
    from confusing the test.
    
    OpenBSD-Regress-ID: b8f1508f822bc560b98dea910e61ecd76f34100f

commit d637c4aee6f9b5280c13c020d7653444ac1fcaa5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 3 08:35:27 2019 +0000

    upstream: sshsig tweaks and improvements from and suggested by
    
    Markus
    
    ok markus/me
    
    OpenBSD-Commit-ID: ea4f46ad5a16b27af96e08c4877423918c4253e9

commit 2a9c9f7272c1e8665155118fe6536bebdafb6166
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 3 08:34:19 2019 +0000

    upstream: sshsig: lightweight signature and verification ability
    
    for OpenSSH
    
    This adds a simple manual signature scheme to OpenSSH.
    Signatures can be made and verified using ssh-keygen -Y sign|verify
    
    Signatures embed the key used to make them. At verification time, this
    is matched via principal name against an authorized_keys-like list
    of allowed signers.
    
    Mostly by Sebastian Kinne w/ some tweaks by me
    
    ok markus@
    
    OpenBSD-Commit-ID: 2ab568e7114c933346616392579d72be65a4b8fb

commit 5485f8d50a5bc46aeed829075ebf5d9c617027ea
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 3 08:32:11 2019 +0000

    upstream: move authorized_keys option parsing helpsers to misc.c
    
    and make them public; ok markus@
    
    OpenBSD-Commit-ID: c18bcb2a687227b3478377c981c2d56af2638ea2

commit f8df0413f0a057b6a3d3dd7bd8bc7c5d80911d3a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 3 08:31:20 2019 +0000

    upstream: make get_sigtype public as sshkey_get_sigtype(); ok
    
    markus@
    
    OpenBSD-Commit-ID: 01f8cdbec63350490d2249f41112c5780d1cfbb8

commit dd8002fbe63d903ffea5be7b7f5fc2714acab4a0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 3 08:30:47 2019 +0000

    upstream: move advance_past_options to authfile.c and make it
    
    public; ok markus@
    
    OpenBSD-Commit-ID: edda2fbba2c5b1f48e60f857a2010479e80c5f3c

commit c72d78ccbe642e08591a626e5de18381489716e0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 3 08:29:58 2019 +0000

    upstream: move skip_space() to misc.c and make it public; ok
    
    markus@
    
    OpenBSD-Commit-ID: caa77e8a3b210948e29ad3e28c5db00852961eae

commit 06af3583f46e2c327fdd44d8a95b8b4e8dfd8db5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 3 08:29:15 2019 +0000

    upstream: authfd: add function to check if key is in agent
    
    This commit adds a helper function which allows the caller to
    check if a given public key is present in ssh-agent.
    
    work by Sebastian Kinne; ok markus@
    
    OpenBSD-Commit-ID: d43c5826353e1fdc1af71eb42961b30782c7bd13

commit 2ab5a8464870cc4b29ddbe849bbbc255729437bf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 3 08:28:30 2019 +0000

    upstream: fix memleak in ssh_free_identitylist(); ok markus@
    
    OpenBSD-Commit-ID: aa51f77ae2c5330a1f61b2d22933f24a443f9abf

commit 85443f165b4169b2a448b3e24bc1d4dc5b3156a4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 3 08:27:52 2019 +0000

    upstream: factor out confirm_overwrite(); ok markus@
    
    OpenBSD-Commit-ID: 304e95381b39c774c8fced7e5328b106a3ff0400

commit 9a396e33685633581c67d5ad9664570ef95281f2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 2 23:46:46 2019 +0000

    upstream: constify an argument
    
    OpenBSD-Commit-ID: 724bafc9f993746ad4303e95bede2c030de6233b

commit b52c0c2e64988277a35a955a474d944967059aeb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 2 00:19:25 2019 +0000

    upstream: downgrade PKCS#11 "provider returned no slots" warning
    
    from log level error to debug. This is common when attempting to enumerate
    keys on smartcard readers with no cards plugged in. bz#3058 ok dtucker@
    
    OpenBSD-Commit-ID: bb8839ddeb77c271390488af1b771041d43e49c6

commit 0713322e18162463c5ab5ddfb9f935055ca775d8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Sep 1 23:47:32 2019 +0000

    upstream: print comment when printing pubkey from private
    
    bz#3052; ok dtucker
    
    OpenBSD-Commit-ID: a91b2a8d5f1053d34d7fce44523c53fb534ba914

commit 368f1cc2fbd6ad10c66bc1b67c2c04aebf8a04a8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 2 10:28:42 2019 +1000

    fixed test in OSX closefrom() replacement
    
    from likan_999.student AT sina.com

commit 6b7c53498def19a14dd9587bf521ab6dbee8988f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 2 10:22:02 2019 +1000

    retain Solaris PRIV_FILE_LINK_ANY in sftp-server
    
    Dropping this privilege removes the ability to create hard links to
    files owned by other users. This is required for the legacy sftp rename
    operation.
    
    bz#3036; approach ok Alex Wilson (the original author of the Solaris
    sandbox/pledge replacement code)

commit e50f808712393e86d69e42e9847cdf8d473412d7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Aug 30 05:08:28 2019 +0000

    upstream: Use ed25519 for most hostkey rotation tests since it's
    
    supported even when built without OpenSSL.  Use RSA for the secondary type
    test if supported, otherwise skip it.  Fixes this test for !OpenSSL builds.
    
    OpenBSD-Regress-ID: 101cb34a84fd974c623bdb2e496f25a6e91be109

commit 5e4796c47dd8d6c38fb2ff0b3e817525fed6040d
Author: bluhm@openbsd.org <bluhm@openbsd.org>
Date:   Thu Aug 22 21:47:27 2019 +0000

    upstream: Test did not compile due to missing symbols. Add source
    
    sshbuf-misc.c to regress as it was done in ssh make file. from Moritz Buhl
    
    OpenBSD-Regress-ID: 9e1c23476bb845f3cf3d15d9032da3ed0cb2fcf5

commit e0e7e3d0e26f2c30697e6d0cfc293414908963c7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 30 14:26:19 2019 +1000

    tweak warning flags
    
    Enable -Wextra if compiler supports it
    
    Set -Wno-error=format-truncation if available to prevent expected
    string truncations in openbsd-compat from breaking -Werror builds

commit 28744182cf90e0073b76a9e98de58a47e688b2c4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 30 13:21:38 2019 +1000

    proc_pidinfo()-based closefrom() for OS X
    
    Refactor closefrom() to use a single brute-force close() loop fallback.
    
    Based on patch from likan_999.student@sina.com in bz#3049. ok dtucker@

commit dc2ca588144f088a54febebfde3414568dc73d5f
Author: kn@openbsd.org <kn@openbsd.org>
Date:   Fri Aug 16 11:16:32 2019 +0000

    upstream: Call comma-separated lists as such to clarify semantics
    
    Options such as Ciphers take values that may be a list of ciphers;  the
    complete list, not indiviual elements, may be prefixed with a dash or plus
    character to remove from or append to the default list respectively.
    
    Users might read the current text as if each elment took an optional prefix,
    so tweak the wording from "values" to "list" to prevent such ambiguity for
    all options supporting this semantics (those that provide a list of
    available elements via "ssh -Q ...").
    
    Input and OK jmc
    
    OpenBSD-Commit-ID: 4fdd175b0e5f5cb10ab3f26ccc38a93bb6515d57

commit c4736f39e66729ce2bf5b06ee6b391e092b48f47
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 16 06:35:27 2019 +0000

    upstream: include sshbuf-misc.c in SRCS_BASE
    
    OpenBSD-Commit-ID: 99dd10e72c04e93849981d43d64c946619efa474

commit d0e51810f332fe44ebdba41113aacf319d35f5a5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Aug 24 15:12:11 2019 +1000

    Fix pasto in fallback code.
    
    There is no parameter called "pathname", it should simply be "path".
    bz#3059, patch from samuel at cendio.se.

commit e83c989bfd9fc9838b7dfb711d1dc6da81814045
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 23 10:19:30 2019 +1000

    use SC_ALLOW_ARG_MASK to limit mmap protections
    
    Restrict to PROT_(READ|WRITE|NONE), i.e. exclude PROT_EXEC

commit f6906f9bf12c968debec3671bbf19926ff8a235b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 23 10:08:48 2019 +1000

    allow mprotect(2) with PROT_(READ|WRITE|NONE) only
    
    Used by some hardened heap allocators. Requested by Yegor
    Timoshenko in https://github.com/openssh/openssh-portable/pull/142

commit e3b6c966b79c3ea5d51b923c3bbdc41e13b96ea0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 16 06:13:15 2019 +0000

    upstream: switch percent_expand() to use sshbuf instead of a limited
    
    fixed buffer; ok markus@
    
    OpenBSD-Commit-ID: 3f9ef20bca5ef5058b48c1cac67c53b9a1d15711

commit 9ab5b9474779ac4f581d402ae397f871ed16b383
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 9 05:05:54 2019 +0000

    upstream: produce a useful error message if the user's shell is set
    
    incorrectly during "match exec" processing. bz#2791 reported by Dario
    Bertini; ok dtucker
    
    OpenBSD-Commit-ID: cf9eddd6a6be726cb73bd9c3936f3888cd85c03d

commit 8fdbc7247f432578abaaca1b72a0dbf5058d67e5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Aug 9 04:24:03 2019 +0000

    upstream: Change description of TCPKeepAlive from "inactive" to
    
    "unresponsive" to clarify what it checks for.  Patch from jblaine at
    kickflop.net via github pr#129, ok djm@.
    
    OpenBSD-Commit-ID: 3682f8ec7227f5697945daa25d11ce2d933899e9

commit 7afc45c3ed72672690014dc432edc223b23ae288
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Aug 8 08:02:57 2019 +0000

    upstream: Allow the maximimum uint32 value for the argument passed to
    
    -b which allows better error messages from later validation.  bz#3050, ok
    djm@
    
    OpenBSD-Commit-ID: 10adf6876b2401b3dc02da580ebf67af05861673

commit c31e4f5fb3915c040061981a67224de7650ab34b
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Mon Aug 5 21:45:27 2019 +0000

    upstream: Many key types are supported now, so take care to check
    
    the size restrictions and apply the default size only to the matching key
    type. tweak and ok dtucker@
    
    OpenBSD-Commit-ID: b825de92d79cc4cba19b298c61e99909488ff57e

commit 6b39a7b49ebacec4e70e24bfc8ea2f11057aac22
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Aug 5 11:50:33 2019 +0000

    upstream: Remove now-redundant perm_ok arg since
    
    sshkey_load_private_type will now return SSH_ERR_KEY_BAD_PERMISSIONS in that
    case.  Patch from jitendra.sharma at intel.com, ok djm@
    
    OpenBSD-Commit-ID: 07916a17ed0a252591b71e7fb4be2599cb5b0c77

commit d46075b923bf25e6f25959a3f5b458852161cb3e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Aug 5 21:36:48 2019 +1000

    Fix mem leak in unit test.
    
    Patch from jitendra.sharma at intel.com.

commit c4ffb72593c08921cf9291bc05a5ef1d0aaa6891
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 2 01:41:24 2019 +0000

    upstream: fix some memleaks in test_helper code
    
    bz#3037 from Jitendra Sharma
    
    OpenBSD-Regress-ID: 71440fa9186f5842a65ce9a27159385c6cb6f751

commit 6e76e69dc0c7712e9ac599af34bd091b0e7dcdb5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 2 01:23:19 2019 +0000

    upstream: typo; from Christian Hesse
    
    OpenBSD-Commit-ID: 82f6de7438ea7ee5a14f44fdf5058ed57688fdc3

commit 49fa065a1bfaeb88a59abdfa4432d3b9c35b0655
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 30 05:04:49 2019 +0000

    upstream: let sshbuf_find/cmp take a void* for the
    
    search/comparison argument, instead of a u_char*. Saves callers needing to
    cast.
    
    OpenBSD-Commit-ID: d63b69b7c5dd570963e682f758f5a47b825605ed

commit 7adf6c430d6fc17901e167bc0789d31638f5c2f8
Author: mestre@openbsd.org <mestre@openbsd.org>
Date:   Wed Jul 24 08:57:00 2019 +0000

    upstream: When using a combination of a Yubikey+GnuPG+remote
    
    forwarding the gpg-agent (and options ControlMaster+RemoteForward in
    ssh_config(5)) then the codepath taken will call mux_client_request_session
    -> mm_send_fd -> sendmsg(2). Since sendmsg(2) is not allowed in that codepath
    then pledge(2) kills the process.
    
    The solution is to add "sendfd" to pledge(2), which is not too bad considering
    a little bit later we reduce pledge(2) to only "stdio proc tty" in that
    codepath.
    
    Problem reported and diff provided by Timothy Brown <tbrown at freeshell.org>
    
    OK deraadt@
    
    OpenBSD-Commit-ID: 7ce38b6542bbec00e441595d0a178e970a9472ac

commit 0e2fe18acc1da853a9120c2e9af68e8d05e6503e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jul 23 23:06:57 2019 +0000

    upstream: Fix typo in CASignatureAlgorithms wherein what should be
    
    a comma is a dot. Patch from hnj2 via github pr#141.
    
    OpenBSD-Commit-ID: 01f5a460438ff1af09aab483c0a70065309445f0

commit e93ffd1a19fc47c49d68ae2fb332433690ecd389
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jul 29 16:04:01 2019 +1000

    Report success of individual tests as well as all.
    
    This puts the "all tests passed" message back at the end where the
    test harnesses can find it.

commit 2ad5b36b18bddf2965fe60384c29b3f1d451b4ed
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 29 09:49:23 2019 +1000

    convert to UTF-8; from Mike Frysinger

commit d31e7c937ba0b97534f373cf5dea34675bcec602
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 26 04:22:21 2019 +0000

    upstream: Restrict limit-keytype to types supported by build. This
    
    means we have to skip a couple tests when only one key type is supported.
    
    OpenBSD-Regress-ID: 22d05befb9c7ce21ce8dc22acf1ffe9e2ef2e95e

commit 0967a233b8a28907ae8a4a6773c89f21d2ace11b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 25 18:36:28 2019 +1000

    Remove override disabling DH-GEX.
    
    The DH-GEX override doesn't work when build without OpenSSL, and
    we'll prefer curve25519 these days, removing the need for it.

commit 061407efc19b41ab4a7485e5adcff2a12befacdb
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jul 25 09:17:35 2019 +0000

    upstream: Only use supported key types during KRL test, preferring
    
    ed25519 since it's supported by both OpenSSL and non-OpenSSL builds.
    
    OpenBSD-Regress-ID: 9f2bb3eadd50fcc8245b1bd8fd6f0e53602f71aa

commit 47f8ff1fa5b76790c1d785815fd13ee6009f8012
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jul 25 08:48:11 2019 +0000

    upstream: Switch keys-command test from rsa to ed25519 since it's
    
    supported for both OpenSSL and non-OpenSSL builds.
    
    OpenBSD-Regress-ID: 174be4be876edd493e4a5c851e5bc579885e7a0a

commit 1e94afdfa8df774ab7dd3bad52912b636dc31bbd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jul 25 08:28:15 2019 +0000

    upstream: Make certificate tests work with the supported key
    
    algorithms.  Allows tests to pass when built without OpenSSL.
    
    OpenBSD-Regress-ID: 617169a6dd9d06db3697a449d9a26c284eca20fc

commit 26bf693661a48b97b6023f702b2af643676ac21a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jul 23 13:49:14 2019 +0000

    upstream: Construct list of key types to test based on the types
    
    supported by the binaries.
    
    OpenBSD-Regress-ID: fcbd115efacec8ab0ecbdb3faef79ac696cb1d62

commit 773c55b3d1230e8f7714a1b33873c37b85049c74
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jul 23 13:32:48 2019 +0000

    upstream: Only use DSA key type in tests if binaries support it.
    
    OpenBSD-Regress-ID: 770e31fe61dc33ed8eea9c04ce839b33ddb4dc96

commit 159e987a54d92ccd73875e7581ffc64e8927a715
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 24 14:21:19 2019 +1000

    Split test targets further.
    
    Splits test into file-tests, t-exec, unit and interop-tests and their
    respective dependencies.  Should allow running any set individually
    without having to build the other dependencies that are not needed
    for that specific test.

commit 520d4550a2470106d63e30079bb05ce82f3a4f7d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 24 11:20:18 2019 +1000

    Add lib dependencies for regress binary targets.

commit 4e8d0dd78d5f6142841a07dc8b8c6b4730eaf587
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 24 00:12:51 2019 +1000

    Make "unit" a dependency of "test".

commit 4317b2a0480e293e58ba115e47b49d3a384b6568
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 23 23:24:47 2019 +1000

    upstream rev 1.28: fix comment typo.

commit e0055af2bd39fdb44566ff6594147664e1fac8b8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 23 23:06:22 2019 +1000

    Split regress-binaries into two targets.
    
    Split the binaries for the unit tests out into a regress-unit-binaries
    target, and add a dependency on it for only the unit tests.  This allows
    us to run the integration tests only ("make t-exec") without building
    the unit tests, which allows us to run a subset of the tests when
    building --without-openssl without trying (and failing) to build the
    unit tests.
    
    This means there are two targets for "unit" which I *think* is valid
    (it works in testing, and makedepend will generate Makefiles of this
    form)a but I could be wrong.

commit 7cdf9fdcf11aaaa98c2bd22c92882ea559e772ad
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jul 23 08:19:29 2019 +0000

    upstream: Skip DH group generation test if binaries don't support
    
    DH-GEX.
    
    OpenBSD-Regress-ID: 7c918230d969ecf7656babd6191a74526bffbffd

commit 3a3eab8bb0da3d2f0f32cb85a1a268bcca6e4d69
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jul 23 07:55:29 2019 +0000

    upstream: Only test conversion of key types supported by the
    
    binaries.
    
    OpenBSD-Regress-ID: e3f0938a0a7407e2dfbb90abc3ec979ab6e8eeea

commit 7e66b7d98c6e3f48a1918c3e1940c9b11b10ec63
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jul 23 07:39:43 2019 +0000

    upstream: Only add ssh-dss to allowed key types if it's supported
    
    by the binary.
    
    OpenBSD-Regress-ID: 395a54cab16e9e4ece9aec047ab257954eebd413

commit fd0684b319e664d8821dc4ca3026126dfea3ccf4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 23 22:36:39 2019 +1000

    Remove sys/cdefs.h include.
    
    It's not needed on -portable (that's handled by includes.h) and not all
    platforms have it.

commit 9634ffbf29b3c2493e69d10b37077b09a8cbf5ff
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 23 22:25:44 2019 +1000

    Add headers to prevent warnings w/out OpenSSL.

commit 2ea60312e1c08dea88982fec68244f89a40912ff
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 23 22:11:50 2019 +1000

    Include stdlib.h for free() and calloc().

commit 11cba2a4523fda447e2554ea457484655bedc831
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 23 21:51:22 2019 +1000

    Re-apply portability changes to current sha2.{c,h}.
    
    Rather than attempt to apply 14 years' worth of changes to OpenBSD's sha2
    I imported the current versions directly then re-applied the portability
    changes.  This also allowed re-syncing digest-libc.c against upstream.

commit 09159594a3bbd363429ee6fafde57ce77986dd7c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 23 20:27:51 2019 +1000

    Import current sha2.c and sha2.h from OpenBSD.
    
    These are not changed from their original state, the next commit will
    re-apply the portable changes.

commit 2e6035b900cc9d7432d95084e03993d1b426f812
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 23 08:11:22 2019 +1000

    Rename valgrind "errors" to "failures".
    
    When valgrind is enabled, test-exec.sh counts the number of invocations
    that valgrind detects failures in, not the total number of errors detected.
    This makes the name to be more accurate.

commit e82c9bb9ffa65725cc2e03ea81cb79ce3387f66b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 19 18:51:18 2019 +1000

    Skip running sftp-chroot under Valgrind.

commit 41e22c2e05cb950b704945ac9408f6109c9b7848
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jul 20 09:50:58 2019 +0000

    upstream: Remove the sleeps and thus races from the forwarding
    
    test.  They were originally required to work with Protocol 1, but now we can
    use ssh -N and the control socket without the sleeps. While there, suppress
    output fro the control exit commands.
    
    OpenBSD-Regress-ID: 4c51a1d651242f12c90074c18c61008a74c1c790

commit 0423043c5e54293f4dd56041304fd0046c317be9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jul 20 09:37:31 2019 +0000

    upstream: Allow SLEEPTIME to be overridden.
    
    OpenBSD-Regress-ID: 1596ab168729954be3d219933b2d01cc93687e76

commit d466b6a5cfba17a83c7aae9f584ab164e2ece0a1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Jul 20 09:14:40 2019 +0000

    upstream: Move sleep time into a variable so that we can increase
    
    it for platforms or configurations that are much slower then usual.
    
    OpenBSD-Regress-ID: 88586cabc800062c260d0b876bdcd4ca3f58a872

commit b4a7c9d2b5f928e0b902b580d35dc8b244a3aae0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 19 03:45:44 2019 +0000

    upstream: add regression tests for scp for out-of-destination path file
    
    creation by Harry Sintonen via Jakub Jelen in bz3007
    
    OpenBSD-Regress-ID: 01ae5fbc6ce400b2df5a84dc3152a9e31f354c07

commit bca0582063f148c7ddf409ec51435a5a726bee4c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 19 03:38:01 2019 +0000

    upstream: Accept the verbose flag when searching for host keys in known
    
    hosts (i.e. "ssh-keygen -vF host") to print the matching host's random- art
    signature too. bz#3003 "amusing, pretty" deraadt@
    
    OpenBSD-Commit-ID: 686221a5447d6507f40a2ffba5393984d889891f

commit 5299a09fa2879a068af200c91028fcfa9283c0f0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 19 13:50:25 2019 +1000

    Revert one dependency per line change.
    
    It turns out that having such a large number of lines in the .depend
    file will cause the memory usage of awk during AC_SUBST to blow up on at
    least NetBSD's awk, causing configure to fail.

commit 01dddb231f23b4a7b616f9d33a0b9d937f9eaf0e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 19 13:19:19 2019 +1000

    fix SIGWINCH delivery of Solaris for mux sessions
    
    Remove PRIV_PROC_SESSION which was limiting ability to send SIGWINCH
    signals to other sessions.  bz#3030; report and fix from Darren Moffat

commit 05500af21d27c1a3ddac232b018cc23da7b1ee95
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 19 13:20:03 2019 +1000

    Force dependencies one per line.
    
    Force makedepend to output one dependency per line, which will make
    reading diffs against it much easier.  ok djm@

commit b5bc5d016bbb83eb7f8e685390044e78b1ea1427
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 19 13:18:07 2019 +1000

    make depend.

commit 65333f7454365fe40f7367630e7dd10903b9d99e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 19 13:16:11 2019 +1000

    Show when skipping valgrind for a test.

commit fccb7eb3436da8ef3dcd22e5936ba1abc7ae6730
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 19 10:41:56 2019 +1000

    Enable connect-privsep test with valgrind.
    
    connect-privsep seems to work OK with valgrind now so don't skip
    valgrind on it.

commit d7423017265c5ae6d0be39340feb6c9f016b1f71
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 19 07:43:07 2019 +1000

    Show valgrind results and error counts.

commit 22b9b3e944880db906c6ac5527c4228bd92b293a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 18 13:40:12 2019 +1000

    Fix format string integer type in error message.

commit ed46a0c0705895834d3f47a46faa89c2a71b760a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 18 13:26:00 2019 +0000

    upstream: fix off-by-one in sshbuf_dtob64() base64 wrapping that could
    
    cause extra newlines to be appended at the end of the base64 text (ugly, but
    harmless). Found and fixed by Sebastian Kinne
    
    OpenBSD-Commit-ID: 9fe290bd68f706ed8f986a7704ca5a2bd32d7b68

commit a192021fedead23c375077f92346336d531f8cad
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 18 11:09:38 2019 +1000

    Fail tests if Valgrind enabled and reports errors.
    
    Also dump the failing valgrind report to stdout (not the cleanest
    solution, but better than nothing).

commit d1c491ecb939ee10b341fa7bb6205dff19d297e5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 18 10:17:54 2019 +1000

    Allow low-priv tests to write to pipe dir.
    
    When running regression tests with Valgrind and SUDO, the low-priv agent
    tests need to be able to create pipes in the appropriate directory.

commit 8a5bb3e78191cc206f970c26d2a26c949971e91a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 17 21:24:55 2019 +1000

    Put valgrind vgdb files to a specific directory.
    
    Valgrind by default puts vgdb files and pipes under /tmp, however it
    is not always able to clean them up, which can cause test failures when
    there's a pid/file collision.  Using a specific directory ensures that
    we can clean up and start clean.

commit f8829fe57fb0479d6103cfe1190095da3c032c6d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 16 22:16:49 2019 +0000

    upstream: adapt to sshbuf_dtob64() change
    
    OpenBSD-Regress-ID: 82374a83edf0955fd1477169eee3f5d6467405a6

commit 1254fcbb2f005f745f2265016ee9fa52e16d37b0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jul 16 03:21:54 2019 +0000

    upstream: Remove ssh1 files from CLEANFILES since ssh1 no longer
    
    supported.
    
    OpenBSD-Regress-ID: 5b9ae869dc669bac05939b4a2fdf44ee067acfa0

commit 9dc81a5adabc9a7d611ed2e63fbf4c85d43b15c6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jul 16 02:09:29 2019 +0000

    upstream: Update names of host key files in CLEANFILES to match
    
    recent changes to the tests.
    
    OpenBSD-Regress-ID: 28743052de3acf70b06f18333561497cd47c4ecf

commit e44e4ad1190db22ed407a79f32a8cff5bcd2b815
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 16 23:26:53 2019 +1000

    depend

commit 16dd8b2c78a0de106c7429e2a294d203f6bda3c7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 16 13:18:39 2019 +0000

    upstream: remove mostly vestigal uuencode.[ch]; moving the only unique
    
    functionality there (wrapping of base64-encoded data) to sshbuf functions;
    feedback and ok markus@
    
    OpenBSD-Commit-ID: 4dba6735d88c57232f6fccec8a08bdcfea44ac4c

commit 45478898f9590b5cc8bc7104e573b84be67443b0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 16 09:20:23 2019 +1000

    Hook memmem compat code into build.
    
    This fixes builds on platforms that don't have it (at least old DragonFly,
    probably others).

commit c7bd4617293a903bd3fac3394a7e72d439af49a5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jul 16 09:07:18 2019 +1000

    Import memmem.c from OpenBSD.

commit 477e2a3be8b10df76e8d76f0427b043280d73d68
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 15 13:12:02 2019 +0000

    upstream: unit tests for sshbuf_cmp() and sshbuf_find(); ok markus
    
    OpenBSD-Regress-ID: b52d36bc3ab6dc158c1e59a9a4735f821cf9e1fd

commit eb0d8e708a1f958aecd2d6e2ff2450af488d4c2a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 15 13:16:29 2019 +0000

    upstream: support PKCS8 as an optional format for storage of
    
    private keys, enabled via "ssh-keygen -m PKCS8" on operations that save
    private keys to disk.
    
    The OpenSSH native key format remains the default, but PKCS8 is a
    superior format to PEM if interoperability with non-OpenSSH software
    is required, as it may use a less terrible KDF (IIRC PEM uses a single
    round of MD5 as a KDF).
    
    adapted from patch by Jakub Jelen via bz3013; ok markus
    
    OpenBSD-Commit-ID: 027824e3bc0b1c243dc5188504526d73a55accb1

commit e18a27eedccb024acb3cd9820b650a5dff323f01
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 15 13:11:38 2019 +0000

    upstream: two more bounds-checking sshbuf counterparts to common
    
    string operations: sshbuf_cmp() (bcmp-like) and sshbuf_find() (memmem like)
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: fd071ec2485c7198074a168ff363a0d6052a706a

commit bc551dfebb55845537b1095cf3ccd01640a147b7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jul 15 12:52:45 2019 +1000

    Clear valgrind-out dir to prevent collisions.

commit 5db9ba718e983661a9114ae1418f6e412d1f52d5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jul 15 12:02:27 2019 +1000

    Allow agent tests to write to valgrind dir.

commit 121e48fa5305f41f0477d9908e3d862987a68a84
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jul 14 23:33:19 2019 +0000

    upstream: unit tests for sshbuf_peek/poke bounds-checked random access
    
    functions. ok markus@
    
    OpenBSD-Regress-ID: 034c4284b1da6b12e25c762a6b958efacdafbaef

commit 101d164723ffbc38f8036b6f3ea3bfef771ba250
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jul 14 23:32:27 2019 +0000

    upstream: add some functions to perform random-access read/write
    
    operations inside buffers with bounds checking. Intended to replace manual
    pointer arithmetic wherever possible.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: 91771fde7732738f1ffed078aa5d3bee6d198409

commit 7250879c72d28275a53f2f220e49646c3e42ef18
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 12 04:08:39 2019 +0000

    upstream: include SHA2-variant RSA key algorithms in KEX proposal;
    
    allows ssh-keyscan to harvest keys from servers that disable olde SHA1
    ssh-rsa. bz#3029 from Jakub Jelen
    
    OpenBSD-Commit-ID: 9f95ebf76a150c2f727ca4780fb2599d50bbab7a

commit a0876bd994cab9ba6e47ba2a163a4417c7597487
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 12 03:56:21 2019 +0000

    upstream: print explicit "not modified" message if a file was
    
    requested for resumed download but was considered already complete.
    
    bz#2978 ok dtucker
    
    OpenBSD-Commit-ID: f32084b26a662f16215ee4ca4a403d67e49ab986

commit b9b0f2ac9625933db53a35b1c1ce423876630558
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Wed Jul 10 07:04:27 2019 +0000

    upstream: Fix a typo and make <esc><right> move right to the
    
    closest end of a word just like <esc><left> moves left to the closest
    beginning of a word.
    
    ok djm
    
    OpenBSD-Commit-ID: 6afe01b05ed52d8b12eb1fda6e9af5afb5e198ee

commit 8729498a5d239980a91d32f031b34e8c58c52f62
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 10 09:43:19 2019 +1000

    fix typo that prevented detection of Linux VRF
    
    Reported by hexiaowen AT huawei.com

commit 5b2b79ff7c057ee101518545727ed3023372891d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 9 04:15:00 2019 +0000

    upstream: cap the number of permiopen/permitlisten directives we're
    
    willing to parse on a single authorized_keys line; ok deraadt@
    
    OpenBSD-Commit-ID: a43a752c2555d26aa3fc754805a476f6e3e30f46

commit eb0b51dac408fadd1fd13fa6d726ab8fdfcc4152
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jul 8 17:27:26 2019 +1000

    Move log.h include inside ifdefs.
    
    Fixes build on some other platforms that don't have va_list immediately
    available (eg NetBSD).

commit 43702f8e6fa22a258e25c4dd950baaae0bc656b7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 6 23:07:04 2019 +1000

    Include log.h for debug() and friends.
    
    Should fix some compiler warnings on IRIX (bz#3032).

commit 53a6ebf1445a857f5e487b18ee5e5830a9575149
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 8 13:44:32 2019 +1000

    sftp-realpath.c needs includes.h

commit 4efe1adf05ee5d3fce44320fcff68735891f4ee6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 8 13:38:39 2019 +1000

    remove realpath() compat replacement
    
    We shipped a BSD implementation of realpath() because sftp-server
    depended on its behaviour.
    
    OpenBSD is now moving to a more strictly POSIX-compliant realpath(2),
    so sftp-server now unconditionally requires its own BSD-style realpath
    implementation. As such, there is no need to carry another independant
    implementation in openbsd-compat.
    
    ok dtucker@

commit 696fb4298e80f2ebcd188986a91b49af3b7ca14c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jul 7 01:05:00 2019 +0000

    upstream: Remove some set but never used variables. ok daraadt@
    
    OpenBSD-Commit-ID: 824baf9c59afc66a4637017e397b9b74a41684e7

commit 156e9e85e92b46ca90226605d9eff49e8ec31b22
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Jul 5 12:35:40 2019 +0000

    upstream: still compile uuencode.c, unbreaks build
    
    OpenBSD-Commit-ID: 5ea3d63ab972691f43e9087ab5fd8376d48e898f

commit cec9ee527a12b1f6c2e0a1c155fec64a38d71cf6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 5 07:32:01 2019 +0000

    upstream: revert header removal that snuck into previous
    
    OpenBSD-Commit-ID: 3919cdd58989786660b8269b325646ef8856428e

commit 569b650f93b561c09c655f83f128e1dfffe74101
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 5 04:55:40 2019 +0000

    upstream: add a local implementation of BSD realpath() for
    
    sftp-server use ahead of OpenBSD's realpath changing to match POSIX;
    
    ok deraadt@ (thanks for snaps testing)
    
    OpenBSD-Commit-ID: 4f8cbf7ed8679f6237264301d104ecec64885d55

commit b8e2b797362526437e0642a6c2f2970d794f2561
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 6 13:13:57 2019 +1000

    Add prototype for strnlen to prevent warnings.

commit 4c3e00b1ed7e596610f34590eb5d54ee50d77878
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 6 13:02:34 2019 +1000

    Cast *ID types to unsigned long when printing.
    
    UID and GID types vary by platform so cast to u_long and use %lu when
    printing them to prevent warnings.

commit 2753521e899f30d1d58b5da0b4e68fde6fcf341e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 6 12:54:43 2019 +1000

    Add prototype for compat strndup.(bz#3032).

commit 01a1e21cd55d99293c8ff8ed7c590f2ee440da43
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 6 12:00:41 2019 +1000

    Add missing bracket in EGD seeding code.
    
    When configured --with-prngd-socket the code had a missing bracket after
    an API change.  Fix that and a couple of warnings.  bz#3032 , from
    ole.weidner at protonmail.ch

commit e187b1d4607392cf2c19243afe0d0311a4ff3591
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 5 04:19:39 2019 +0000

    upstream: Add (recently added) rsa_oldfmt to CLEANFILES.
    
    OpenBSD-Regress-ID: 405beda94e32aa6cc9c80969152fab91f7c54bd3

commit 74b541bfabdcb57c1683cd9b3f1d1f4d5e41563e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 5 04:12:46 2019 +0000

    upstream: Adapt the PuTTY/Conch tests to new key names.
    
    A recent regress change (2a9b3a2ce411d16cda9c79ab713c55f65b0ec257 in
    portable) broke the PuTTY and Twisted Conch interop tests, because the
    key they want to use is now called ssh-rsa rather than rsa.  Adapt the
    tests to the new file names.  bz#3020, patch from cjwatson at debian.org.
    
    OpenBSD-Regress-ID: fd342a37db4d55aa4ec85316f73082c8eb96e64e

commit de08335a4cfaa9b7081e94ea4a8b7153c230546d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 5 04:03:13 2019 +0000

    upstream: Add a sleep to allow forwards to come up.
    
    Currently when the multiplex client requests a forward it returns
    once the request has been sent but not necessarily when the forward
    is up.  This causes intermittent text failures due to this race,
    so add some sleeps to mitigate this until we can fix it properly.
    
    OpenBSD-Regress-ID: 384c7d209d2443d25ea941d7f677e932621fb253

commit 4d249284729f864faa2e8f3e015f9a41b674544a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 5 14:58:57 2019 +1000

    Remove nc stderr redirection to resync w/OpenBSD.

commit c5cfa90e03432181ffcc7ad3f9f815179bd0c626
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 5 13:21:45 2019 +1000

    Do not fatal on failed lookup of group "tty".
    
    Some platforms (eg AIX and Cygwin) do not have a "tty" group.  In those
    cases we will fall back to making the tty device the user's primary
    group, so do not fatal if the group lookup fails.  ok djm@

commit 8b4cc4bdc8a70bf209a274fa2b2a49c1e3c8d8a2
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Thu Jul 4 16:20:10 2019 +0000

    upstream: fatal() if getgrnam() cannot find "tty"
    
    OpenBSD-Commit-ID: d148c1c052fa0ed7d105b5428b5c1bab91630048

commit 48cccc275c6a1e91d3f80fdb0dc0d5baf529aeca
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Thu Jul 4 16:16:51 2019 +0000

    upstream: stat() returns precisely -1 to indicate error
    
    OpenBSD-Commit-ID: 668e8d022ed4ab847747214f64119e5865365fa1

commit 8142fcaf9ed8ff66252deecbfd29fc59d5f2df4f
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed Jul 3 03:24:02 2019 +0000

    upstream: snprintf/vsnprintf return < 0 on error, rather than -1.
    
    OpenBSD-Commit-ID: a261c421140a0639bb2b66bbceca72bf8239749d

commit 4d28fa78abce2890e136281950633fae2066cc29
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Jun 28 13:35:04 2019 +0000

    upstream: When system calls indicate an error they return -1, not
    
    some arbitrary value < 0.  errno is only updated in this case.  Change all
    (most?) callers of syscalls to follow this better, and let's see if this
    strictness helps us in the future.
    
    OpenBSD-Commit-ID: 48081f00db7518e3b712a49dca06efc2a5428075

commit e8c974043c1648eab0ad67a7ba6a3e444fe79d2d
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Jun 28 05:44:09 2019 +0000

    upstream: asprintf returns -1, not an arbitrary value < 0. Also
    
    upon error the (very sloppy specification) leaves an undefined value in *ret,
    so it is wrong to inspect it, the error condition is enough. discussed a
    little with nicm, and then much more with millert until we were exasperated
    
    OpenBSD-Commit-ID: 29258fa51edf8115d244b9d4b84028487bf8923e

commit 1b2d55d15c6240c15a1e1cf4203b82e54a766272
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Jun 28 01:23:50 2019 +0000

    upstream: oops, from asou
    
    OpenBSD-Commit-ID: 702e765d1639b732370d8f003bb84a1c71c4d0c6

commit 5cdbaa78fcb718c39af4522d98016ad89d065427
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Thu Jun 27 18:03:37 2019 +0000

    upstream: Some asprintf() calls were checked < 0, rather than the
    
    precise == -1. ok millert nicm tb, etc
    
    OpenBSD-Commit-ID: caecf8f57938685c04f125515b9f2806ad408d53

commit b2e3e57be4a933d9464bccbe592573725765486f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 27 06:29:35 2019 +0000

    upstream: fix NULL deference (bzero) on err
    
    =?UTF-8?q?or=20path=20added=20in=20last=20commit;=20spotted=20by=20Reynir?=
    =?UTF-8?q?=20Bj=C3=B6rnsson?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    ok deraadt@ markus@ tb@
    
    OpenBSD-Commit-ID: b11b084bcc551b2c630560eb08618dd501027bbd

commit 58ceacdcbaebefc77d120712de55c6fc6aa32bb1
Author: Jitendra Sharma <jitendra.sharma@intel.com>
Date:   Fri Jun 21 09:54:17 2019 +0530

    Update README doc to include missing test cases
    
    Readme regress document is missing various individual tests,
    which are supported currently. Update README to
    include those test cases.

commit 7959330a554051b5587f8af3fec0c2c0d5820f64
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jun 26 22:29:43 2019 +0000

    upstream: Remove unneeded unlink of xauthfile o
    
    =?UTF-8?q?n=20error=20path.=20=20From=20Erik=20Sj=C3=B6lund=20via=20githu?=
    =?UTF-8?q?b,=20ok=20djm@=20deraadt@?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: 62a4893cf83b29a4bbfedc40e7067c25c203e632

commit 8de52eb224143783a49f9bddd9ab7800022a8276
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jun 23 12:21:46 2019 +0000

    upstream: fix mismatch proto/decl from key shielding change; spotted
    
    via oss-fuzz
    
    OpenBSD-Commit-ID: 1ea0ba05ded2c5557507bd844cd446e5c8b5b3b7

commit 1dfadb9b57c2985c95838a0292d1c2f6a501896e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 21 04:21:45 2019 +0000

    upstream: adapt for key shielding API changes (const removal)
    
    OpenBSD-Regress-ID: 298890bc52f0cd09dba76dc1022fabe89bc0ded6

commit 4f7a56d5e02e3d04ab69eac1213817a7536d0562
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 21 04:21:04 2019 +0000

    upstream: Add protection for private keys at rest in RAM against
    
    speculation and memory sidechannel attacks like Spectre, Meltdown, Rowhammer
    and Rambleed. This change encrypts private keys when they are not in use with
    a symmetic key that is derived from a relatively large "prekey" consisting of
    random data (currently 16KB).
    
    Attackers must recover the entire prekey with high accuracy before
    they can attempt to decrypt the shielded private key, but the current
    generation of attacks have bit error rates that, when applied
    cumulatively to the entire prekey, make this unlikely.
    
    Implementation-wise, keys are encrypted "shielded" when loaded and then
    automatically and transparently unshielded when used for signatures or
    when being saved/serialised.
    
    Hopefully we can remove this in a few years time when computer
    architecture has become less unsafe.
    
    been in snaps for a bit already; thanks deraadt@
    
    ok dtucker@ deraadt@
    
    OpenBSD-Commit-ID: 19767213c312e46f94b303a512ef8e9218a39bd4

commit 4cd6b12cc9c10bf59c8b425041f3ea5091285a0f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 21 03:19:59 2019 +0000

    upstream: print the correct AuthorizedPrincipalsCommand rather than
    
    an uninitialised variable; spotted by dtucker@
    
    OpenBSD-Commit-ID: 02802018784250f68202f01c8561de82e17b0638

commit 5f68ab436b0e01751d564e9a9041e6ac3673e45a
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Jun 19 20:12:44 2019 +0000

    upstream: from tim: - for reput, it is remote-path which is
    
    optional, not local-path - sync help
    
    from deraadt:
    - prefer -R and undocument -r (but add a comment for future editors)
    
    from schwarze:
    - prefer -p and undocument -P (as above. the comment was schwarze's too)
    
    more:
    - add the -f flag to reput and reget
    - sort help (i can;t remember who suggested this originally)
    
    djm and deraadt were ok with earlier versions of this;
    tim and schwarze ok
    
    OpenBSD-Commit-ID: 3c699b53b46111f5c57eed4533f132e7e58bacdd

commit 99bcbbc77fbd5a5027031f42a5931b21b07c947e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 14 04:03:48 2019 +0000

    upstream: check for convtime() refusing to accept times that
    
    resolve to LONG_MAX Reported by Kirk Wolf bz2977; ok dtucker
    
    OpenBSD-Regress-ID: 15c9fe87be1ec241d24707006a31123d3a3117e0

commit e5cccb2410247c9b8151b9510a876abdf5424b24
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Apr 28 22:53:26 2019 +0000

    upstream: Add unit tests for user@host and URI parsing.
    
    OpenBSD-Regress-ID: 69d5b6f278e04ed32377046f7692c714c2d07a68

commit 0bb7e38834e3f9886302bbaea630a6b0f8cfb520
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Apr 18 18:57:16 2019 +0000

    upstream: Add tests for sshd -T -C with Match.
    
    OpenBSD-Regress-ID: d4c34916fe20d717692f10ef50b5ae5a271c12c7

commit 73eb6cef41daba0359c1888e4756108d41b4e819
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Jun 16 12:55:27 2019 +1000

    Include stdio.h for vsnprintf.
    
    Patch from mforney at mforney.org.

commit adcaf40fd0a180e6cb5798317fdf479b52e3c09a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jun 8 09:07:04 2019 +1000

    upstream rev 1.27: fix integer overflow.
    
    Cast bitcount to u_in64_t before bit shifting to prevent integer overflow
    on 32bit platforms which cause incorrect results when adding a block
    >=512M in size.  sha1 patch from ante84 at gmail.com via openssh github,
    sha2 with djm@, ok tedu@

commit 7689048e6103d3c34cba24ac5aeea7bf8405d19a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jun 8 09:06:06 2019 +1000

    upstream rev 1.25: add DEF_WEAK.
    
    Wrap blowfish, sha*, md5, and rmd160 so that internal calls go direct
    ok deraadt@

commit 55f3153393ac7e072a4b4b21b194864460d8f44a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jun 8 09:02:24 2019 +1000

    upstream rev 1.25: add sys/types.h

commit 10974f986fa842a3a3a693e3d5761072540002b4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jun 8 09:01:14 2019 +1000

    upstream: Use explicit_bzero instead of memset
    
    in hash Final and End functions.  OK deraadt@ djm@

commit cb8f56570f70b00abae4267d4bcce2bfae7dfff6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 14 04:13:58 2019 +0000

    upstream: slightly more instructive error message when the user
    
    specifies multiple -J options on the commandline. bz3015 ok dtucker@
    
    OpenBSD-Commit-ID: 181c15a65cac3b575819bc8d9a56212c3c748179

commit 2317ce4b0ed7d8c4b0c684e2d47bff5006bd1178
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 14 03:51:47 2019 +0000

    upstream: process agent requests for RSA certificate private keys using
    
    correct signature algorithm when requested. Patch from Jakub Jelen in bz3016
    ok dtucker markus
    
    OpenBSD-Commit-ID: 61f86efbeb4a1857a3e91298c1ccc6cf49b79624

commit c95b90d40170473825904be561b1eafba354f376
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 14 03:39:59 2019 +0000

    upstream: for public key authentication, check AuthorizedKeysFiles
    
    files before consulting AuthorizedKeysCommand; ok dtucker markus
    
    OpenBSD-Commit-ID: 13652998bea5cb93668999c39c3c48e8429db8b3

commit a5a53914989ddd3521b6edc452bc3291784a4f4f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 14 03:28:19 2019 +0000

    upstream: if passed a bad fd, log what it was
    
    OpenBSD-Commit-ID: 582e2bd05854e49365195b58989b68ac67f09140

commit 7349149da1074d82b71722338e05b6a282f126cc
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Jun 12 11:31:50 2019 +0000

    upstream: Hostname->HostName cleanup; from lauri tirkkonen ok
    
    dtucker
    
    OpenBSD-Commit-ID: 4ade73629ede63b691f36f9a929f943d4e7a44e4

commit 76af9c57387243556d38935555c227d0b34062c5
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Jun 12 05:53:21 2019 +0000

    upstream: deraadt noticed some inconsistency in the way we denote
    
    the "Hostname" and "X11UseLocalhost" keywords; this makes things consistent
    (effectively reversing my commit of yesterday);
    
    ok deraadt markus djm
    
    OpenBSD-Commit-ID: 255c02adb29186ac91dcf47dfad7adb1b1e54667

commit d1bbfdd932db9b9b799db865ee1ff50060dfc895
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Jun 11 13:39:40 2019 +0000

    upstream: consistent lettering for "HostName" keyword; from lauri
    
    tirkkonen
    
    OpenBSD-Commit-ID: 0c267a1257ed7482b13ef550837b6496e657d563

commit fc0340f7c4ee29bfb12bd1de9f99defa797e16b4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jun 8 00:10:59 2019 +1000

    Typo fixes in error messages.
    
    Patch from knweiss at gmail.com via github pull req #97 (portable-
    specific parts).

commit 4b7dd22b02b64b1ededd3c0e98a6e7ae21e31d38
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 7 14:18:48 2019 +0000

    upstream: Typo and spelling fixes in comments and error messages.
    
    Patch from knweiss at gmail.com via -portable.
    
    OpenBSD-Commit-ID: 2577465442f761a39703762c4f87a8dfcb918b4b

commit 130ef0695e1731392ca33831939fe89e8b70cc17
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jun 8 00:47:07 2019 +1000

    Include missed bits from previous sync.

commit 25e3bccbaa63d27b9d5e09c123f1eb28594d2bd6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 7 03:47:12 2019 +0000

    upstream: Check for user@host when parsing sftp target. This
    
    allows user@[1.2.3.4] to work without a path in addition to with one.
    bz#2999, ok djm@
    
    OpenBSD-Commit-ID: d989217110932490ba8ce92127a9a6838878928b

commit 0323d9b619d512f80c57575b810a05791891f657
Author: otto@openbsd.org <otto@openbsd.org>
Date:   Thu Jun 6 05:13:13 2019 +0000

    upstream: Replace calls to ssh_malloc_init() by a static init of
    
    malloc_options. Prepares for changes in the way malloc is initialized.  ok
    guenther@ dtucker@
    
    OpenBSD-Commit-ID: 154f4e3e174f614b09f792d4d06575e08de58a6b

commit c586d2d3129265ea64b12960c379d634bccb6535
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 31 03:20:07 2019 +0000

    upstream: fix ssh-keysign fd handling problem introduced in r1.304
    
    caused by a typo (STDIN_FILENO vs STDERR_FILENO)
    
    OpenBSD-Commit-ID: 57a0b4be7bef23963afe24150e24bf014fdd9cb0

commit 410b231aa41ff830b2f5b09b5aaf5e5cdc1ab86b
Author: lum@openbsd.org <lum@openbsd.org>
Date:   Wed May 29 08:30:26 2019 +0000

    upstream: Make the standard output messages of both methods of
    
    changing a key pair's comments (using -c and -C) more applicable to both
    methods. ok and suggestions djm@ dtucker@
    
    OpenBSD-Commit-ID: b379338118109eb36e14a65bc0a12735205b3de6

commit 2b3402dc9f1d9b0df70291b424f36e436cdfa7e0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jun 8 00:03:07 2019 +1000

    Always clean up before and after utimensat test.

commit 182898192d4b720e4faeafd5b39c2cfb3b92aa21
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 7 23:47:37 2019 +1000

    Update utimensat test.
    
    POSIX specifies that when given a symlink, AT_SYMLINK_NOFOLLOW should
    update the symlink and not the destination.  The compat code doesn't
    have a way to do this, so where possible it fails instead of following a
    symlink when explicitly asked not to. Instead of checking for an explicit
    failure, check that it does not update the destination, which both the
    real and compat implmentations should honour.
    
    Inspired by github pull req #125 from chutzpah at gentoo.org.

commit d220b675205185e0b4d6b6524acc2e5c599ef0e2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 7 14:26:54 2019 +1000

    Have pthread_create return errno on failure.
    
    According to POSIX, pthread_create returns the failure reason in
    the non-zero function return code so make the fork wrapper do that.
    Matches previous change.

commit 1bd4f7f25f653e0cadb2e6f25d79bc3c35c6aa4d
Author: Elliott Hughes <enh@google.com>
Date:   Thu Apr 25 13:36:27 2019 -0700

    pthread_create(3) returns positive values on failure.
    
    Found by inspection after finding similar bugs in other code used by
    Android.

commit b3a77b25e5f7880222b179431a74fad76d2cf60c
Author: Harald Freudenberger <freude@linux.ibm.com>
Date:   Fri May 24 10:11:15 2019 +0200

    allow s390 specific ioctl for ecc hardware support
    
    Adding another s390 specific ioctl to be able to support ECC hardware
    acceleration to the sandbox seccomp filter rules.
    
    Now the ibmca openssl engine provides elliptic curve cryptography
    support with the help of libica and CCA crypto cards. This is done via
    jet another ioctl call to the zcrypt device driver and so there is a
    need to enable this on the openssl sandbox.
    
    Code is s390 specific and has been tested, verified and reviewed.
    
    Please note that I am also the originator of the previous changes in
    that area.  I posted these changes to Eduardo and he forwarded the
    patches to the openssl community.
    
    Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
    Reviewed-by: Joerg Schmidbauer <jschmidb@de.ibm.com>

commit 2459df9aa11820f8092a8651aeb381af7ebbccb1
Author: Sorin Adrian Savu <sorin25@users.noreply.github.com>
Date:   Sun May 26 21:50:08 2019 +0300

    openssl-devel is obsoleted by libssl-devel
    
    openssl-devel is no longer installable via the cygwin setup and
    it's hidden by default, so you can't see the replacement very easy.

commit 85ceb0e64bff672558fc87958cd548f135c83cdd
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon May 20 06:01:59 2019 +0000

    upstream: tweak previous;
    
    OpenBSD-Commit-ID: 42f39f22f53cfcb913bce401ae0f1bb93e08dd6c

commit 30615295609f5c57b3137b3021fe63bfa45c1985
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 20 00:25:55 2019 +0000

    upstream: embiggen format buffer size for certificate serial number so
    
    that it will fit a full 64 bit integer. bz#3012 from Manoel Domingues Junior
    
    OpenBSD-Commit-ID: a51f3013056d05b976e5af6b978dcb9e27bbc12b

commit 476e3551b2952ef73acc43d995e832539bf9bc4d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 20 00:20:35 2019 +0000

    upstream: When signing certificates with an RSA key, default to
    
    using the rsa-sha2-512 signature algorithm. Certificates signed by RSA keys
    will therefore be incompatible with OpenSSH < 7.2 unless the default is
    overridden.
    
    Document the ability of the ssh-keygen -t flag to override the
    signature algorithm when signing certificates, and the new default.
    
    ok deraadt@
    
    OpenBSD-Commit-ID: 400c9c15013978204c2cb80f294b03ae4cfc8b95

commit 606077ee1e77af5908431d003fb28461ef7be092
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 17 13:14:12 2019 +1000

    Add no-op implementation of pam_putenv.
    
    Some platforms such as HP-UX do not have pam_putenv.  Currently the
    calls are ifdef'ed out, but a new one was recently added.  Remove the
    ifdefs and add a no-op implementation.  bz#3008, ok djm.

commit 1ac98be8724c9789d770ddb8e7f0dbf1b55e05a0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 17 12:42:17 2019 +1000

    Use the correct macro for SSH_ALLOWED_CA_SIGALGS.

commit 97370f6c2c3b825f8c577b7e6c00b1a98d30a6cf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 17 10:54:51 2019 +1000

    Fix building w/out ECC.
    
    Ifdef out ECC specific code so that that it'll build against an OpenSSL
    configured w/out ECC.  With & ok djm@

commit 633703babf8d9a88da85f23b800e1b88dec7cdbd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 17 10:50:29 2019 +1000

    Conditionalize ECDH methods in CA algos.
    
    When building against an OpenSSL configured without ECC, don't include
    those algos in CASignatureAlgorithms.  ok djm@

commit 5c8d14c512f5d413095b22bdba08a6bb990f1e97
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu May 16 08:47:27 2019 +0000

    upstream: Move a variable declaration to the block where it's used
    
    to make things a little tidier for -portable.
    
    OpenBSD-Commit-ID: 616379861be95619e5358768b7dee4793e2f3a75

commit a1d29cc36a5e6eeabc935065a8780e1ba5b67014
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed May 15 04:43:31 2019 +0000

    upstream: When doing the fork+exec'ing for ssh-keysign, rearrange
    
    the socket into fd3, so as to not mistakenly leak other fd forward
    accidentally. ok djm
    
    OpenBSD-Commit-ID: 24cc753f5aa2c6a7d0fbf62766adbc75cd785296

commit db7606d4a62fee67b0cb2f32dfcbd7b3642bfef5
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Tue May 14 12:47:17 2019 +0000

    upstream: Delete some .Sx macros that were used in a wrong way.
    
    Part of a patch from Stephen Gregoratto <dev at sgregoratto dot me>.
    
    OpenBSD-Commit-ID: 15501ed13c595f135e7610b1a5d8345ccdb513b7

commit cb4accb1233865d9151f8a50cc5f0c61a3fd4077
Author: florian@openbsd.org <florian@openbsd.org>
Date:   Fri May 10 18:55:17 2019 +0000

    upstream: For PermitOpen violations add the remote host and port to
    
    be able to find out from where the request was comming.
    
    Add the same logging for PermitListen violations which where not
    logged at all.
    
    Pointed out by Robert Kisteleki (robert AT ripe.net)
    
    input markus
    OK deraadt
    
    OpenBSD-Commit-ID: 8a7d0f1b7175504c0d1dca8d9aca1588b66448c8

commit cd16aceec148d55088fc8df6be88335578d85258
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu May 16 07:53:20 2019 +1000

    Add OpenSSL 1.1.1 to the supported list.
    
    Clarify the language around prngd and egd.

commit 6fd4aa2aafbce90acb11a328ca0aa0696cb01c6b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed May 15 16:19:14 2019 +1000

    Fix typo in man page formatter selector.

commit 285546b73e2c172565c992a695927ac8cf3b4cc6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri May 10 15:04:42 2019 +1000

    Use "doc" man page format if mandoc present.
    
    Previously configure would not select the "doc" man page format if
    mandoc was present but nroff was not.  This checks for mandoc first
    and removes a now-superflous AC_PATH_PROG.  Based on a patch from
    vehk at vehk.de and feedback from schwarze at usta.de.

commit 62dd70613b77b229f53db3cc1c3e8a206fa2b582
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 3 06:06:30 2019 +0000

    upstream: Use the correct (according to POSIX) format for
    
    left-justification in snmprintf. bz#3002, patch from velemas at gmail.com, ok
    markus@.
    
    OpenBSD-Commit-ID: 65d252b799be0cc8f68b6c47cece0a57bb00fea7

commit 62be1ffe5ffc68cfaac183320503c00a8c72e0b1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 3 04:11:00 2019 +0000

    upstream: Free channel objects on exit path. Patch from markus at
    
    blueflash.cc, ok deraadt
    
    OpenBSD-Commit-ID: dbe4db381603909482211ffdd2b48abd72169117

commit 1c554a5d94b9de6bd5374e2992a5662746cc39ba
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 3 03:27:38 2019 +0000

    upstream: Free host on exit path. Patch from markus at
    
    blueflash.cc, ok djm@
    
    OpenBSD-Commit-ID: c54e9945d93c4ce28350d8b9fa8b71f744ef2b5a

commit 99043bd64e5e0f427173f4fa83ef25a4676624a3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 3 03:25:18 2019 +0000

    upstream: Wrap XMSS including in ifdef. Patch from markus at
    
    blueflash.cc, ok djm
    
    OpenBSD-Commit-ID: e3b34fc35cf12d33bde91ac03633210a3bc0f8b5

commit 8fcfb7789c43a19d24162a7a4055cd09ee951b34
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 26 08:37:17 2019 +0000

    upstream: Import regenerated moduli.
    
    OpenBSD-Commit-ID: db6375fc302e3bdf07d96430c63c991b2c2bd3ff

commit 3a7db919d5dd09f797971b3cf8ee301767459774
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Apr 23 11:56:41 2019 +0000

    upstream: Use the LogLevel typdef instead of int where appropriate. Patch from Markus Schmidt via openssh-unix-dev, ok markus@
    
    OpenBSD-Commit-ID: 4c0f0f458e3da7807806b35e3eb5c1e8403c968a

commit d7c6e38b87efab1f140745fd8b1106b82e6e4a68
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 19 05:47:44 2019 +0000

    upstream: Document new default RSA key size. From
    
    sebastiaanlokhorst at gmail.com via bz#2997.
    
    OpenBSD-Commit-ID: bdd62ff5d4d649d2147904e91bf7cefa82fe11e1

commit e826bbcafe26dac349a8593da5569e82faa45ab8
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Apr 18 18:56:16 2019 +0000

    upstream: When running sshd -T, assume any attibute not provided by
    
    -C does not match, which allows it to work when sshd_config contains a Match
    directive with or without -C.  bz#2858, ok djm@
    
    OpenBSD-Commit-ID: 1a701f0a33e3bc96753cfda2fe0b0378520b82eb

commit 5696512d7ad57e85e89f8011ce8dec617be686aa
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Apr 18 07:32:56 2019 +0000

    upstream: Remove crc32.{c,h} which were only used by the now-gone
    
    SSH1 protocol. Patch from yumkam at gmail.com, ok deraadt.
    
    OpenBSD-Commit-ID: cceda5876c5ba6b4d8abcd52335329198cee3240

commit 34e87fb5d9ce607f5701ab4c31d837ad8133e2d1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 30 12:27:57 2019 +1000

    Remove unused variables from RLIMIT_NOFILE test.

commit 35e82e62c1ef53cfa457473a4c4d957d6197371a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 26 18:38:27 2019 +1000

    Import regenerated moduli.

commit 5590f53f99219e95dc23b0ebd220f19a6f46b101
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 26 18:22:10 2019 +1000

    Whitespace resync w/OpenBSD.
    
    Patch from markus at blueflash.cc via openssh-unix-dev.

commit b7b8334914fb9397a6725f3b5d2de999b0bb69ac
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 26 18:06:34 2019 +1000

    Don't install duplicate STREAMS modules on Solaris
    
    Check if STREAMS modules are already installed on pty before installing
    since when compiling with XPG>=4 they will likely be installed already.
    Prevents hangs and duplicate lines on the terminal.  bz#2945 and bz#2998,
    patch from djm@

commit fd0fa130ecf06d7d092932adcd5d77f1549bfc8d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 18 08:52:57 2019 +1000

    makedepend

commit 5de397a876b587ba05a9169237deffdc71f273b0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 5 11:29:51 2019 -0700

    second thoughts: leave README in place
    
    A number of contrib/* files refer to the existing README so let's leave
    it in place for release and add the new markdown version in parallel.
    
    I'll get rid of README after release.

commit 5d3127d9274519b25ed10e320f45045ba8d7f3be
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 5 11:29:31 2019 -0700

    Revert "rewrite README"
    
    This reverts commit 9444d82678cb7781820da4d1c23b3c2b9fb1e12f.

commit 9444d82678cb7781820da4d1c23b3c2b9fb1e12f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 5 11:21:48 2019 -0700

    rewrite README
    
    Include basic build instructions and comments on commonly-used build-
    time flags, links to the manual pages and other resources.
    
    Now in Markdown format for better viewing on github, etc.

commit a924de0c4908902433813ba205bee1446bd1a157
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 5 03:41:52 2019 +1100

    update versions

commit 312dcee739bca5d6878c536537b2a8a497314b75
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 3 15:48:45 2019 +0000

    upstream: openssh-8.0
    
    OpenBSD-Commit-ID: 5aafdf218679dab982fea20771afd643be9a127b

commit 885bc114692046d55e2a170b932bdc0092fa3456
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 4 02:47:40 2019 +1100

    session: Do not use removed API
    
    from Jakub Jelen

commit 9d7b2882b0c9a5e9bf8312ce4075bf178e2b98be
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 29 11:31:40 2019 +0000

    upstream: when logging/fataling on error, include a bit more detail
    
    than just the function name and the error message
    
    OpenBSD-Commit-ID: dd72d7eba2215fcb89be516c378f633ea5bcca9f

commit 79a87d32783d6c9db40af8f35e091d9d30365ae7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Apr 3 06:27:45 2019 +1100

    Remove "struct ssh" from sys_auth_record_login.
    
    It's not needed, and is not available from the call site in loginrec.c
    Should only affect AIX, spotted by Kevin Brott.

commit 138c0d52cdc90f9895333b82fc57d81cce7a3d90
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 2 18:21:35 2019 +1100

    Adapt custom_failed_login to new prototype.
    
    Spotted by Kevin Brott.

commit a0ca4009ab2f0b1007ec8ab6864dbf9b760a8ed5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Apr 1 20:07:23 2019 +1100

    Add includes.h for compat layer.
    
    Should fix build on AIX 7.2.

commit 00991151786ce9b1d577bdad1f83a81d19c8236d
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Mar 31 22:14:22 2019 -0700

    Stop USL compilers for erroring with "integral constant expression expected"

commit 43f47ebbdd4037b569c23b8f4f7981f53b567f1d
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Mar 31 19:22:19 2019 -0700

    Only use O_NOFOLLOW in fchownat and fchmodat if defined

commit 342d6e51589b184c337cccfc4c788b60ff8b3765
Author: Jakub Jelen <jjelen@redhat.com>
Date:   Fri Mar 29 12:29:41 2019 +0100

    Adjust softhsm2 path on Fedora Linux for regress
    
    The SoftHSM lives in Fedora in /usr/lib64/pkcs11/libsofthsm2.so

commit f5abb05f8c7358dacdcb866fe2813f6d8efd5830
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 28 09:26:14 2019 +1100

    Only use O_NOFOLLOW in utimensat if defined.
    
    Fixes build on systems that don't have it (Solaris <=9)  Found by
    Tom G. Christensen.

commit 786cd4c1837fdc3fe7b4befe54a3f37db7df8715
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Wed Mar 27 18:18:21 2019 +0100

    drop old Cygwin considerations
    
    - Cygwin supports non-DOS characters in filenames
    - Cygwin does not support Windows XP anymore
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

commit 21da87f439b48a85b951ef1518fe85ac0273e719
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 27 09:29:14 2019 +0000

    upstream: fix interaction between ClientAliveInterval and RekeyLimit
    
    that could cause connection to close incorrectly; Report and patch from Jakub
    Jelen in bz#2757; ok dtucker@ markus@
    
    OpenBSD-Commit-ID: 17229a8a65bd8e6c2080318ec2b7a61e1aede3fb

commit 4f0019a9afdb4a94d83b75e82dbbbe0cbe826c56
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 25 22:34:52 2019 +0000

    upstream: Fix authentication failures when "AuthenticationMethods
    
    any" in a Match block overrides a more restrictive global default.
    
    Spotted by jmc@, ok markus@
    
    OpenBSD-Commit-ID: a90a4fe2ab81d0eeeb8fdfc21af81f7eabda6666

commit d6e5def308610f194c0ec3ef97a34a3e9630e190
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 25 22:33:44 2019 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: 106e853ae8a477e8385bc53824d3884a8159db07

commit 26e0cef07b04479537c971dec898741df1290fe5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 25 16:19:44 2019 +0000

    upstream: Expand comment to document rationale for default key
    
    sizes. "seems worthwhile" deraadt.
    
    OpenBSD-Commit-ID: 72e5c0983d7da1fb72f191870f36cb58263a2456

commit f47269ea67eb4ff87454bf0d2a03e55532786482
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 25 15:49:00 2019 +0000

    upstream: Increase the default RSA key size to 3072 bits. Based on
    
    the estimates from NIST Special Publication 800-57, 3k bits provides security
    equivalent to 128 bits which is the smallest symmetric cipher we enable by
    default. ok markus@ deraadt@
    
    OpenBSD-Commit-ID: 461dd32ebe808f88f4fc3ec74749b0e6bef2276b

commit 62949c5b37af28d8490d94866e314a76be683a5e
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Mar 22 20:58:34 2019 +0000

    upstream: full stop in the wrong place;
    
    OpenBSD-Commit-ID: 478a0567c83553a2aebf95d0f1bd67ac1b1253e4

commit 1b1332b5bb975d759a50b37f0e8bc8cfb07a0bb0
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Mar 16 19:14:21 2019 +0000

    upstream: benno helped me clean up the tcp forwarding section;
    
    OpenBSD-Commit-ID: d4bec27edefde636fb632b7f0b7c656b9c7b7f08

commit 2aee9a49f668092ac5c9d34e904ef7a9722e541d
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Mar 8 17:24:43 2019 +0000

    upstream: fix use-after-free in ssh-pkcs11; found by hshoexer w/AFL
    
    OpenBSD-Commit-ID: febce81cca72b71f70513fbee4ff52ca050f675c

commit 9edbd7821e6837e98e7e95546cede804dac96754
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 14 10:17:28 2019 +1100

    Fix build when configured --without-openssl.
    
    ok djm@

commit 825ab32f0d04a791e9d19d743c61ff8ed9b4d8e5
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 14 08:51:17 2019 +1100

    On Cygwin run sshd as SYSTEM where possible.
    
    Seteuid now creates user token using S4U.  We don't create a token
    from scratch anymore, so we don't need the "Create a process token"
    privilege.  The service can run under SYSTEM again...
    
    ...unless Cygwin is running on Windows Vista or Windows 7 in the
    WOW64 32 bit emulation layer.  It turns out that WOW64 on these systems
    didn't implement MsV1_0 S4U Logon so we still need the fallback
    to NtCreateToken for these systems.
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

commit a212107bfdf4d3e870ab7a443e4d906e5b9578c3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Mar 13 10:49:16 2019 +1100

    Replace alloca with xcalloc.
    
    The latter checks for memory exhaustion and integer overflow and may be
    at a less predictable place.  Sanity check by vinschen at redhat.com, ok
    djm@

commit daa7505aadca68ba1a2c70cbdfce423208eb91ee
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Mar 12 09:19:19 2019 +1100

    Use Cygwin-specific matching only for users+groups.
    
    Patch from vinschen at redhat.com, updated a little by me.

commit fd10cf027b56f9aaa80c9e3844626a05066589a4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Mar 6 22:14:23 2019 +0000

    upstream: Move checks for lists of users or groups into their own
    
    function. This is a no-op on OpenBSD but will make things easier in
    -portable, eg on systems where these checks should be case-insensitive.  ok
    djm@
    
    OpenBSD-Commit-ID: 8bc9c8d98670e23f8eaaaefe29c1f98e7ba0487e

commit ab5fee8eb6a011002fd9e32b1597f02aa8804a25
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Mar 6 21:06:59 2019 +0000

    upstream: Reset last-seen time when sending a keepalive. Prevents
    
    sending two keepalives successively and prematurely terminating connection
    when ClientAliveCount=1.  While there, collapse two similar tests into one.
    ok markus@
    
    OpenBSD-Commit-ID: 043670d201dfe222537a2a4bed16ce1087de5ddd

commit c13b74530f9f1d9df7aeae012004b31b2de4438e
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Tue Mar 5 16:17:12 2019 +0000

    upstream: PKCS#11 support is no longer limited to RSA; ok benno@
    
    kn@
    
    OpenBSD-Commit-ID: 1a9bec64d530aed5f434a960e7515a3e80cbc826

commit e9552d6043db7cd170ac6ba1b4d2c7a5eb2c3201
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 1 03:29:32 2019 +0000

    upstream: in ssh_set_newkeys(), mention the direction that we're
    
    keying in debug messages. Previously it would be difficult to tell which
    direction it was talking about
    
    OpenBSD-Commit-ID: c2b71bfcceb2a7389b9d0b497fb2122a406a522d

commit 76a24b3fa193a9ca3e47a8779d497cb06500798b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 1 02:32:39 2019 +0000

    upstream: Fix two race conditions in sshd relating to SIGHUP:
    
    1. Recently-forked child processes will briefly remain listening to
      listen_socks. If the main server sshd process completes its restart
      via execv() before these sockets are closed by the child processes
      then it can fail to listen at the desired addresses/ports and/or
      fail to restart.
    
    2. When a SIGHUP is received, there may be forked child processes that
      are awaiting their reexecution state. If the main server sshd
      process restarts before passing this state, these child processes
      will yield errors and use a fallback path of reading the current
      sshd_config from the filesystem rather than use the one that sshd
      was started with.
    
    To fix both of these cases, we reuse the startup_pipes that are shared
    between the main server sshd and forked children. Previously this was
    used solely to implement tracking of pre-auth child processes for
    MaxStartups, but this extends the messaging over these pipes to include
    a child->parent message that the parent process is safe to restart. This
    message is sent from the child after it has completed its preliminaries:
    closing listen_socks and receiving its reexec state.
    
    bz#2953, reported by Michal Koutný; ok markus@ dtucker@
    
    OpenBSD-Commit-ID: 7df09eacfa3ce13e9a7b1e9f17276ecc924d65ab

commit de817e9dfab99473017d28cdf69e60397d00ea21
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 1 02:16:47 2019 +0000

    upstream: mention PKCS11Provide=none, reword a little and remove
    
    mention of RSA keys only (since we support ECDSA now and might support others
    in the future). Inspired by Jakub Jelen via bz#2974
    
    OpenBSD-Commit-ID: a92e3686561bf624ccc64ab320c96c9e9a263aa5

commit 95a8058c1a90a27acbb91392ba206854abc85226
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 1 02:08:50 2019 +0000

    upstream: let PKCS11Provider=none do what users expect
    
    print PKCS11Provider instead of obsolete SmartcardDevice in config dump.
    
    bz#2974 ok dtucker@
    
    OpenBSD-Commit-ID: c303d6f0230a33aa2dd92dc9b68843d56a64f846

commit 8e7bac35aa576d2fd7560836da83733e864ce649
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Feb 27 19:37:01 2019 +0000

    upstream: dup stdout/in for proxycommand=-, otherwise stdout might
    
    be redirected to /dev/null; ok djm@
    
    OpenBSD-Commit-ID: 97dfce4c47ed4055042de8ebde85b7d88793e595

commit 9b61130fbd95d196bce81ebeca94a4cb7c0d5ba0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 23 08:20:43 2019 +0000

    upstream: openssh-7.9 accidentally reused the server's algorithm lists
    
    in the client for KEX, ciphers and MACs. The ciphers and MACs were identical
    between the client and server, but the error accidentially disabled the
    diffie-hellman-group-exchange-sha1 KEX method.
    
    This fixes the client code to use the correct method list, but
    because nobody complained, it also disables the
    diffie-hellman-group-exchange-sha1 KEX method.
    
    Reported by nuxi AT vault24.org via bz#2697; ok dtucker
    
    OpenBSD-Commit-ID: e30c33a23c10fd536fefa120e86af1842e33fd57

commit 37638c752041d591371900df820f070037878a2d
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Wed Feb 20 13:41:25 2019 +0100

    Cygwin: implement case-insensitive Unicode user and group name matching
    
    The previous revert enabled case-insensitive user names again.  This
    patch implements the case-insensitive user and group name matching.
    To allow Unicode chars, implement the matcher using wchar_t chars in
    Cygwin-specific code.  Keep the generic code changes as small as possible.
    Cygwin: implement case-insensitive Unicode user and group name matching
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

commit bed1d43698807a07bb4ddb93a46b0bd84b9970b3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 22 15:21:21 2019 +1100

    Revert unintended parts of previous commit.

commit f02afa350afac1b2f2d1413259a27a4ba1e2ca24
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Wed Feb 20 13:41:24 2019 +0100

    Revert "[auth.c] On Cygwin, refuse usernames that have differences in case"
    
    This reverts commit acc9b29486dfd649dfda474e5c1a03b317449f1c.
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

commit 4c55b674835478eb80a1a7aeae588aa654e2a433
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Sat Feb 16 14:13:43 2019 +0100

    Add tags to .gitignore
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

commit 625b62634c33eaef4b80d07529954fe5c6435fe5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 22 03:37:11 2019 +0000

    upstream: perform removal of agent-forwarding directory in forward
    
    setup error path with user's privileged. This is a no-op as this code always
    runs with user privilege now that we no longer support running sshd with
    privilege separation disabled, but as long as the privsep skeleton is there
    we should follow the rules.
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    bz#2969 with patch from Erik Sjölund
    
    OpenBSD-Commit-ID: 2b708401a5a8d6133c865d7698d9852210dca846

commit d9ecfaba0b2f1887d20e4368230632e709ca83be
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Feb 18 07:02:34 2019 +0000

    upstream: sync the description of ~/.ssh/config with djm's updated
    
    description in ssh.1; issue pointed out by andreas kahari
    
    ok dtucker djm
    
    OpenBSD-Commit-ID: 1b01ef0ae2c6328165150badae317ec92e52b01c

commit 38e83e4f219c752ebb1560633b73f06f0392018b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 12 23:53:10 2019 +0000

    upstream: fix regression in r1.302 reported by naddy@ - only the first
    
    public key from the agent was being attempted for use.
    
    OpenBSD-Commit-ID: 07116aea521a04888718b2157f1ca723b2f46c8d

commit 5c68ea8da790d711e6dd5f4c30d089c54032c59a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 11 09:44:42 2019 +0000

    upstream: cleanup GSSAPI authentication context after completion of the
    
    authmethod. Move function-static GSSAPI state to the client Authctxt
    structure. Make static a bunch of functions that aren't used outside this
    file.
    
    Based on patch from Markus Schmidt <markus@blueflash.cc>; ok markus@
    
    OpenBSD-Commit-ID: 497fb792c0ddb4f1ba631b6eed526861f115dbe5

commit a8c807f1956f81a92a758d3d0237d0ff06d0be5d
Author: benno@openbsd.org <benno@openbsd.org>
Date:   Sun Feb 10 16:35:41 2019 +0000

    upstream: ssh-keygen -D pkcs11.so needs to initialize pkcs11
    
    interactive, so it can ask for the smartcards PIN. ok markus@
    
    OpenBSD-Commit-ID: 1be7ccf88f1876e0fc4d7c9b3f96019ac5655bab

commit 3d896c157c722bc47adca51a58dca859225b5874
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Feb 10 11:15:52 2019 +0000

    upstream: when checking that filenames sent by the server side
    
    match what the client requested, be prepared to handle shell-style brace
    alternations, e.g. "{foo,bar}".
    
    "looks good to me" millert@ + in snaps for the last week courtesy
    deraadt@
    
    OpenBSD-Commit-ID: 3b1ce7639b0b25b2248e3a30f561a548f6815f3e

commit 318e4f8548a4f5c0c913f61e27d4fc21ffb1eaae
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Feb 10 11:10:57 2019 +0000

    upstream: syslog when connection is dropped for attempting to run a
    
    command when ForceCommand=internal-sftp is in effect; bz2960; ok dtucker@
    
    OpenBSD-Commit-ID: 8c87fa66d7fc6c0fffa3a3c28e8ab5e8dde234b8

commit 2ff2e19653b8c0798b8b8eff209651bdb1be2761
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 8 14:53:35 2019 +1100

    don't set $MAIL if UsePam=yes
    
    PAM typically specifies the user environment if it's enabled, so don't
    second guess. bz#2937; ok dtucker@

commit 03e92dd27d491fe6d1a54e7b2f44ef1b0a916e52
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 8 14:50:36 2019 +1100

    use same close logic for stderr as stdout
    
    Avoids sending SIGPIPE to child processes after their parent exits
    if they attempt to write to stderr.
    
    Analysis and patch from JD Paul; patch reworked by Jakub Jelen and
    myself. bz#2071; ok dtucker@

commit 8c53d409baeeaf652c0c125a9b164edc9dbeb6de
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Feb 5 11:35:56 2019 +0000

    upstream: Adapt code in the non-USE_PIPES codepath to the new packet
    
    API. This code is not normally reachable since USE_PIPES is always defined.
    bz#2961, patch from adrian.fita at gmail com.
    
    OpenBSD-Commit-ID: 8d8428d678d1d5eb4bb21921df34e8173e6d238a

commit 7a7fdca78de4b4774950be056099e579ef595414
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 4 23:37:54 2019 +0000

    upstream: fix NULL-deref crash in PKCS#11 code when attempting
    
    login to a token requiring a PIN; reported by benno@ fix mostly by markus@
    
    OpenBSD-Commit-ID: 438d0b114b1b4ba25a9869733db1921209aa9a31

commit cac302a4b42a988e54d32eb254b29b79b648dbf5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 4 02:39:42 2019 +0000

    upstream: Remove obsolete "Protocol" from commented out examples. Patch
    
    from samy.mahmoudi at gmail com.
    
    OpenBSD-Commit-ID: 16aede33dae299725a03abdac5dcb4d73f5d0cbf

commit 483b3b638500fd498b4b529356e5a0e18cf76891
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 1 03:52:23 2019 +0000

    upstream: Save connection timeout and restore for 2nd and
    
    subsequent attempts, preventing them from having no timeout.  bz#2918, ok
    djm@
    
    OpenBSD-Commit-ID: 4977f1d0521d9b6bba0c9a20d3d226cefac48292

commit 5f004620fdc1b2108139300ee12f4014530fb559
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jan 30 19:51:15 2019 +0000

    upstream: Add authors for public domain sntrup4591761 code;
    
    confirmed by Daniel J. Bernstein
    
    OpenBSD-Commit-ID: b4621f22b8b8ef13e063c852af5e54dbbfa413c1

commit 2c21b75a7be6ebdcbceaebb43157c48dbb36f3d8
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sun Jan 27 07:14:11 2019 +0000

    upstream: add -T to usage();
    
    OpenBSD-Commit-ID: a7ae14d9436c64e1bd05022329187ea3a0ce1899

commit 19a0f0529d3df04118da829528cac7ceff380b24
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jan 28 03:50:39 2019 +0000

    upstream: The test sshd_config in in $OBJ.
    
    OpenBSD-Regress-ID: 1e5d908a286d8e7de3a15a0020c8857f3a7c9172

commit 8fe25440206319d15b52d12b948a5dfdec14dca3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jan 28 03:28:10 2019 +0000

    upstream: Remove leftover debugging.
    
    OpenBSD-Regress-ID: 3d86c3d4867e46b35af3fd2ac8c96df0ffdcfeb9

commit e30d32364d12c351eec9e14be6c61116f9d6cc90
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jan 28 00:12:36 2019 +0000

    upstream: Enable ssh-dss for the agent test. Disable it for the
    
    certificate test.
    
    OpenBSD-Regress-ID: 388c1e03e1def539d350f139b37d69f12334668d

commit ffdde469ed56249f5dc8af98da468dde35531398
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jan 28 00:08:26 2019 +0000

    upstream: Count the number of key types instead of assuming there
    
    are only two.
    
    OpenBSD-Regress-ID: 0998702c41235782cf0beee396ec49b5056eaed9

commit 1d05b4adcba08ab068466e5c08dee2f5417ec53a
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Sat Jan 26 23:42:40 2019 +0100

    Cygwin: only tweak sshd_config file if it's new, drop creating sshd user
    
    The sshd_config tweaks were executed even if the old file was
    still in place.  Fix that.  Also disable sshd user creation.
    It's not used on Cygwin.

commit 89843de0c4c733501f6b4f988098e6e06963df37
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Sat Jan 26 23:03:12 2019 +0100

    Cygwin: Change service name to cygsshd
    
    Microsoft hijacked the sshd service name without asking.

commit 2a9b3a2ce411d16cda9c79ab713c55f65b0ec257
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jan 27 06:30:53 2019 +0000

    upstream: Generate all key supported key types and enable for keyscan
    
    test.
    
    OpenBSD-Regress-ID: 72f72ff49946c61bc949e1692dd9e3d71370891b

commit 391ffc4b9d31fa1f4ad566499fef9176ff8a07dc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 26 22:41:28 2019 +0000

    upstream: check in scp client that filenames sent during
    
    remote->local directory copies satisfy the wildcard specified by the user.
    
    This checking provides some protection against a malicious server
    sending unexpected filenames, but it comes at a risk of rejecting wanted
    files due to differences between client and server wildcard expansion rules.
    
    For this reason, this also adds a new -T flag to disable the check.
    
    reported by Harry Sintonen
    fix approach suggested by markus@;
    has been in snaps for ~1wk courtesy deraadt@
    
    OpenBSD-Commit-ID: 00f44b50d2be8e321973f3c6d014260f8f7a8eda

commit c2c18a39683db382a15b438632afab3f551d50ce
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 26 22:35:01 2019 +0000

    upstream: make ssh-keyscan return a non-zero exit status if it
    
    finds no keys. bz#2903
    
    OpenBSD-Commit-ID: 89f1081fb81d950ebb48e6e73d21807b2723d488

commit 05b9a466700b44d49492edc2aa415fc2e8913dfe
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 24 17:00:29 2019 +0000

    upstream: Accept the host key fingerprint as a synonym for "yes"
    
    when accepting an unknown host key.  This allows you to paste a fingerprint
    obtained out of band into the yes/no prompt and have the client do the
    comparison for you.  ok markus@ djm@
    
    OpenBSD-Commit-ID: 3c47d10b9f43d3d345e044fd9ec09709583a2767

commit bdc6c63c80b55bcbaa66b5fde31c1cb1d09a41eb
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 24 16:52:17 2019 +0000

    upstream: Have progressmeter force an update at the beginning and
    
    end of each transfer.  Fixes the problem recently introduces where very quick
    transfers do not display the progressmeter at all.  Spotted by naddy@
    
    OpenBSD-Commit-ID: 68dc46c259e8fdd4f5db3ec2a130f8e4590a7a9a

commit 258e6ca003e47f944688ad8b8de087b58a7d966c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 24 02:42:23 2019 +0000

    upstream: Check for both EAGAIN and EWOULDBLOCK. This is a no-op
    
    in OpenBSD (they are the same value) but makes things easier in -portable
    where they may be distinct values.  "sigh ok" deraadt@
    
    (ID sync only, portable already had this change).
    
    OpenBSD-Commit-ID: 91f2bc7c0ecec905915ed59fa37feb9cc90e17d7

commit 281ce042579b834cdc1e74314f1fb2eeb75d2612
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jan 24 02:34:52 2019 +0000

    upstream: Always initialize 2nd arg to hpdelim2. It populates that
    
    *ONLY IF* there's a delimiter.  If there's not (the common case) it checked
    uninitialized memory, which usually passed, but if not would cause spurious
    failures when the uninitialized memory happens to contain "/".  ok deraadt.
    
    OpenBSD-Commit-ID: 4291611eaf2a53d4c92f4a57c7f267c9f944e0d3

commit d05ea255678d9402beda4416cd0360f3e5dfe938
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jan 23 21:50:56 2019 +0000

    upstream: Remove support for obsolete host/port syntax.
    
    host/port was added in 2001 as an alternative to host:port syntax for
    the benefit of IPv6 users.  These days there are establised standards
    for this like [::1]:22 and the slash syntax is easily mistaken for CIDR
    notation, which OpenSSH now supports for some things.  Remove the slash
    notation from ListenAddress and PermitOpen.  bz#2335, patch from jjelen
    at redhat.com, ok markus@
    
    OpenBSD-Commit-ID: fae5f4e23c51a368d6b2d98376069ac2b10ad4b7

commit 177d6c80c557a5e060cd343a0c116a2f1a7f43db
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jan 23 20:48:52 2019 +0000

    upstream: Remove duplicate word. bz#2958, patch from jjelen at
    
    redhat.com
    
    OpenBSD-Commit-ID: cca3965a8333f2b6aae48b79ec1d72f7a830dd2c

commit be3e6cba95dffe5fcf190c713525b48c837e7875
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jan 23 09:49:00 2019 +0000

    upstream: Remove 3 as a guess for possible generator during moduli
    
    generation. It's not mentioned in RFC4419 and it's not possible for
    Sophie-Germain primes greater than 5.  bz#2330, from Christian Wittenhorst ,
    ok djm@ tb@
    
    OpenBSD-Commit-ID: 1467652e6802ad3333b0959282d8d49dfe22c8cd

commit 8976f1c4b2721c26e878151f52bdf346dfe2d54c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jan 23 08:01:46 2019 +0000

    upstream: Sanitize scp filenames via snmprintf. To do this we move
    
    the progressmeter formatting outside of signal handler context and have the
    atomicio callback called for EINTR too.  bz#2434 with contributions from djm
    and jjelen at redhat.com, ok djm@
    
    OpenBSD-Commit-ID: 1af61c1f70e4f3bd8ab140b9f1fa699481db57d8

commit 6249451f381755f792c6b9e2c2f80cdc699c14e2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 24 10:00:20 2019 +1100

    For broken read/readv comparisons, poll(RW).
    
    In the cases where we can't compare to read or readv function pointers
    for some reason we currently ifdef out the poll() used to block while
    waiting for reads or writes, falling back to busy waiting.  This restores
    the poll() in this case, but has it always check for read or write,
    removing an inline ifdef in the process.

commit 5cb503dff4db251520e8bf7d23b9c97c06eee031
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 24 09:55:16 2019 +1100

    Include unistd.h for strmode().

commit f236ca2741f29b5c443c0b2db3aa9afb9ad9befe
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jan 24 09:50:58 2019 +1100

    Also undef SIMPLEQ_FOREACH_SAFE.
    
    Prevents macro redefinition warning on at least NetBSD 6.1.

commit be063945e4e7d46b1734d973bf244c350fae172a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 23 04:51:02 2019 +0000

    upstream: allow auto-incrementing certificate serial number for certs
    
    signed in a single commandline.
    
    OpenBSD-Commit-ID: 39881087641efb8cd83c7ec13b9c98280633f45b

commit 851f80328931975fe68f71af363c4537cb896da2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 23 04:16:22 2019 +0000

    upstream: move a bunch of global flag variables to main(); make the
    
    rest static
    
    OpenBSD-Commit-ID: fa431d92584e81fe99f95882f4c56b43fe3242dc

commit 2265402dc7d701a9aca9f8a7b7b0fd45b65c479f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 23 13:03:16 2019 +1100

    depend

commit 2c223878e53cc46def760add459f5f7c4fb43e35
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 23 02:01:10 2019 +0000

    upstream: switch mainloop from select(2) to poll(2); ok deraadt@
    
    OpenBSD-Commit-ID: 37645419a330037d297f6f0adc3b3663e7ae7b2e

commit bb956eaa94757ad058ff43631c3a7d6c94d38c2f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 23 00:30:41 2019 +0000

    upstream: pass most arguments to the KEX hash functions as sshbuf
    
    rather than pointer+length; ok markus@
    
    OpenBSD-Commit-ID: ef0c89c52ccc89817a13a5205725148a28492bf7

commit d691588b8e29622c66abf8932362b522cf7f4051
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 22 22:58:50 2019 +0000

    upstream: backoff reading messages from active connections when the
    
    input buffer is too full to read one, or if the output buffer is too full to
    enqueue a response; feedback & ok dtucker@
    
    OpenBSD-Commit-ID: df3c5b6d57c968975875de40d8955cbfed05a6c8

commit f99ef8de967949a1fc25a5c28263ea32736e5943
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 22 20:48:01 2019 +0000

    upstream: add -m to usage(); reminded by jmc@
    
    OpenBSD-Commit-ID: bca476a5236e8f94210290b3e6a507af0434613e

commit 41923ce06ac149453debe472238e0cca7d5a2e5f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 22 12:03:58 2019 +0000

    upstream: Correct some bugs in PKCS#11 token PIN handling at
    
    initial login, the attempt at reading the PIN could be skipped in some cases
    especially on devices with integrated PIN readers.
    
    based on patch from Daniel Kucera in bz#2652; ok markus@
    
    OpenBSD-Commit-ID: fad70a61c60610afe8bb0db538c90e343e75e58e

commit 2162171ad517501ba511fa9f8191945d01857bb4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 22 12:00:50 2019 +0000

    upstream: Support keys that set the CKA_ALWAYS_AUTHENTICATE by
    
    requring a fresh login after the C_SignInit operation.
    
    based on patch from Jakub Jelen in bz#2638; ok markus
    
    OpenBSD-Commit-ID: a76e66996ba7c0923b46b74d46d499b811786661

commit 7a2cb18a215b2cb335da3dc99489c52a91f4925b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 22 11:51:25 2019 +0000

    upstream: Mention that configuration for the destination host is
    
    not applied to any ProxyJump/-J hosts. This has confused a few people...
    
    OpenBSD-Commit-ID: 03f4f641df6ca236c1bfc69836a256b873db868b

commit ecd2f33cb772db4fa76776543599f1c1ab6f9fa0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 22 11:40:42 2019 +0000

    upstream: Include -m in the synopsis for a few more commands that
    
    support it
    
    Be more explicit in the description of -m about where it may be used
    
    Prompted by Jakub Jelen in bz2904
    
    OpenBSD-Commit-ID: 3b398ac5e05d8a6356710d0ff114536c9d71046c

commit ff5d2cf4ca373bb4002eef395ed2cbe2ff0826c1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 22 11:26:16 2019 +0000

    upstream: print the full pubkey being attempted at loglevel >=
    
    debug2; bz2939
    
    OpenBSD-Commit-ID: ac0fe5ca1429ebf4d460bad602adc96de0d7e290

commit 180b520e2bab33b566b4b0cbac7d5f9940935011
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 22 11:19:42 2019 +0000

    upstream: clarify: ssh-keygen -e only writes public keys, never
    
    private
    
    OpenBSD-Commit-ID: 7de7ff6d274d82febf9feb641e2415ffd6a30bfb

commit c45616a199c322ca674315de88e788f1d2596e26
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 22 11:00:15 2019 +0000

    upstream: mention the new vs. old key formats in the introduction
    
    and give some hints on how keys may be converted or written in the old
    format.
    
    OpenBSD-Commit-ID: 9c90a9f92eddc249e07fad1204d0e15c8aa13823

commit fd8eb1383a34c986a00ef13d745ae9bd3ea21760
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Jan 22 06:58:31 2019 +0000

    upstream: tweak previous;
    
    OpenBSD-Commit-ID: d2a80e389da8e7ed71978643d8cbaa8605b597a8

commit 68e924d5473c00057f8532af57741d258c478223
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Mon Jan 21 23:55:12 2019 +0000

    upstream: Forgot to add -J to the synopsis.
    
    OpenBSD-Commit-ID: 26d95e409a0b72526526fc56ca1caca5cc3d3c5e

commit 622dedf1a884f2927a9121e672bd9955e12ba108
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Mon Jan 21 22:50:42 2019 +0000

    upstream: Add a -J option as a shortcut for -o Proxyjump= to scp(1)
    
    and sftp(1) to match ssh(1)'s interface.
    
    ok djm
    
    OpenBSD-Commit-ID: a75bc2d5f329caa7229a7e9fe346c4f41c2663fc

commit c882d74652800150d538e22c80dd2bd3cdd5fae2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Jan 22 20:38:40 2019 +1100

    Allow building against OpenSSL dev (3.x) version.

commit d5520393572eb24aa0e001a1c61f49b104396e45
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 10:50:40 2019 +1100

    typo

commit 2de9cec54230998ab10161576f77860a2559ccb7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 10:49:52 2019 +1100

    add missing header

commit 533cfb01e49a2a30354e191669dc3159e03e99a7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 22:18:24 2019 +0000

    upstream: switch sntrup implementation source from supercop to
    
    libpqcrypto; the latter is almost identical but doesn't rely on signed
    underflow to implement an optimised integer sort; from markus@
    
    OpenBSD-Commit-ID: cd09bbf0e0fcef1bedca69fdf7990dc360567cf8

commit d50ab3cd6fb859888a26b4d4e333239b4f6bf573
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 00:02:23 2019 +1100

    new files need includes.h

commit c7670b091a7174760d619ef6738b4f26b2093301
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 12:53:35 2019 +0000

    upstream: add "-v" flags to ssh-add and ssh-pkcs11-helper to turn up
    
    debug verbosity.
    
    Make ssh-agent turn on ssh-pkcs11-helper's verbosity when it is run
    in debug mode ("ssh-agent -d"), so we get to see errors from the
    PKCS#11 code.
    
    ok markus@
    
    OpenBSD-Commit-ID: 0a798643c6a92a508df6bd121253ba1c8bee659d

commit 49d8c8e214d39acf752903566b105d06c565442a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 12:50:12 2019 +0000

    upstream: adapt to changes in KEX APIs and file removals
    
    OpenBSD-Regress-ID: 54d6857e7c58999c7a6d40942ab0fed3529f43ca

commit 35ecc53a83f8e8baab2e37549addfd05c73c30f1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 12:35:20 2019 +0000

    upstream: adapt to changes in KEX API and file removals
    
    OpenBSD-Regress-ID: 92cad022d3b0d11e08f3e0055d6a14b8f994c0d7

commit 7d69aae64c35868cc4f644583ab973113a79480e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 12:29:35 2019 +0000

    upstream: adapt to bignum1 API removal and bignum2 API change
    
    OpenBSD-Regress-ID: cea6ff270f3d560de86b355a87a2c95b55a5ca63

commit beab553f0a9578ef9bffe28b2c779725e77b39ec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 09:13:41 2019 +0000

    upstream: remove hack to use non-system libcrypto
    
    OpenBSD-Regress-ID: ce72487327eee4dfae1ab0212a1f33871fe0809f

commit 4dc06bd57996f1a46b4c3bababe0d09bc89098f7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 21 23:14:04 2019 +1100

    depend

commit 70edd73edc4df54e5eee50cd27c25427b34612f8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 12:08:13 2019 +0000

    upstream: fix reversed arguments to kex_load_hostkey(); manifested as
    
    errors in cert-hostkey.sh regress failures.
    
    OpenBSD-Commit-ID: 12dab63850b844f84d5a67e86d9e21a42fba93ba

commit f1185abbf0c9108e639297addc77f8757ee00eb3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 11:22:00 2019 +0000

    upstream: forgot to cvs add this file in previous series of commits;
    
    grrr
    
    OpenBSD-Commit-ID: bcff316c3e7da8fd15333e05d244442c3aaa66b0

commit 7bef390b625bdc080f0fd4499ef03cef60fca4fa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 10:44:21 2019 +0000

    upstream: nothing shall escape this purge
    
    OpenBSD-Commit-ID: 4795b0ff142b45448f7e15f3c2f77a947191b217

commit aaca72d6f1279b842066e07bff797019efeb2c23
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 10:40:11 2019 +0000

    upstream: rename kex->kem_client_pub -> kex->client_pub now that
    
    KEM has been renamed to kexgen
    
    from markus@ ok djm@
    
    OpenBSD-Commit-ID: fac6da5dc63530ad0da537db022a9a4cfbe8bed8

commit 70867e1ca2eb08bbd494fe9c568df4fd3b35b867
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 10:38:54 2019 +0000

    upstream: merge kexkem[cs] into kexgen
    
    from markus@ ok djm@
    
    OpenBSD-Commit-ID: 87d886b7f1812ff9355fda1435f6ea9b71a0ac89

commit 71e67fff946396caa110a7964da23480757258ff
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 10:35:09 2019 +0000

    upstream: pass values used in KEX hash computation as sshbuf
    
    rather than pointer+len
    
    suggested by me; implemented by markus@ ok me
    
    OpenBSD-Commit-ID: 994f33c464f4a9e0f1d21909fa3e379f5a0910f0

commit 4b83e2a2cc0c12e671a77eaba1c1245894f4e884
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 10:33:49 2019 +0000

    upstream: remove kex_derive_keys_bn wrapper; no unused since the
    
    DH-like KEX methods have moved to KEM
    
    from markus@ ok djm@
    
    OpenBSD-Commit-ID: bde9809103832f349545e4f5bb733d316db9a060

commit 92dda34e373832f34a1944e5d9ebbebb184dedc1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 10:29:56 2019 +0000

    upstream: use KEM API for vanilla ECDH
    
    from markus@ ok djm@
    
    OpenBSD-Commit-ID: 6fbff96339a929835536b5730585d1d6057a352c

commit b72357217cbe510a3ae155307a7be6b9181f1d1b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 21 23:11:21 2019 +1100

    fixup missing ssherr.h

commit 9c9c97e14fe190931f341876ad98213e1e1dc19f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 10:28:01 2019 +0000

    upstream: use KEM API for vanilla DH KEX
    
    from markus@ ok djm@
    
    OpenBSD-Commit-ID: af56466426b08a8be275412ae2743319e3d277c9

commit 2f6a9ddbbf6ca8623c53c323ff17fb6d68d66970
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 10:24:09 2019 +0000

    upstream: use KEM API for vanilla c25519 KEX
    
    OpenBSD-Commit-ID: 38d937b85ff770886379dd66a8f32ab0c1c35c1f

commit dfd591618cdf2c96727ac0eb65f89cf54af0d97e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 10:20:12 2019 +0000

    upstream: Add support for a PQC KEX/KEM:
    
    sntrup4591761x25519-sha512@tinyssh.org using the Streamlined NTRU Prime
    4591^761 implementation from SUPERCOP coupled with X25519 as a stop-loss. Not
    enabled by default.
    
    introduce KEM API; a simplified framework for DH-ish KEX methods.
    
    from markus@ feedback & ok djm@
    
    OpenBSD-Commit-ID: d687f76cffd3561dd73eb302d17a1c3bf321d1a7

commit b1b2ff4ed559051d1035419f8f236275fa66d5d6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 10:07:22 2019 +0000

    upstream: factor out kex_verify_hostkey() - again, duplicated
    
    almost exactly across client and server for several KEX methods.
    
    from markus@ ok djm@
    
    OpenBSD-Commit-ID: 4e4a16d949dadde002a0aacf6d280a684e20829c

commit bb39bafb6dc520cc097780f4611a52da7f19c3e2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 10:05:09 2019 +0000

    upstream: factor out kex_load_hostkey() - this is duplicated in
    
    both the client and server implementations for most KEX methods.
    
    from markus@ ok djm@
    
    OpenBSD-Commit-ID: 8232fa7c21fbfbcaf838313b0c166dc6c8762f3c

commit dec5e9d33891e3bc3f1395d7db0e56fdc7f86dfc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 10:03:37 2019 +0000

    upstream: factor out kex_dh_compute_key() - it's shared between
    
    plain DH KEX and DH GEX in both the client and server implementations
    
    from markus@ ok djm@
    
    OpenBSD-Commit-ID: 12186e18791fffcd4642c82e7e0cfdd7ea37e2ec

commit e93bd98eab79b9a78f64ee8dd4dffc4d3979c7ae
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 10:00:23 2019 +0000

    upstream: factor out DH keygen; it's identical between the client
    
    and the server
    
    from markus@ ok djm@
    
    OpenBSD-Commit-ID: 2be57f6a0d44f1ab2c8de2b1b5d6f530c387fae9

commit 5ae3f6d314465026d028af82609c1d49ad197655
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 09:55:52 2019 +0000

    upstream: save the derived session id in kex_derive_keys() rather
    
    than making each kex method implementation do it.
    
    from markus@ ok djm@
    
    OpenBSD-Commit-ID: d61ade9c8d1e13f665f8663c552abff8c8a30673

commit 7be8572b32a15d5c3dba897f252e2e04e991c307
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 09:54:11 2019 +0000

    upstream: Make sshpkt_get_bignum2() allocate the bignum it is
    
    parsing rather than make the caller do it. Saves a lot of boilerplate code.
    
    from markus@ ok djm@
    
    OpenBSD-Commit-ID: 576bf784f9a240f5a1401f7005364e59aed3bce9

commit 803178bd5da7e72be94ba5b4c4c196d4b542da4d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 09:52:25 2019 +0000

    upstream: remove obsolete (SSH v.1) sshbuf_get/put_bignum1
    
    functions
    
    from markus@ ok djm@
    
    OpenBSD-Commit-ID: 0380b1b2d9de063de3c5a097481a622e6a04943e

commit f3ebaffd8714be31d4345f90af64992de4b3bba2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 09:49:37 2019 +0000

    upstream: fix all-zero check in kexc25519_shared_key
    
    from markus@ ok djm@
    
    OpenBSD-Commit-ID: 60b1d364e0d9d34d1d1ef1620cb92e36cf06712d

commit 9d1a9771d0ad3a83af733bf3d2650b53f43c269f
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Jan 21 07:09:10 2019 +0000

    upstream: - -T was added to the first synopsis by mistake - since
    
    "..." denotes optional, no need to surround it in []
    
    ok djm
    
    OpenBSD-Commit-ID: 918f6d8eed4e0d8d9ef5eadae1b8983d796f0e25

commit 2f0bad2bf85391dbb41315ab55032ec522660617
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jan 21 21:28:27 2019 +1100

    Make --with-rpath take a flag instead of yes/no.
    
    Linkers need various flags for -rpath and similar, so make --with-rpath
    take an optional flag argument which is passed to the linker.  ok djm@

commit 23490a6c970ea1d03581a3b4208f2eb7a675f453
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 21 15:05:43 2019 +1100

    fix previous test

commit b6dd3277f2c49f9584a2097bc792e8f480397e87
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jan 21 13:50:17 2019 +1100

    Wrap ECC static globals in EC_KEY_METHOD_NEW too.

commit b2eb9db35b7191613f2f4b934d57b25938bb34b3
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 21 12:53:40 2019 +1100

    pass TEST_SSH_SSHPKCS11HELPER to regress tests

commit ba58a529f45b3dae2db68607d8c54ae96e90e705
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 21 12:31:29 2019 +1100

    make agent-pkcs11 search harder for softhsm2.so

commit 662be40c62339ab645113c930ce689466f028938
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 02:05:38 2019 +0000

    upstream: always print the caller's error message in ossl_error(),
    
    even when there are no libcrypto errors to report.
    
    OpenBSD-Commit-ID: 09ebaa8f706e0eccedd209775baa1eee2ada806a

commit ce46c3a077dfb4c531ccffcfff03f37775725b75
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 02:01:03 2019 +0000

    upstream: get the ex_data (pkcs11_key object) back from the keys at
    
    the index at which it was inserted, rather than assuming index 0
    
    OpenBSD-Commit-ID: 1f3a6ce0346c8014e895e50423bef16401510aa8

commit 0a5f2ea35626022299ece3c8817a1abe8cf37b3e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 01:05:00 2019 +0000

    upstream: GSSAPI code got missed when converting to new packet API
    
    OpenBSD-Commit-ID: 37e4f06ab4a0f4214430ff462ba91acba28b7851

commit 2efcf812b4c1555ca3aff744820a3b3bccd68298
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 21 11:57:21 2019 +1100

    Fix -Wunused when compiling PKCS#11 without ECDSA

commit 3c0c657ed7cd335fc05c0852d88232ca7e92a5d9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 23:26:44 2019 +0000

    upstream: allow override of ssh-pkcs11-helper binary via
    
    $TEST_SSH_SSHPKCS11HELPER from markus@
    
    OpenBSD-Regress-ID: 7382a3d76746f5a792d106912a5819fd5e49e469

commit 760ae37b4505453c6fa4faf1aa39a8671ab053af
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 23:25:25 2019 +0000

    upstream: adapt agent-pkcs11.sh test to softhsm2 and add support
    
    for ECDSA keys
    
    work by markus@, ok djm@
    
    OpenBSD-Regress-ID: 1ebc2be0e88eff1b6d8be2f9c00cdc60723509fe

commit b2ce8b31a1f974a13e6d12e0a0c132b50bc45115
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 23:24:19 2019 +0000

    upstream: add "extra:" target to run some extra tests that are not
    
    enabled by default (currently includes agent-pkcs11.sh); from markus@
    
    OpenBSD-Regress-ID: 9a969e1adcd117fea174d368dcb9c61eb50a2a3c

commit 632976418d60b7193597bbc6ac7ca33981a41aab
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 21 00:47:34 2019 +0000

    upstream: use ECDSA_SIG_set0() instead of poking signature values into
    
    structure directly; the latter works on LibreSSL but not on OpenSSL. From
    portable.
    
    OpenBSD-Commit-ID: 5b22a1919d9cee907d3f8a029167f70a481891c6

commit 5de6ac2bad11175135d9b819b3546db0ca0b4878
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 21 11:44:19 2019 +1100

    remove HAVE_DLOPEN that snuck in
    
    portable doesn't use this

commit e2cb445d786f7572da2af93e3433308eaed1093a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 21 11:32:28 2019 +1100

    conditionalise ECDSA PKCS#11 support
    
    Require EC_KEY_METHOD support in libcrypto, evidenced by presence
    of EC_KEY_METHOD_new() function.

commit fcb1b0937182d0137a3c357c89735d0dc5869d54
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 23:12:35 2019 +0000

    upstream: we use singleton pkcs#11 RSA_METHOD and EC_KEY_METHOD
    
    now, so there is no need to keep a copy of each in the pkcs11_key object.
    
    work by markus@, ok djm@
    
    OpenBSD-Commit-ID: 43b4856516e45c0595f17a8e95b2daee05f12faa

commit 6529409e85890cd6df7e5e81d04e393b1d2e4b0b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 23:11:11 2019 +0000

    upstream: KNF previous; from markus@
    
    OpenBSD-Commit-ID: 3dfe35e25b310c3968b1e4e53a0cb1d03bda5395

commit 58622a8c82f4e2aad630580543f51ba537c1f39e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 23:10:33 2019 +0000

    upstream: use OpenSSL's RSA reference counting hooks to
    
    implicitly clean up pkcs11_key objects when their owning RSA object's
    reference count drops to zero. Simplifies the cleanup path and makes it more
    like ECDSA's
    
    work by markus@, ok djm@
    
    OpenBSD-Commit-ID: 74b9c98f405cd78f7148e9e4a4982336cd3df25c

commit f118542fc82a3b3ab0360955b33bc5a271ea709f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 23:08:24 2019 +0000

    upstream: make the PKCS#11 RSA code more like the new PKCS#11
    
    ECDSA code: use a single custom RSA_METHOD instead of a method per key
    
    suggested by me, but markus@ did all the work.
    ok djm@
    
    OpenBSD-Commit-ID: 8aafcebe923dc742fc5537a995cee549d07e4b2e

commit 445cfce49dfc904c6b8ab25afa2f43130296c1a5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 23:05:52 2019 +0000

    upstream: fix leak of ECDSA pkcs11_key objects
    
    work by markus, ok djm@
    
    OpenBSD-Commit-ID: 9fc0c4f1d640aaa5f19b8d70f37ea19b8ad284a1

commit 8a2467583f0b5760787273796ec929190c3f16ee
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 23:03:26 2019 +0000

    upstream: use EVP_PKEY_get0_EC_KEY() instead of direct access of
    
    EC_KEY internals as that won't work on OpenSSL
    
    work by markus@, feedback and ok djm@
    
    OpenBSD-Commit-ID: 4a99cdb89fbd6f5155ef8c521c99dc66e2612700

commit 24757c1ae309324e98d50e5935478655be04e549
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 23:01:59 2019 +0000

    upstream: cleanup PKCS#11 ECDSA pubkey loading: the returned
    
    object should never have a DER header
    
    work by markus; feedback and ok djm@
    
    OpenBSD-Commit-ID: b617fa585eddbbf0b1245b58b7a3c4b8d613db17

commit 749aef30321595435ddacef2f31d7a8f2b289309
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 23:00:12 2019 +0000

    upstream: cleanup unnecessary code in ECDSA pkcs#11 signature
    
    work by markus@, feedback and ok djm@
    
    OpenBSD-Commit-ID: affa5ca7d58d59fbd16169f77771dcdbd2b0306d

commit 0c50992af49b562970dd0ba3f8f151f1119e260e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 22:57:45 2019 +0000

    upstream: cleanup pkcs#11 client code: use sshkey_new in instead
    
    of stack- allocating a sshkey
    
    work by markus@, ok djm@
    
    OpenBSD-Commit-ID: a048eb6ec8aa7fa97330af927022c0da77521f91

commit 854bd8674ee5074a239f7cadf757d55454802e41
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 22:54:30 2019 +0000

    upstream: allow override of the pkcs#11 helper binary via
    
    $SSH_PKCS11_HELPER; needed for regress tests.
    
    work by markus@, ok me
    
    OpenBSD-Commit-ID: f78d8185500bd7c37aeaf7bd27336db62f0f7a83

commit 93f02107f44d63a016d8c23ebd2ca9205c495c48
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 22:51:37 2019 +0000

    upstream: add support for ECDSA keys in PKCS#11 tokens
    
    Work by markus@ and Pedro Martelletto, feedback and ok me@
    
    OpenBSD-Commit-ID: a37d651e221341376636056512bddfc16efb4424

commit aa22c20e0c36c2fc610cfcc793b0d14079c38814
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 20 22:03:29 2019 +0000

    upstream: add option to test whether keys in an agent are usable,
    
    by performing a signature and a verification using each key "ssh-add -T
    pubkey [...]"
    
    work by markus@, ok djm@
    
    OpenBSD-Commit-ID: 931b888a600b6a883f65375bd5f73a4776c6d19b

commit a36b0b14a12971086034d53c0c3dfbad07665abe
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Sun Jan 20 02:01:59 2019 +0000

    upstream: Fix BN_is_prime_* calls in SSH, the API returns -1 on
    
    error.
    
    Found thanks to BoringSSL's commit 53409ee3d7595ed37da472bc73b010cd2c8a5ffd
    by David Benjamin.
    
    ok djm, dtucker
    
    OpenBSD-Commit-ID: 1ee832be3c44b1337f76b8562ec6d203f3b072f8

commit ec4776bb01dd8d61fddc7d2a31ab10bf3d3d829a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jan 20 01:12:40 2019 +0000

    upstream: DH-GEX min value is now specified in RFC8270. ok djm@
    
    OpenBSD-Commit-ID: 1229d0feb1d0ecefe05bf67a17578b263e991acc

commit c90a7928c4191303e76a8c58b9008d464287ae1b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jan 21 09:22:36 2019 +1100

    Check for cc before gcc.
    
    If cc is something other than gcc and is the system compiler prefer using
    that, unless otherwise told via $CC.  ok djm@

commit 9b655dc9c9a353f0a527f0c6c43a5e35653c9503
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 14:55:27 2019 +1100

    last bits of old packet API / active_state global

commit 3f0786bbe73609ac96e5a0d91425ee21129f8e04
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 10:22:18 2019 +1100

    remove PAM dependencies on old packet API
    
    Requires some caching of values, because the PAM code isn't
    always called with packet context.

commit 08f66d9f17e12c1140d1f1cf5c4dce67e915d3cc
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 09:58:45 2019 +1100

    remove vestiges of old packet API from loginrec.c

commit c327813ea1d740e3e367109c17873815aba1328e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 09:45:38 2019 +1100

    depend

commit 135e302cfdbe91817294317c337cc38c3ff01cba
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 22:30:52 2019 +0000

    upstream: fix error in refactor: use ssh_packet_disconnect() instead of
    
    sshpkt_error(). The first one logs the error and exits (what we want) instead
    of just logging and blundering on.
    
    OpenBSD-Commit-ID: 39f51b43641dce9ce0f408ea6c0e6e077e2e91ae

commit 245c6a0b220b58686ee35bc5fc1c359e9be2faaa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:45:31 2019 +0000

    upstream: remove last traces of old packet API!
    
    with & ok markus@
    
    OpenBSD-Commit-ID: 9bd10437026423eb8245636ad34797a20fbafd7d

commit 04c091fc199f17dacf8921df0a06634b454e2722
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:43:56 2019 +0000

    upstream: remove last references to active_state
    
    with & ok markus@
    
    OpenBSD-Commit-ID: 78619a50ea7e4ca2f3b54d4658b3227277490ba2

commit ec00f918b8ad90295044266c433340a8adc93452
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:43:07 2019 +0000

    upstream: convert monitor.c to new packet API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: 61ecd154bd9804461a0cf5f495a29d919e0014d5

commit 6350e0316981489d4205952d6904d6fedba5bfe0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:42:30 2019 +0000

    upstream: convert sshd.c to new packet API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: ea569d3eaf9b5cf1bad52779fbfa5fa0b28af891

commit a5e2ad88acff2b7d131ee6d5dc5d339b0f8c6a6d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:41:53 2019 +0000

    upstream: convert session.c to new packet API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: fae817207e23099ddd248960c984f7b7f26ea68e

commit 3a00a921590d4c4b7e96df11bb10e6f9253ad45e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:41:18 2019 +0000

    upstream: convert auth.c to new packet API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: 7e10359f614ff522b52a3f05eec576257794e8e4

commit 7ec5cb4d15ed2f2c5c9f5d00e6b361d136fc1e2d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:40:48 2019 +0000

    upstream: convert serverloop.c to new packet API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: c92dd19b55457541478f95c0d6b318426d86d885

commit 64c9598ac05332d1327cbf55334dee4172d216c4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:40:21 2019 +0000

    upstream: convert the remainder of sshconnect2.c to new packet
    
    API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: 0986d324f2ceb5e8a12ac21c1bb10b3b4b1e0f71

commit bc5e1169d101d16e3a5962a928db2bc49a8ef5a3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:39:12 2019 +0000

    upstream: convert the remainder of clientloop.c to new packet API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: ce2fbbacb86a290f31da1e7bf04cddf2bdae3d1e

commit 5ebce136a6105f084db8f0d7ee41981d42daec40
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 09:44:53 2019 +1100

    upstream: convert auth2.c to new packet API
    
    OpenBSD-Commit-ID: ed831bb95ad228c6791bc18b60ce7a2edef2c999

commit 172a592a53ebe8649c4ac0d7946e6c08eb151af6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:37:48 2019 +0000

    upstream: convert servconf.c to new packet API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: 126553aecca302c9e02fd77e333b9cb217e623b4

commit 8cc7a679d29cf6ecccfa08191e688c7f81ef95c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:37:13 2019 +0000

    upstream: convert channels.c to new packet API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: 0b8279b56113cbd4011fc91315c0796b63dc862c

commit 06232038c794c7dfcb087be0ab0b3e65b09fd396
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:36:38 2019 +0000

    upstream: convert sshconnect.c to new packet API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: 222337cf6c96c347f1022d976fac74b4257c061f

commit 25b2ed667216314471bb66752442c55b95792dc3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:36:06 2019 +0000

    upstream: convert ssh.c to new packet API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: eb146878b24e85c2a09ee171afa6797c166a2e21

commit e3128b38623eef2fa8d6e7ae934d3bd08c7e973e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:35:25 2019 +0000

    upstream: convert mux.c to new packet API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: 4e3893937bae66416e984b282d8f0f800aafd802

commit ed1df7226caf3a943a36d580d4d4e9275f8a61ee
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:34:45 2019 +0000

    upstream: convert sshconnect2.c to new packet API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: 1cb869e0d6e03539f943235641ea070cae2ebc58

commit 23f22a4aaa923c61ec49a99ebaa383656e87fa40
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:33:57 2019 +0000

    upstream: convert clientloop.c to new packet API
    
    with & ok markus@
    
    OpenBSD-Commit-ID: 497b36500191f452a22abf283aa8d4a9abaee7fa

commit ad60b1179c9682ca5aef0b346f99ef68cbbbc4e5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:33:13 2019 +0000

    upstream: allow sshpkt_fatal() to take a varargs format; we'll
    
    use this to give packet-related fatal error messages more context (esp. the
    remote endpoint) ok markus@
    
    OpenBSD-Commit-ID: de57211f9543426b515a8a10a4f481666b2b2a50

commit 0fa174ebe129f3d0aeaf4e2d1dd8de745870d0ff
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 19 21:31:32 2019 +0000

    upstream: begin landing remaining refactoring of packet parsing
    
    API, started almost exactly six years ago.
    
    This change stops including the old packet_* API by default and makes
    each file that requires the old API include it explicitly. We will
    commit file-by-file refactoring to remove the old API in consistent
    steps.
    
    with & ok markus@
    
    OpenBSD-Commit-ID: 93c98a6b38f6911fd1ae025a1ec57807fb4d4ef4

commit 4ae7f80dfd02f2bde912a67c9f338f61e90fa79f
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Sat Jan 19 04:15:56 2019 +0000

    upstream: Print an \r in front of the password prompt so parts of
    
    a password that was entered too early are likely clobbered by the prompt.
    Idea from doas.
    
    from and ok djm
    "i like it" deraadt
    
    OpenBSD-Commit-ID: 5fb97c68df6d8b09ab37f77bca1d84d799c4084e

commit a6258e5dc314c7d504ac9f0fbc3be96475581dbe
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jan 18 11:09:01 2019 +1100

    Add minimal fchownat and fchmodat implementations.
    
    Fixes builds on at least OS X Lion, NetBSD 6 and Solaris 10.

commit 091093d25802b87d3b2b09f2c88d9f33e1ae5562
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jan 18 12:11:42 2019 +1300

    Add a minimal implementation of utimensat().
    
    Some systems (eg older OS X) do not have utimensat, so provide minimal
    implementation in compat layer.  Fixes build on at least El Capitan.

commit 609644027dde1f82213699cb6599e584c7efcb75
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 1 22:20:16 2019 +0000

    upstream: regress bits for banner processing refactor (this test was
    
    depending on ssh returning a particular error message for banner parsing
    failure)
    
    reminded by bluhm@
    
    OpenBSD-Regress-ID: f24fc303d40931157431df589b386abf5e1be575

commit f47d72ddad75b93d3cbc781718b0fa9046c03df8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 17 04:45:09 2019 +0000

    upstream: tun_fwd_ifnames variable should b
    
    =?UTF-8?q?e=20extern;=20from=20Hanno=20B=C3=B6ck?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: d53dede6e521161bf04d39d09947db6253a38271

commit 943d0965263cae1c080ce5a9d0b5aa341885e55d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 17 04:20:53 2019 +0000

    upstream: include time.h for time(3)/nanosleep(2); from Ian
    
    McKellar
    
    OpenBSD-Commit-ID: 6412ccd06a88f65b207a1089345f51fa1244ea51

commit dbb4dec6d5d671b5e9d67ef02162a610ad052068
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 17 01:50:24 2019 +0000

    upstream: many of the global variables in this file can be made static;
    
    patch from Markus Schmidt
    
    OpenBSD-Commit-ID: f3db619f67beb53257b21bac0e92b4fb7d5d5737

commit 60d8c84e0887514c99c9ce071965fafaa1c3d34a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 16 23:23:45 2019 +0000

    upstream: Add "-h" flag to sftp chown/chgrp/chmod commands to
    
    request they do not follow symlinks. Requires recently-committed
    lsetstat@openssh.com extension on the server side.
    
    ok markus@ dtucker@
    
    OpenBSD-Commit-ID: f93bb3f6f7eb2fb7ef1e59126e72714f1626d604

commit dbbc7e0eab7262f34b8e0cd6efecd1c77b905ed0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 16 23:22:10 2019 +0000

    upstream: add support for a "lsetstat@openssh.com" extension. This
    
    replicates the functionality of the existing SSH2_FXP_SETSTAT operation but
    does not follow symlinks. Based on a patch from Bert Haverkamp in bz#2067 but
    with more attribute modifications supported.
    
    ok markus@ dtucker@
    
    OpenBSD-Commit-ID: f7234f6e90db19655d55d936a115ee4ccb6aaf80

commit 4a526941d328fc3d97068c6a4cbd9b71b70fe5e1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 4 03:27:50 2019 +0000

    upstream: eliminate function-static attempt counters for
    
    passwd/kbdint authmethods by moving them to the client authctxt; Patch from
    Markus Schmidt, ok markus@
    
    OpenBSD-Commit-ID: 4df4404a5d5416eb056f68e0e2f4fa91ba3b3f7f

commit 8a8183474c41bd6cebaa917346b549af2239ba2f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 4 03:23:00 2019 +0000

    upstream: fix memory leak of ciphercontext when rekeying; bz#2942
    
    Patch from Markus Schmidt; ok markus@
    
    OpenBSD-Commit-ID: 7877f1b82e249986f1ef98d0ae76ce987d332bdd

commit 5bed70afce0907b6217418d0655724c99b683d93
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 1 23:10:53 2019 +0000

    upstream: static on global vars, const on handler tables that contain
    
    function pointers; from Mike Frysinger
    
    OpenBSD-Commit-ID: 7ef2305e50d3caa6326286db43cf2cfaf03960e0

commit 007a88b48c97d092ed2f501bbdcb70d9925277be
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 27 23:02:11 2018 +0000

    upstream: Request RSA-SHA2 signatures for
    
    rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms; ok markus@
    
    OpenBSD-Commit-ID: afc6f7ca216ccd821656d1c911d2a3deed685033

commit eb347d086c35428c47fe52b34588cbbc9b49d9a6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 27 03:37:49 2018 +0000

    upstream: ssh_packet_set_state() now frees ssh->kex implicitly, so
    
    don't do explicit kex_free() beforehand
    
    OpenBSD-Regress-ID: f2f73bad47f62a2040ccba0a72cadcb12eda49cf

commit bb542f0cf6f7511a22a08c492861e256a82376a9
Author: tedu@openbsd.org <tedu@openbsd.org>
Date:   Sat Dec 15 00:50:21 2018 +0000

    upstream: remove unused and problematic sudo clean. ok espie
    
    OpenBSD-Regress-ID: ca90c20a15a85b661e13e98b80c10e65cd662f7b

commit 0a843d9a0e805f14653a555f5c7a8ba99d62c12d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 27 03:25:24 2018 +0000

    upstream: move client/server SSH-* banners to buffers under
    
    ssh->kex and factor out the banner exchange. This eliminates some common code
    from the client and server.
    
    Also be more strict about handling \r characters - these should only
    be accepted immediately before \n (pointed out by Jann Horn).
    
    Inspired by a patch from Markus Schmidt.
    (lots of) feedback and ok markus@
    
    OpenBSD-Commit-ID: 1cc7885487a6754f63641d7d3279b0941890275b

commit 434b587afe41c19391821e7392005068fda76248
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 7 04:36:09 2018 +0000

    upstream: Fix calculation of initial bandwidth limits. Account for
    
    written bytes before the initial timer check so that the first buffer written
    is accounted.  Set the threshold after which the timer is checked such that
    the limit starts being computed as soon as possible, ie after the second
    buffer is written.  This prevents an initial burst of traffic and provides a
    more accurate bandwidth limit.  bz#2927, ok djm.
    
    OpenBSD-Commit-ID: ff3ef76e4e43040ec198c2718d5682c36b255cb6

commit a6a0788cbbe8dfce2819ee43b09c80725742e21c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 7 03:39:40 2018 +0000

    upstream: only consider the ext-info-c extension during the initial
    
    KEX. It shouldn't be sent in subsequent ones, but if it is present we should
    ignore it.
    
    This prevents sshd from sending a SSH_MSG_EXT_INFO for REKEX for buggy
    these clients. Reported by Jakub Jelen via bz2929; ok dtucker@
    
    OpenBSD-Commit-ID: 91564118547f7807030ec537480303e2371902f9

commit 63bba57a32c5bb6158d57cf4c47022daf89c14a0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 7 03:33:18 2018 +0000

    upstream: fix option letter pasto in previous
    
    OpenBSD-Commit-ID: e26c8bf2f2a808f3c47960e1e490d2990167ec39

commit 737e4edd82406595815efadc28ed5161b8b0c01a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 7 03:32:26 2018 +0000

    upstream: mention that the ssh-keygen -F (find host in
    
    authorized_keys) and -R (remove host from authorized_keys) options may accept
    either a bare hostname or a [hostname]:port combo. bz#2935
    
    OpenBSD-Commit-ID: 5535cf4ce78375968b0d2cd7aa316fa3eb176780

commit 8a22ffaa13391cfe5b40316d938fe0fb931e9296
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 7 15:41:16 2018 +1100

    expose $SSH_CONNECTION in the PAM environment
    
    This makes the connection 4-tuple available to PAM modules that
    wish to use it in decision-making. bz#2741

commit a784fa8c7a7b084d63bae82ccfea902131bb45c5
Author: Kevin Adler <kadler@us.ibm.com>
Date:   Wed Dec 12 22:12:45 2018 -0600

    Don't pass loginmsg by address now that it's an sshbuf*
    
    In 120a1ec74, loginmsg was changed from the legacy Buffer type
    to struct sshbuf*, but it missed changing calls to
    sys_auth_allowed_user and sys_auth_record_login which passed
    loginmsg by address. Now that it's a pointer, just pass it directly.
    
    This only affects AIX, unless there are out of tree users.

commit 285310b897969a63ef224d39e7cc2b7316d86940
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 7 02:31:20 2018 +0000

    upstream: no need to allocate channels_pre/channels_post in
    
    channel_init_channels() as we do it anyway in channel_handler_init() that we
    call at the end of the function. Fix from Markus Schmidt via bz#2938
    
    OpenBSD-Commit-ID: 74893638af49e3734f1e33a54af1b7ea533373ed

commit 87d6cf1cbc91df6815db8fe0acc7c910bc3d18e4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 30 02:24:52 2018 +0000

    upstream: don't attempt to connect to empty SSH_AUTH_SOCK; bz#293
    
    OpenBSD-Commit-ID: 0e8fc8f19f14b21adef7109e0faa583d87c0e929

commit 91b19198c3f604f5eef2c56dbe36f29478243141
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 28 06:00:38 2018 +0000

    upstream: don't truncate user or host name in "user@host's
    
    OpenBSD-Commit-ID: e6ca01a8d58004b7f2cac0b1b7ce8f87e425e360

commit dd0cf6318d9b4b3533bda1e3bc021b2cd7246b7a
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Nov 23 06:58:28 2018 +0000

    upstream: tweak previous;
    
    OpenBSD-Commit-ID: 08f096922eb00c98251501c193ff9e83fbb5de4f

commit 8a85f5458d1c802471ca899c97f89946f6666e61
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 25 21:44:05 2018 +1100

    Include stdio.h for FILE if needed.

commit 16fb23f25454991272bfe4598cc05d20fcd25116
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 25 14:05:57 2018 +1100

    Reverse order of OpenSSL init functions.
    
    Try the new init function (OPENSSL_init_crypto) before falling back to
    the old one (OpenSSL_add_all_algorithms).

commit 98f878d2272bf8dff21f2a0265d963c29e33fed2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 25 14:05:08 2018 +1100

    Improve OpenSSL_add_all_algorithms check.
    
    OpenSSL_add_all_algorithms() may be a macro so check for that too.

commit 9e34e0c59ab04514f9de9934a772283f7f372afe
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 23 05:08:07 2018 +0000

    upstream: add a ssh_config "Match final" predicate
    
    Matches in same pass as "Match canonical" but doesn't require
    hostname canonicalisation be enabled. bz#2906 ok markus
    
    OpenBSD-Commit-ID: fba1dfe9f6e0cabcd0e2b3be13f7a434199beffa

commit 4da58d58736b065b1182b563d10ad6765d811c6d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Nov 23 02:53:57 2018 +0000

    upstream: Remove now-unneeded ifdef SIGINFO around handler since it is
    
    now always used for SIGUSR1 even when SIGINFO is not defined.  This will make
    things simpler in -portable.
    
    OpenBSD-Regress-ID: 4ff0265b335820b0646d37beb93f036ded0dc43f

commit c721d5877509875c8515df0215fa1dab862013bc
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 23 14:11:20 2018 +1100

    Move RANDOM_SEED_SIZE outside ifdef.
    
    RANDOM_SEED_SIZE is used by both the OpenSSL and non-OpenSSL code
    This fixes the build with configureed --without-openssl.

commit deb51552c3ce7ce72c8d0232e4f36f2e7c118c7d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 22 19:59:28 2018 +1100

    Resync with OpenBSD by pulling in an ifdef SIGINFO.

commit 28c7b2cd050f4416bfcf3869a20e3ea138aa52fe
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 23 10:45:20 2018 +1100

    fix configure test for OpenSSL version
    
    square brackets in case statements may be eaten by autoconf.
    
    Report and fix from Filipp Gunbin; tweaked by naddy@

commit 42c5ec4b97b6a1bae70f323952d0646af16ce710
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 23 10:40:06 2018 +1100

    refactor libcrypto initialisation
    
    Don't call OpenSSL_add_all_algorithms() unless OpenSSL actually
    supports it.
    
    Move all libcrypto initialisation to a single function, and call that
    from seed_rng() that is called early in each tool's main().
    
    Prompted by patch from Rosen Penev

commit 5b60b6c02009547a3e2a99d4886965de2a4719da
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Nov 22 08:59:11 2018 +0000

    upstream: Output info on SIGUSR1 as well as
    
    SIGINFO to resync with portable.  (ID sync only).
    
    OpenBSD-Regress-ID: 699d153e2de22dce51a1b270c40a98472d1a1b16

commit e4ae345dc75b34fd870c2e8690d831d2c1088eb7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Nov 22 08:48:32 2018 +0000

    upstream: Append pid to temp files in /var/run and set a cleanup
    
    trap for them. This allows multiple instances of tests to run without
    colliding.
    
    OpenBSD-Regress-ID: 57add105ecdfc54752d8003acdd99eb68c3e0b4c

commit f72d0f52effca5aa20a193217346615ecd3eed53
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Oct 31 11:09:27 2018 +0000

    upstream: UsePrivilegeSeparation no is deprecated
    
    test "yes" and "sandbox".
    
    OpenBSD-Regress-ID: 80e685ed8990766527dc629b1affc09a75bfe2da

commit 35d0e5fefc419bddcbe09d7fc163d8cd3417125b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 17 23:28:05 2018 +0000

    upstream: add some knobs:
    
    UNITTEST_FAST?= no     # Skip slow tests (e.g. less intensive fuzzing).
    UNITTEST_SLOW?= no     # Include slower tests (e.g. more intensive fuzzing).
    UNITTEST_VERBOSE?= no  # Verbose test output (inc. per-test names).
    
    useful if you want to run the tests as a smoke test to exercise the
    functionality without waiting for all the fuzzers to run.
    
    OpenBSD-Regress-ID: e04d82ebec86068198cd903acf1c67563c57315e

commit c1941293d9422a14dda372b4c21895e72aa7a063
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 22 15:52:26 2018 +1100

    Resync Makefile.inc with upstream.
    
    It's unused in -portable, but having it out of sync makes other syncs
    fail to apply.

commit 928f1231f65f88cd4c73e6e0edd63d2cf6295d77
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 19 04:12:32 2018 +0000

    upstream: silence (to log level debug2) failure messages when
    
    loading the default hostkeys. Hostkeys explicitly specified in the
    configuration or on the command-line are still reported as errors, and
    failure to load at least one host key remains a fatal error.
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    Based on patch from Dag-Erling Smørgrav via
    https://github.com/openssh/openssh-portable/pull/103
    
    ok markus@
    
    OpenBSD-Commit-ID: ffc2e35a75d1008effaf05a5e27425041c27b684

commit 7fca94edbe8ca9f879da9fdd2afd959c4180f4c7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Nov 18 22:43:29 2018 +0000

    upstream: Fix inverted logic for redirecting ProxyCommand stderr to
    
    /dev/null. Fixes mosh in proxycommand mode that was broken by the previous
    ProxyCommand change that was reported by matthieu@. ok djm@ danj@
    
    OpenBSD-Commit-ID: c6fc9641bc250221a0a81c6beb2e72d603f8add6

commit ccef7c4faf914993b53035cd2b25ce02ab039c9d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 16 06:17:38 2018 +0000

    upstream: redirect stderr of ProxyCommands to /dev/null when ssh is
    
    started with ControlPersist; based on patch from Steffen Prohaska
    
    OpenBSD-Commit-ID: 1bcaa14a03ae80369d31021271ec75dce2597957

commit 15182fd96845a03216d7ac5a2cf31c4e77e406e3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 16 06:10:29 2018 +0000

    upstream: make grandparent-parent-child sshbuf chains robust to
    
    use-after-free faults if the ancestors are freed before the descendents.
    Nothing in OpenSSH uses this deallocation pattern. Reported by Jann Horn
    
    OpenBSD-Commit-ID: d93501d1d2734245aac802a252b9bb2eccdba0f2

commit 2a35862e664afde774d4a72497d394fe7306ccb5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 16 03:26:01 2018 +0000

    upstream: use path_absolute() for pathname checks; from Manoj Ampalam
    
    OpenBSD-Commit-ID: 482ce71a5ea5c5f3bc4d00fd719481a6a584d925

commit d0d1dfa55be1c5c0d77ab3096b198a64235f936d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 16 14:11:44 2018 +1100

    Test for OPENSSL_init_crypto before using.
    
    Check for the presence of OPENSSL_init_crypto and all the flags we want
    before trying to use it (bz#2931).

commit 6010c0303a422a9c5fa8860c061bf7105eb7f8b2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 16 03:03:10 2018 +0000

    upstream: disallow empty incoming filename or ones that refer to the
    
    current directory; based on report/patch from Harry Sintonen
    
    OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9

commit aaed635e3a401cfcc4cc97f33788179c458901c3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 16 02:46:20 2018 +0000

    upstream: fix bug in client that was keeping a redundant ssh-agent
    
    socket around for the life of the connection; bz#2912; reported by Simon
    Tatham; ok dtucker@
    
    OpenBSD-Commit-ID: 4ded588301183d343dce3e8c5fc1398e35058478

commit e76135e3007f1564427b2956c628923d8dc2f75a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 16 02:43:56 2018 +0000

    upstream: fix bug in HostbasedAcceptedKeyTypes and
    
    PubkeyAcceptedKeyTypes options. If only RSA-SHA2 siganture types were
    specified, then authentication would always fail for RSA keys as the monitor
    checks only the base key (not the signature algorithm) type against
    *AcceptedKeyTypes. bz#2746; reported by Jakub Jelen; ok dtucker
    
    OpenBSD-Commit-ID: 117bc3dc54578dbdb515a1d3732988cb5b00461b

commit 5c1a63562cac0574c226224075b0829a50b48c9d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 16 02:30:20 2018 +0000

    upstream: support a prefix of '@' to suppress echo of sftp batch
    
    commands; bz#2926; ok dtucker@
    
    OpenBSD-Commit-ID: 9d635636bc84aeae796467e059f7634de990a79d

commit 90ef45f7aac33eaf55ec344e101548a01e570f29
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Tue Nov 13 07:22:45 2018 +0000

    upstream: fix markup error (missing blank before delimiter); from
    
    Mike Frysinger <vapier at gentoo dot org>
    
    OpenBSD-Commit-ID: 1bc5392f795ca86318d695e0947eaf71a5a4f6d9

commit 960e7c672dc106f3b759c081de3edb4d1138b36e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 9 02:57:58 2018 +0000

    upstream: typo in error message; caught by Debian lintian, via
    
    Colin Watson
    
    OpenBSD-Commit-ID: bff614c7bd1f4ca491a84e9b5999f848d0d66758

commit 81f1620c836e6c79c0823ba44acca605226a80f1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 9 02:56:22 2018 +0000

    upstream: correct local variable name; from yawang AT microsoft.com
    
    OpenBSD-Commit-ID: a0c228390856a215bb66319c89cb3959d3af8c87

commit 1293740e800fa2e5ccd38842a2e4970c6f3b9831
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Oct 31 11:20:05 2018 +0000

    upstream: Import new moduli.
    
    OpenBSD-Commit-ID: c07772f58028fda683ee6abd41c73da3ff70d403

commit 46925ae28e53fc9add336a4fcdb7ed4b86c3591c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 26 01:23:03 2018 +0000

    upstream: mention ssh-ed25519-cert-v01@openssh.com in list of cert
    
    key type at start of doc
    
    OpenBSD-Commit-ID: b46b0149256d67f05f2d5d01e160634ed1a67324

commit 8d8340e2c215155637fe19cb1a837f71b2d55f7b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 16 13:32:13 2018 +1100

    Remove fallback check for /usr/local/ssl.
    
    If configure could not find a working OpenSSL installation it would
    fall back to checking in /usr/local/ssl.  This made sense back when
    systems did not ship with OpenSSL, but most do and OpenSSL 1.1 doesn't
    use that as a default any more.  The fallback behaviour also meant
    that if you pointed --with-ssl-dir at a specific directory and it
    didn't work, it would silently use either the system libs or the ones
    in /usr/local/ssl.  If you want to use /usr/local/ssl you'll need to
    pass configure --with-ssl-dir=/usr/local/ssl.  ok djm@

commit ce93472134fb22eff73edbcd173a21ae38889331
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Nov 16 12:44:01 2018 +1100

    Fix check for OpenSSL 1.0.1 exactly.
    
    Both INSTALL and configure.ac claim OpenSSL >= 1.0.1 is supported; fix
    compile-time check for 1.0.1 to match.

commit f2970868f86161a22b2c377057fa3891863a692a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 11 15:58:20 2018 +1100

    Improve warnings in cygwin service setup.
    
    bz#2922, patch from vinschen at redhat.com.

commit bd2d54fc1eee84bf87158a1277a50e6c8a303339
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Nov 11 15:54:54 2018 +1100

    Remove hardcoded service name in cygwin setup.
    
    bz#2922, patch from Christian.Lupien at USherbrooke.ca, sanity check
    by vinschen at redhat.com.

commit d0153c77bf7964e694f1d26c56c41a571b8e9466
Author: Dag-Erling Smørgrav <des@des.no>
Date:   Tue Oct 9 23:03:40 2018 +0200

    AC_CHECK_SIZEOF() no longer needs a second argument.

commit 9b47b083ca9d866249ada9f02dbd57c87b13806e
Author: Manoj Ampalam <manojamp@microsoft.com>
Date:   Thu Nov 8 22:41:59 2018 -0800

    Fix error message w/out nistp521.
    
    Correct error message when OpenSSL doesn't support certain ECDSA key
    lengths.

commit 624d19ac2d56fa86a22417c35536caceb3be346f
Author: Eneas U de Queiroz <cote2004-github@yahoo.com>
Date:   Tue Oct 9 16:17:42 2018 -0300

    fix compilation with openssl built without ECC
    
    ECDSA code in openssh-compat.h and libressl-api-compat.c needs to be
    guarded by OPENSSL_HAS_ECC
    
    Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>

commit 1801cd11d99d05a66ab5248c0555f55909a355ce
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Nov 8 15:03:11 2018 +1100

    Simplify OpenSSL 1.1 function checks.
    
    Replace AC_SEARCH_LIBS checks for OpenSSL 1.1 functions with a single
    AC_CHECK_FUNCS.  ok djm@

commit bc32f118d484e4d71d2a0828fd4eab7e4176c9af
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Nov 5 17:31:24 2018 +1100

    Fix pasto for HAVE_EVP_CIPHER_CTX_SET_IV.
    
    Prevents unnecessary redefinition.  Patch from mforney at mforney.org.

commit 3719df60c66abc4b47200d41f571d67772f293ba
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Oct 31 22:21:03 2018 +1100

    Import new moduli.

commit 595605d4abede475339d6a1f07a8cc674c11d1c3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Oct 28 15:18:13 2018 +1100

    Update check for minimum OpenSSL version.

commit 6ab75aba340d827140d7ba719787aabaf39a0355
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Oct 28 15:16:31 2018 +1100

    Update required OpenSSL versions to match current.

commit c801b0e38eae99427f37869370151b78f8e15c5d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Oct 28 14:34:12 2018 +1100

    Use detected version functions in openssl compat.
    
    Use detected functions in compat layer instead of guessing based on
    versions.  Really fixes builds with LibreSSL, not just configure.

commit 262d81a259d4aa1507c709ec9d5caa21c7740722
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Oct 27 16:45:59 2018 +1100

    Check for the existence of openssl version funcs.
    
    Check for the existence of openssl version functions and use the ones
    detected instead of trying to guess based on the int32 version
    identifier.  Fixes builds with LibreSSL.

commit 406a24b25d6a2bdd70cacd16de7e899dcb2a8829
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 13:43:28 2018 +1100

    fix builds on OpenSSL <= 1.0.x
    
    I thought OpenSSL 1.0.x offered the new-style OpenSSL_version_num() API
    to obtain version number, but they don't.

commit 859754bdeb41373d372e36b5dc89c547453addb3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 23 17:10:41 2018 +1100

    remove remaining references to SSLeay
    
    Prompted by Rosen Penev

commit b9fea45a68946c8dfeace72ad1f6657c18f2a98a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 23 17:10:35 2018 +1100

    regen depend

commit a65784c9f9c5d00cf1a0e235090170abc8d07c73
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 23 05:56:35 2018 +0000

    upstream: refer to OpenSSL not SSLeay;
    
    we're old, but we don't have to act it
    
    OpenBSD-Commit-ID: 9ca38d11f8ed19e61a55108d1e892d696cee08ec

commit c0a35265907533be10ca151ac797f34ae0d68969
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 22 11:22:50 2018 +1100

    fix compile for openssl 1.0.x w/ --with-ssl-engine
    
    bz#2921, patch from cotequeiroz

commit 31b49525168245abe16ad49d7b7f519786b53a38
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Oct 22 20:05:18 2018 +1100

    Include openssl compatibility.
    
    Patch from rosenp at gmail.com via openssh-unix-dev.

commit a4fc253f5f44f0e4c47aafe2a17d2c46481d3c04
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 19 03:12:42 2018 +0000

    upstream: when printing certificate contents "ssh-keygen -Lf
    
    /path/certificate", include the algorithm that the CA used to sign the cert.
    
    OpenBSD-Commit-ID: 1ea20b5048a851a7a0758dcb9777a211a2c0dddd

commit 83b3d99d2b47321b7ebb8db6f6ea04f3808bc069
Author: florian@openbsd.org <florian@openbsd.org>
Date:   Mon Oct 15 11:28:50 2018 +0000

    upstream: struct sockaddr_storage is guaranteed to be large enough,
    
    no need to check the size. OK kn, deraadt
    
    OpenBSD-Commit-ID: 0aa56e92eb49c79f495b31a5093109ec5841f439

commit aede1c34243a6f7feae2fb2cb686ade5f9be6f3d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 17 11:01:20 2018 +1100

    Require OpenSSL 1.1.x series 1.1.0g or greater
    
    Previous versions have a bug with EVP_CipherInit() when passed a
    NULL EVP_CIPHER, per https://github.com/openssl/openssl/pull/4613
    
    ok dtucker@

commit 08300c211409c212e010fe2e2f2883e573a04ce2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 17 08:12:02 2018 +1100

    unbreak compilation with --with-ssl-engine
    
    Missing last argument to OPENSSL_init_crypto()

commit 1673274aee67ce0eb6f00578b6f3d2bcbd58f937
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Oct 16 14:45:57 2018 +1100

    Remove gcc spectre mitigation flags.
    
    Current impementions of the gcc spectre mitigation flags cause
    miscompilations when combined with other flags and do not provide much
    protection.  Found by fweimer at redhat.com, ok djm@

commit 4e23deefd7959ef83c73ed9cce574423438f6133
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 16 10:51:52 2018 +1100

    Avoid deprecated OPENSSL_config when using 1.1.x
    
    OpenSSL 1.1.x soft-deprecated OPENSSL_config in favour of
    OPENSSL_init_crypto; pointed out by Jakub Jelen

commit 797cdd9c8468ed1125ce60d590ae3f1397866af4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 12 16:58:47 2018 +1100

    Don't avoid our *sprintf replacements.
    
    Don't let systems with broken printf(3) avoid our replacements
    via asprintf(3)/vasprintf(3) calling libc internally.  From djm@

commit e526127cbd2f8ad88fb41229df0c9b850c722830
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Oct 12 16:43:35 2018 +1100

    Check if snprintf understands %zu.
    
    If the platforms snprintf and friends don't understand %zu, use the
    compat replacement.  Prevents segfaults on those platforms.

commit cf39f875191708c5f2f1a3c1c9019f106e74aea3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 12 09:48:05 2018 +1100

    remove stale link, tweak

commit a7205e68decf7de2005810853b4ce6b222b65e2a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 12 09:47:20 2018 +1100

    update version numbers ahead of release

commit 1a4a9cf80f5b92b9d1dadd0bfa8867c04d195391
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 11 03:48:04 2018 +0000

    upstream: don't send new-style rsa-sha2-*-cert-v01@openssh.com names to
    
    older OpenSSH that can't handle them. spotted by Adam Eijdenberg; ok dtucker
    
    OpenBSD-Commit-ID: 662bbc402e3d7c9b6c322806269698106a6ae631

commit dc8ddcdf1a95e011c263486c25869bb5bf4e30ec
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 11 13:08:59 2018 +1100

    update depends

commit 26841ac265603fd2253e6832e03602823dbb4022
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 11 13:02:11 2018 +1100

    some more duplicated key algorithm lines
    
    From Adam Eijdenberg

commit 5d9d17603bfbb620195a4581025052832b4c4adc
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 11 11:56:36 2018 +1100

    fix duplicated algorithm specification lines
    
    Spotted by Adam Eijdenberg

commit ebfafd9c7a5b2a7fb515ee95dbe0e44e11d0a663
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 11 00:52:46 2018 +0000

    upstream: typo in plain RSA algorithm counterpart names for
    
    certificates; spotted by Adam Eijdenberg; ok dtucker@
    
    OpenBSD-Commit-ID: bfcdeb6f4fc9e7607f5096574c8f118f2e709e00

commit c29b111e7d87c2324ff71c80653dd8da168c13b9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 11 11:29:35 2018 +1100

    check pw_passwd != NULL here too
    
    Again, for systems with broken NIS implementations.
    
    Prompted by coolbugcheckers AT gmail.com

commit fe8e8f349a553ef4c567acd418aac769a82b7729
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 11 11:03:15 2018 +1100

    check for NULL return from shadow_pw()
    
    probably unreachable on this platform; pointed out by
    coolbugcheckers AT gmail.com

commit acc59cbe7a1fb169e1c3caba65a39bd74d6e030d
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed Oct 10 16:43:49 2018 +0000

    upstream: introducing openssh 7.9
    
    OpenBSD-Commit-ID: 42d526a9fe01a40dd299ac58014d3349adf40e25

commit 12731158c75c8760a8bea06350eeb3e763fe1a07
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 11 10:29:29 2018 +1100

    supply callback to PEM_read_bio_PrivateKey
    
    OpenSSL 1.1.0i has changed the behaviour of their PEM APIs,
    so that empty passphrases are interpreted differently. This
    probabalistically breaks loading some keys, because the PEM format
    is terrible and doesn't include a proper MAC.
    
    Avoid this by providing a basic callback to avoid passing empty
    passphrases to OpenSSL in cases where one is required.
    
    Based on patch from Jakub Jelen in bz#2913; ok dtucker@

commit d1d301a1dd5d6cc3a9ed93ab7ab09dda4cb456e0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 14:57:00 2018 +1100

    in pick_salt() avoid dereference of NULL passwords
    
    Apparently some NIS implementations can leave pw->pw_passwd (or the
    shadow equivalent) NULL.
    
    bz#2909; based on patch from Todd Eigenschink

commit edbb6febccee084d212fdc0cb05b40cb1c646ab1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 9 05:42:23 2018 +0000

    upstream: Treat all PEM_read_bio_PrivateKey() errors when a passphrase
    
    is specified as "incorrect passphrase" instead of trying to choose between
    that and "invalid format".
    
    libcrypto can return ASN1 parsing errors rather than the expected
    decrypt error in certain infrequent cases when trying to decrypt/parse
    PEM private keys when supplied with an invalid passphrase.
    
    Report and repro recipe from Thomas Deutschmann in bz#2901
    
    ok markus@
    
    OpenBSD-Commit-ID: b1d4cd92395f9743f81c0d23aab2524109580870

commit 2581333d564d8697837729b3d07d45738eaf5a54
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Fri Oct 5 14:26:09 2018 +0000

    upstream: Support using service names for port numbers.
    
    * Try to resolve a port specification with getservbyname(3) if a
     numeric conversion fails.
    * Make the "Port" option in ssh_config handle its argument as a
     port rather than a plain integer.
    
    ok dtucker@ deraadt@
    
    OpenBSD-Commit-ID: e7f03633133205ab3dfbc67f9df7475fabae660d

commit e0d6501e86734c48c8c503f81e1c0926e98c5c4c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 4 07:47:35 2018 +0000

    upstream: when the peer sends a channel-close message, make sure we
    
    close the local extended read fd (stderr) along with the regular read fd
    (stdout). Avoids weird stuck processed in multiplexing mode.
    
    Report and analysis by Nelson Elhage and Geoffrey Thomas in bz#2863
    
    ok dtucker@ markus@
    
    OpenBSD-Commit-ID: a48a2467fe938de4de69d2e7193d5fa701f12ae9

commit 6f1aabb128246f445e33b8844fad3de9cb1d18cb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 4 01:04:52 2018 +0000

    upstream: factor out channel status formatting from
    
    channel_open_message() so we can use it in other debug messages
    
    OpenBSD-Commit-ID: 9c3903ca28fcabad57f566c9d0045b41ab7d52ba

commit f1dd179e122bdfdb7ca3072d9603607740efda05
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 4 00:10:11 2018 +0000

    upstream: include a little more information about the status and
    
    disposition of channel's extended (stderr) fd; makes debugging some things a
    bit easier. No behaviour change.
    
    OpenBSD-Commit-ID: 483eb6467dc7d5dbca8eb109c453e7a43075f7ce

commit 2d1428b11c8b6f616f070f2ecedce12328526944
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 4 00:04:41 2018 +0000

    upstream: explicit_bzero here to be consistent with other kex*.c;
    
    report from coolbugcheckers AT gmail.com
    
    OpenBSD-Commit-ID: a90f146c5b5f5b1408700395e394f70b440856cb

commit 5eff5b858e717e901e6af6596306a114de9f79f2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 3 06:38:35 2018 +0000

    upstream: Allow ssh_config IdentityAgent directive to accept
    
    environment variable names as well as explicit paths. ok dtucker@
    
    OpenBSD-Commit-ID: 2f0996e103876c53d8c9dd51dcce9889d700767b

commit a46ac4d86b25414d78b632e8173578b37e5f8a83
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 2 12:51:58 2018 +0000

    upstream: mention INFO@openssh.com for sending SIGINFO
    
    OpenBSD-Commit-ID: 132471eeb0df658210afd27852fe65131b26e900

commit ff3a411cae0b484274b7900ef52ff4dad3e12876
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 2 22:49:40 2018 +1000

    only support SIGINFO on systems with SIGINFO

commit cd98925c6405e972dc9f211afc7e75e838abe81c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 2 12:40:07 2018 +0000

    upstream: Add server support for signalling sessions via the SSH
    
    channel/ session protocol. Signalling is only supported to sesssions that are
    not subsystems and were not started with a forced command.
    
    Long requested in bz#1424
    
    Based on a patch from markus@ and reworked by dtucker@;
    ok markus@ dtucker@
    
    OpenBSD-Commit-ID: 4bea826f575862eaac569c4bedd1056a268be1c3

commit dba50258333f2604a87848762af07ba2cc40407a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 26 07:32:44 2018 +0000

    upstream: remove big ugly TODO comment from start of file. Some of
    
    the mentioned tasks are obsolete and, of the remainder, most are already
    captured in PROTOCOL.mux where they better belong
    
    OpenBSD-Commit-ID: 16d9d76dee42a5bb651c9d6740f7f0ef68aeb407

commit 92b61a38ee9b765f5049f03cd1143e13f3878905
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 26 07:30:05 2018 +0000

    upstream: Document mux proxy mode; added by Markus in openssh-7.4
    
    Also add a little bit of information about the overall packet format
    
    OpenBSD-Commit-ID: bdb6f6ea8580ef96792e270cae7857786ad84a95

commit 9d883a1ce4f89b175fd77405ff32674620703fb2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 26 01:48:57 2018 +0000

    upstream: s/process_mux_master/mux_master_process/ in mux master
    
    function names,
    
    Gives better symmetry with the existing mux_client_*() names and makes
    it more obvious when a message comes from the master vs client (they
    are interleved in ControlMaster=auto mode).
    
    no functional change beyond prefixing a could of log messages with
    __func__ where they were previously lacking.
    
    OpenBSD-Commit-ID: b01f7c3fdf92692e1713a822a89dc499333daf75

commit c2fa53cd6462da82d3a851dc3a4a3f6b920337c8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Sep 22 14:41:24 2018 +1000

    Remove unused variable in _ssh_compat_fflush.

commit d1b3540c21212624af907488960d703c7d987b42
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Sep 20 18:08:43 2018 +1000

    Import updated moduli.

commit b5e412a8993ad17b9e1141c78408df15d3d987e1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 21 12:46:22 2018 +0000

    upstream: Allow ssh_config ForwardX11Timeout=0 to disable the
    
    timeout and allow X11 connections in untrusted mode indefinitely. ok dtucker@
    
    OpenBSD-Commit-ID: ea1ceed3f540b48e5803f933e59a03b20db10c69

commit cb24d9fcc901429d77211f274031653476864ec6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 21 12:23:17 2018 +0000

    upstream: when compiled with GSSAPI support, cache supported method
    
    OIDs by calling ssh_gssapi_prepare_supported_oids() regardless of whether
    GSSAPI authentication is enabled in the main config.
    
    This avoids sandbox violations for configurations that enable GSSAPI
    auth later, e.g.
    
    Match user djm
            GSSAPIAuthentication yes
    
    bz#2107; ok dtucker@
    
    OpenBSD-Commit-ID: a5dd42d87c74e27cfb712b15b0f97ab20e0afd1d

commit bbc8af72ba68da014d4de6e21a85eb5123384226
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 21 12:20:12 2018 +0000

    upstream: In sshkey_in_file(), ignore keys that are considered for
    
    being too short (i.e. SSH_ERR_KEY_LENGTH). These keys will not be considered
    to be "in the file". This allows key revocation lists to contain short keys
    without the entire revocation list being considered invalid.
    
    bz#2897; ok dtucker
    
    OpenBSD-Commit-ID: d9f3d857d07194a42ad7e62889a74dc3f9d9924b

commit 383a33d160cefbfd1b40fef81f72eadbf9303a66
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 21 03:11:36 2018 +0000

    upstream: Treat connections with ProxyJump specified the same as ones
    
    with a ProxyCommand set with regards to hostname canonicalisation (i.e. don't
    try to canonicalise the hostname unless CanonicalizeHostname is set to
    'always').
    
    Patch from Sven Wegener via bz#2896
    
    OpenBSD-Commit-ID: 527ff501cf98bf65fb4b29ed0cb847dda10f4d37

commit 0cbed248ed81584129b67c348dbb801660f25a6a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 20 23:40:16 2018 +0000

    upstream: actually make CASignatureAlgorithms available as a config
    
    option
    
    OpenBSD-Commit-ID: 93fa7ff58314ed7b1ab7744090a6a91232e6ae52

commit 62528870c0ec48cd86a37dd7320fb85886c3e6ee
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Sep 20 08:07:03 2018 +0000

    upstream: Import updated moduli.
    
    OpenBSD-Commit-ID: 04431e8e7872f49a2129bf080a6b73c19d576d40

commit e6933a2ffa0659d57f3c7b7c457b2c62b2a84613
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Sep 20 06:58:48 2018 +0000

    upstream: reorder CASignatureAlgorithms, and add them to the
    
    various -o lists; ok djm
    
    OpenBSD-Commit-ID: ecb88baecc3c54988b4d1654446ea033da359288

commit aa083aa9624ea7b764d5a81c4c676719a1a3e42b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 20 03:31:49 2018 +0000

    upstream: fix "ssh -Q sig" to show correct signature algorithm list
    
    (it was erroneously showing certificate algorithms); prompted by markus@
    
    OpenBSD-Commit-ID: 1cdee002f2f0c21456979deeb887fc889afb154d

commit ecac7e1f7add6b28874959a11f2238d149dc2c07
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 20 03:30:44 2018 +0000

    upstream: add CASignatureAlgorithms option for the client, allowing
    
    it to specify which signature algorithms may be used by CAs when signing
    certificates. Useful if you want to ban RSA/SHA1; ok markus@
    
    OpenBSD-Commit-ID: 9159e5e9f67504829bf53ff222057307a6e3230f

commit 86e5737c39153af134158f24d0cab5827cbd5852
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 20 03:28:06 2018 +0000

    upstream: Add sshd_config CASignatureAlgorithms option to allow
    
    control over which signature algorithms a CA may use when signing
    certificates. In particular, this allows a sshd to ban certificates signed
    with RSA/SHA1.
    
    ok markus@
    
    OpenBSD-Commit-ID: b05c86ef8b52b913ed48d54a9b9c1a7714d96bac

commit f80e68ea7d62e2dfafc12f1a60ab544ae4033a0f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 19 02:03:02 2018 +0000

    upstream: Make "ssh-add -q" do what it says on the tin: silence
    
    output from successful operations.
    
    Based on patch from Thijs van Dijk; ok dtucker@ deraadt@
    
    OpenBSD-Commit-ID: c4f754ecc055c10af166116ce7515104aa8522e1

commit 5e532320e9e51de720d5f3cc2596e95d29f6e98f
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Mon Sep 17 15:40:14 2018 +0000

    upstream: When choosing a prime from the moduli file, avoid
    
    re-using the linenum variable for something that is not a line number to
    avoid the confusion that resulted in the bug in rev. 1.64.  This also lets us
    pass the actual linenum to parse_prime() so the error messages include the
    correct line number.  OK markus@ some time ago.
    
    OpenBSD-Commit-ID: 4d8e5d3e924d6e8eb70053e3defa23c151a00084

commit cce8cbe0ed7d1ba3a575310e0b63c193326ae616
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Sep 15 19:44:06 2018 +1000

    Fix openssl-1.1 fallout for --without-openssl.
    
    ok djm@

commit 149519b9f201dac755f3cba4789f4d76fecf0ee1
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 15 19:37:48 2018 +1000

    add futex(2) syscall to seccomp sandbox
    
    Apparently needed for some glibc/openssl combinations.
    
    Patch from Arkadiusz Miśkiewicz

commit 4488ae1a6940af704c4dbf70f55bf2f756a16536
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 15 19:36:55 2018 +1000

    really add source for authopt_fuzz this time

commit 9201784b4a257c8345fbd740bcbdd70054885707
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 15 19:35:40 2018 +1000

    remove accidentally checked-in authopt_fuzz binary

commit beb9e522dc7717df08179f9e59f36b361bfa14ab
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 14 05:26:27 2018 +0000

    upstream: second try, deals properly with missing and private-only
    
    Use consistent format in debug log for keys readied, offered and
    received during public key authentication.
    
    This makes it a little easier to see what is going on, as each message
    now contains (where available) the key filename, its type and fingerprint,
    and whether the key is hosted in an agent or a token.
    
    OpenBSD-Commit-ID: f1c6a8e9cfc4e108c359db77f24f9a40e1e25ea7

commit 6bc5a24ac867bfdc3ed615589d69ac640f51674b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 14 15:16:34 2018 +1000

    fuzzer harness for authorized_keys option parsing

commit 6c8b82fc6929b6a9a3f645151b6ec26c5507d9ef
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 14 04:44:04 2018 +0000

    upstream: revert following; deals badly with agent keys
    
    revision 1.285
    date: 2018/09/14 04:17:12;  author: djm;  state: Exp;  lines: +47 -26;  commitid: lflGFcNb2X2HebaK;
    Use consistent format in debug log for keys readied, offered and
    received during public key authentication.
    
    This makes it a little easier to see what is going on, as each message
    now contains the key filename, its type and fingerprint, and whether
    the key is hosted in an agent or a token.
    
    OpenBSD-Commit-ID: e496bd004e452d4b051f33ed9ae6a54ab918f56d

commit 6da046f9c3374ce7e269ded15d8ff8bc45017301
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 14 04:17:44 2018 +0000

    upstream: garbage-collect moribund ssh_new_private() API.
    
    OpenBSD-Commit-ID: 7c05bf13b094093dfa01848a9306c82eb6e95f6c

commit 1f24ac5fc05252ceb1c1d0e8cab6a283b883c780
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 14 04:17:12 2018 +0000

    upstream: Use consistent format in debug log for keys readied,
    
    offered and received during public key authentication.
    
    This makes it a little easier to see what is going on, as each message
    now contains the key filename, its type and fingerprint, and whether
    the key is hosted in an agent or a token.
    
    OpenBSD-Commit-ID: 2a01d59285a8a7e01185bb0a43316084b4f06a1f

commit 488c9325bb7233e975dbfbf89fa055edc3d3eddc
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Thu Sep 13 15:23:32 2018 +0000

    upstream: Fix warnings caused by user_from_uid() and group_from_gid()
    
    now returning const char *.
    
    OpenBSD-Commit-ID: b5fe571ea77cfa7b9035062829ab05eb87d7cc6f

commit 0aa1f230846ebce698e52051a107f3127024a05a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 14 10:31:47 2018 +1000

    allow SIGUSR1 as synonym for SIGINFO
    
    Lets users on those unfortunate operating systems that lack SIGINFO
    still be able to obtain progress information from unit tests :)

commit d64e78526596f098096113fcf148216798c327ff
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 13 19:05:48 2018 +1000

    add compat header

commit a3fd8074e2e2f06602e25618721f9556c731312c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 13 09:03:20 2018 +0000

    upstream: missed a bit of openssl-1.0.x API in this unittest
    
    OpenBSD-Regress-ID: a73a54d7f7381856a3f3a2d25947bee7a9a5dbc9

commit 86e0a9f3d249d5580390daf58e015e68b01cef10
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 13 05:06:51 2018 +0000

    upstream: use only openssl-1.1.x API here too
    
    OpenBSD-Regress-ID: ae877064597c349954b1b443769723563cecbc8f

commit 48f54b9d12c1c79fba333bc86d455d8f4cda8cfc
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 13 12:13:50 2018 +1000

    adapt -portable to OpenSSL 1.1x API
    
    Polyfill missing API with replacement functions extracted from LibreSSL

commit 86112951d63d48839f035b5795be62635a463f99
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 13 12:12:42 2018 +1000

    forgot to stage these test files in commit d70d061

commit 482d23bcacdd3664f21cc82a5135f66fc598275f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 13 02:08:33 2018 +0000

    upstream: hold our collective noses and use the openssl-1.1.x API in
    
    OpenSSH; feedback and ok tb@ jsing@ markus@
    
    OpenBSD-Commit-ID: cacbcac87ce5da0d3ca7ef1b38a6f7fb349e4417

commit d70d061828730a56636ab6f1f24fe4a8ccefcfc1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 12 01:36:45 2018 +0000

    upstream: Include certs with multiple RSA signature variants in
    
    test data Ensure that cert->signature_key is populated correctly
    
    OpenBSD-Regress-ID: 56e68f70fe46cb3a193ca207385bdb301fd6603a

commit f803b2682992cfededd40c91818b653b5d923ef5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 12 01:23:48 2018 +0000

    upstream: test revocation by explicit hash and by fingerprint
    
    OpenBSD-Regress-ID: 079c18a9ab9663f4af419327c759fc1e2bc78fd8

commit 2de78bc7da70e1338b32feeefcc6045cf49efcd4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 12 01:22:43 2018 +0000

    upstream: s/sshkey_demote/sshkey_from_private/g
    
    OpenBSD-Regress-ID: 782bde7407d94a87aa8d1db7c23750e09d4443c4

commit 41c115a5ea1cb79a6a3182773c58a23f760e8076
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 12 16:50:01 2018 +1000

    delete the correct thing; kexfuzz binary

commit f0fcd7e65087db8c2496f13ed39d772f8e38b088
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 12 06:18:59 2018 +0000

    upstream: fix edit mistake; spotted by jmc@
    
    OpenBSD-Commit-ID: dd724e1c52c9d6084f4cd260ec7e1b2b138261c6

commit 4cc259bac699f4d2a5c52b92230f9e488c88a223
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 12 01:34:02 2018 +0000

    upstream: add SSH_ALLOWED_CA_SIGALGS - the default list of
    
    signature algorithms that are allowed for CA signatures. Notably excludes
    ssh-dsa.
    
    ok markus@
    
    OpenBSD-Commit-ID: 1628e4181dc8ab71909378eafe5d06159a22deb4

commit ba9e788315b1f6a350f910cb2a9e95b2ce584e89
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 12 01:32:54 2018 +0000

    upstream: add sshkey_check_cert_sigtype() that checks a
    
    cert->signature_type against a supplied whitelist; ok markus
    
    OpenBSD-Commit-ID: caadb8073292ed7a9535e5adc067d11d356d9302

commit a70fd4ad7bd9f2ed223ff635a3d41e483057f23b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 12 01:31:30 2018 +0000

    upstream: add cert->signature_type field and keep it in sync with
    
    certificate signature wrt loading and certification operations; ok markus@
    
    OpenBSD-Commit-ID: e8b8b9f76b66707a0cd926109c4383db8f664df3

commit 357128ac48630a9970e3af0e6ff820300a28da47
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 12 01:30:10 2018 +0000

    upstream: Add "ssh -Q sig" to allow listing supported signature
    
    algorithms ok markus@
    
    OpenBSD-Commit-ID: 7a8c6eb6c249dc37823ba5081fce64876d10fe2b

commit 9405c6214f667be604a820c6823b27d0ea77937d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 12 01:21:34 2018 +0000

    upstream: allow key revocation by SHA256 hash and allow ssh-keygen
    
    to create KRLs using SHA256/base64 key fingerprints; ok markus@
    
    OpenBSD-Commit-ID: a0590fd34e7f1141f2873ab3acc57442560e6a94

commit 50e2687ee0941c0ea216d6ffea370ffd2c1f14b9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 12 01:19:12 2018 +0000

    upstream: log certificate fingerprint in authentication
    
    success/failure message (previously we logged only key ID and CA key
    fingerprint).
    
    ok markus@
    
    OpenBSD-Commit-ID: a8ef2d172b7f1ddbcce26d6434b2de6d94f6c05d

commit de37ca909487d23e5844aca289b3f5e75d3f1e1f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 7 04:26:56 2018 +0000

    upstream: Add FALLTHROUGH comments where appropriate. Patch from
    
    jjelen at redhat via bz#2687.
    
    OpenBSD-Commit-ID: c48eb457be697a19d6d2950c6d0879f3ccc851d3

commit 247766cd3111d5d8c6ea39833a3257ca8fb820f2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 7 01:42:54 2018 +0000

    upstream: ssh -MM requires confirmation for all operations that
    
    change the multiplexing state, not just new sessions.
    
    mention that confirmation is checked via ssh-askpass
    
    OpenBSD-Commit-ID: 0f1b45551ebb9cc5c9a4fe54ad3b23ce90f1f5c2

commit db8bb80e3ac1bcb3e1305d846cd98c6b869bf03f
Author: mestre@openbsd.org <mestre@openbsd.org>
Date:   Tue Aug 28 12:25:53 2018 +0000

    upstream: fix misplaced parenthesis inside if-clause. it's harmless
    
    and the only issue is showing an unknown error (since it's not defined)
    during fatal(), if it ever an error occurs inside that condition.
    
    OK deraadt@ markus@ djm@
    
    OpenBSD-Commit-ID: acb0a8e6936bfbe590504752d01d1d251a7101d8

commit 086cc614f550b7d4f100c95e472a6b6b823938ab
Author: mestre@openbsd.org <mestre@openbsd.org>
Date:   Tue Aug 28 12:17:45 2018 +0000

    upstream: fix build with DEBUG_PK enabled
    
    OK dtucker@
    
    OpenBSD-Commit-ID: ec1568cf27726e9638a0415481c20c406e7b441c

commit 2678833013e97f8b18f09779b7f70bcbf5eb2ab2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 7 14:41:53 2018 +1000

    Handle ngroups>_SC_NGROUPS_MAX.
    
    Based on github pull request #99 from Darren Maffat at Oracle: Solaris'
    getgrouplist considers _SC_NGROUPS_MAX more of a guideline and can return
    a larger number of groups.  In this case, retry getgrouplist with a
    larger array and defer allocating groups_byname.  ok djm@

commit 039bf2a81797b8f3af6058d34005a4896a363221
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 7 14:06:57 2018 +1000

    Initial len for the fmt=NULL case.
    
    Patch from jjelen at redhat via bz#2687.  (OpenSSH never calls
    setproctitle with a null format so len is always initialized).

commit ea9c06e11d2e8fb2f4d5e02f8a41e23d2bd31ca9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Sep 7 14:01:39 2018 +1000

    Include stdlib.h.
    
    Patch from jjelen at redhat via bz#2687.

commit 9617816dbe73ec4d65075f4d897443f63a97c87f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 27 13:08:01 2018 +1000

    document some more regress control env variables
    
    Specifically SKIP_UNIT, USE_VALGRING and LTESTS. Sort the list of
    environment variables.
    
    Based on patch from Jakub Jelen

commit 71508e06fab14bc415a79a08f5535ad7bffa93d9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 23 15:41:42 2018 +1000

    shorten temporary SSH_REGRESS_TMP path
    
    Previous path was exceeding max socket length on at least one platform (OSX)

commit 26739cf5bdc9030a583b41ae5261dedd862060f0
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 23 13:06:02 2018 +1000

    rebuild dependencies

commit ff729025c7463cf5d0a8d1ca1823306e48c6d4cf
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 23 13:03:32 2018 +1000

    fix path in distclean target
    
    Patch from Jakub Jelen

commit 7fef173c28f7462dcd8ee017fdf12b5073f54c02
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 23 03:01:08 2018 +0000

    upstream: memleak introduced in r1.83; from Colin Watson
    
    OpenBSD-Commit-ID: 5c019104c280cbd549a264a7217b67665e5732dc

commit b8ae02a2896778b8984c7f51566c7f0f56fa8b56
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Tue Aug 21 13:56:27 2018 +0000

    upstream: AIX reports the CODESET as "ISO8859-1" in the POSIX locale.
    
    Treating that as a safe encoding is OK because even when other systems return
    that string for real ISO8859-1, it is still safe in the sense that it is
    ASCII-compatible and stateless.
    
    Issue reported by Val dot Baranov at duke dot edu.  Additional
    information provided by Michael dot Felt at felt dot demon dot nl.
    Tested by Michael Felt on AIX 6.1 and by Val Baranov on AIX 7.1.
    Tweak and OK djm@.
    
    OpenBSD-Commit-ID: 36f1210e0b229817d10eb490d6038f507b8256a7

commit bc44ee088ad269d232e514f037c87ada4c2fd3f0
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Aug 21 08:57:24 2018 -0700

            modified:   openbsd-compat/port-uw.c
            remove obsolete and un-needed include

commit 829fc28a9c54e3f812ee7248c7a3e31eeb4f0b3a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 20 15:57:29 2018 +1000

    Missing unistd.h for regress/mkdtemp.c

commit c8313e492355a368a91799131520d92743d8d16c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 17 05:45:20 2018 +1000

    update version numbers in anticipation of release

commit 477b49a34b89f506f4794b35e3c70b3e2e83cd38
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Mon Aug 13 17:08:51 2018 +0200

    configure: work around GCC shortcoming on Cygwin
    
    Cygwin's latest 7.x GCC allows to specify -mfunction-return=thunk
    as well as -mindirect-branch=thunk on the command line, albeit
    producing invalid code, leading to an error at link stage.
    
    The check in configure.ac only checks if the option is present,
    but not if it produces valid code.
    
    This patch fixes it by special-casing Cygwin.  Another solution
    may be to change these to linker checks.
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

commit b0917945efa374be7648d67dbbaaff323ab39edc
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Mon Aug 13 17:05:05 2018 +0200

    cygwin: add missing stdarg.h include
    
    Further header file standarization in Cygwin uncovered a lazy
    indirect include in bsd-cygwin_util.c
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

commit c3903c38b0fd168ab3d925c2b129d1a599593426
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Aug 13 02:41:05 2018 +0000

    upstream: revert compat.[ch] section of the following change. It
    
    causes double-free under some circumstances.
    
    --
    
    date: 2018/07/31 03:07:24;  author: djm;  state: Exp;  lines: +33 -18;  commitid: f7g4UI8eeOXReTPh;
    fix some memory leaks spotted by Coverity via Jakub Jelen in bz#2366
    feedback and ok dtucker@
    
    OpenBSD-Commit-ID: 1e77547f60fdb5e2ffe23e2e4733c54d8d2d1137

commit 1b9dd4aa15208100fbc3650f33ea052255578282
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Aug 12 20:19:13 2018 +0000

    upstream: better diagnosics on alg list assembly errors; ok
    
    deraadt@ markus@
    
    OpenBSD-Commit-ID: 5a557e74b839daf13cc105924d2af06a1560faee

commit e36a5f61b0f5bebf6d49c215d228cd99dfe86e28
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 11 18:08:45 2018 -0700

    Some AIX fixes; report from Michael Felt

commit 2f4766ceefe6657c5ad5fe92d13c411872acae0e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Aug 10 01:35:49 2018 +0000

    upstream: The script that cooks up PuTTY format host keys does not
    
    understand the new key format so convert back to old format to create the
    PuTTY key and remove it once done.
    
    OpenBSD-Regress-ID: 2a449a18846c3a144bc645135b551ba6177e38d3

commit e1b26ce504662a5d5b991091228984ccfd25f280
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 10 00:44:01 2018 +0000

    upstream: improve
    
    OpenBSD-Commit-ID: 40d839db0977b4e7ac8b647b16d5411d4faf2f60

commit 7c712966a3139622f7fb55045368d05de4e6782c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 10 00:42:29 2018 +0000

    upstream: Describe pubkey format, prompted by bz#2853
    
    While I'm here, describe and link to the remaining local PROTOCOL.*
    docs that weren't already mentioned (PROTOCOL.key, PROTOCOL.krl and
    PROTOCOL.mux)
    
    OpenBSD-Commit-ID: 2a900f9b994ba4d53e7aeb467d44d75829fd1231

commit ef100a2c5a8ed83afac0b8f36520815803da227a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 10 00:27:15 2018 +0000

    upstream: fix numbering
    
    OpenBSD-Commit-ID: bc7a1764dff23fa4c5ff0e3379c9c4d5b63c9596

commit ed7bd5d93fe14c7bd90febd29b858ea985d14d45
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 8 01:16:01 2018 +0000

    upstream: Use new private key format by default. This format is
    
    suported by OpenSSH >= 6.5 (released January 2014), so it should be supported
    by most OpenSSH versions in active use.
    
    It is possible to convert new-format private keys to the older
    format using "ssh-keygen -f /path/key -pm PEM".
    
    ok deraadt dtucker
    
    OpenBSD-Commit-ID: e3bd4f2509a2103bfa2f710733426af3ad6d8ab8

commit 967226a1bdde59ea137e8f0df871854ff7b91366
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 4 00:55:06 2018 +0000

    upstream: invalidate dh->priv_key after freeing it in error path;
    
    avoids unlikely double-free later. Reported by Viktor Dukhovni via
    https://github.com/openssh/openssh-portable/pull/96 feedback jsing@ tb@
    
    OpenBSD-Commit-ID: e317eb17c3e05500ae851f279ef6486f0457c805

commit 74287f5df9966a0648b4a68417451dd18f079ab8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 31 03:10:27 2018 +0000

    upstream: delay bailout for invalid authentic
    
    =?UTF-8?q?ating=20user=20until=20after=20the=20packet=20containing=20the?=
    =?UTF-8?q?=20request=20has=20been=20fully=20parsed.=20Reported=20by=20Dar?=
    =?UTF-8?q?iusz=20Tytko=20and=20Micha=C5=82=20Sajdak;=20ok=20deraadt?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: b4891882fbe413f230fe8ac8a37349b03bd0b70d

commit 1a66079c0669813306cc69e5776a4acd9fb49015
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 31 03:07:24 2018 +0000

    upstream: fix some memory leaks spotted by Coverity via Jakub Jelen
    
    in bz#2366 feedback and ok dtucker@
    
    OpenBSD-Commit-ID: 8402bbae67d578bedbadb0ce68ff7c5a136ef563

commit 87f08be054b7eeadbb9cdeb3fb4872be79ccf218
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 20 13:18:28 2018 +1000

    Remove support for S/Key
    
    Most people will 1) be using modern multi-factor authentication methods
    like TOTP/OATH etc and 2) be getting support for multi-factor
    authentication via PAM or BSD Auth.

commit 5d14019ba2ff54acbfd20a6b9b96bb860a8c7c31
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Jul 27 12:03:17 2018 +0000

    upstream: avoid expensive channel_open_message() calls; ok djm@
    
    OpenBSD-Commit-ID: aea3b5512ad681cd8710367d743e8a753d4425d9

commit e655ee04a3cb7999dbf9641b25192353e2b69418
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 27 05:34:42 2018 +0000

    upstream: Now that ssh can't be setuid, remove the
    
    original_real_uid and original_effective_uid globals and replace with calls
    to plain getuid(). ok djm@
    
    OpenBSD-Commit-ID: 92561c0cd418d34e6841e20ba09160583e27b68c

commit 73ddb25bae4c33a0db361ac13f2e3a60d7c6c4a5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 27 05:13:02 2018 +0000

    upstream: Remove uid checks from low port binds. Now that ssh
    
    cannot be setuid and sshd always has privsep on, we can remove the uid checks
    for low port binds and just let the system do the check. We leave a sanity
    check for the !privsep case so long as the code is stil there.  with & ok
    djm@
    
    OpenBSD-Commit-ID: 9535cfdbd1cd54486fdbedfaee44ce4367ec7ca0

commit c12033e102760d043bc5c98e6c8180e4d331b0df
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 27 03:55:22 2018 +0000

    upstream: ssh(1) no longer supports being setuid root. Remove reference
    
    to crc32 which went with protocol 1.  Pointed out by deraadt@.
    
    OpenBSD-Commit-ID: f8763c25fd96ed91dd1abdab5667fd2e27e377b6

commit 4492e2ec4e1956a277ef507f51d66e5c2aafaaf8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 27 14:15:28 2018 +1000

    correct snprintf truncation check in closefrom()
    
    Truncation cannot happen unless the system has set PATH_MAX to some
    nonsensically low value.
    
    bz#2862, patch from Daniel Le

commit 149cab325a8599a003364ed833f878449c15f259
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 27 13:46:06 2018 +1000

    Include stdarg.h in mkdtemp for va_list.

commit 6728f31bdfdc864d192773c32465b1860e23f556
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed Jul 25 17:12:35 2018 +0000

    upstream: Don't redefine Makefile choices which come correct from
    
    bsd.*.mk ok markus
    
    OpenBSD-Commit-ID: 814b2f670df75759e1581ecef530980b2b3d7e0f

commit 21fd477a855753c1a8e450963669e28e39c3b5d2
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed Jul 25 13:56:23 2018 +0000

    upstream: fix indent; Clemens Goessnitzer
    
    OpenBSD-Commit-ID: b5149a6d92b264d35f879d24608087b254857a83

commit 8e433c2083db8664c41499ee146448ea7ebe7dbf
Author: beck@openbsd.org <beck@openbsd.org>
Date:   Wed Jul 25 13:10:56 2018 +0000

    upstream: Use the caller provided (copied) pwent struct in
    
    load_public_identity_files instead of calling getpwuid() again and discarding
    the argument. This prevents a client crash where tilde_expand_filename calls
    getpwuid() again before the pwent pointer is used. Issue noticed and reported
    by Pierre-Olivier Martel <pom@apple.com> ok djm@ deraadt@
    
    OpenBSD-Commit-ID: a067d74b5b098763736c94cc1368de8ea3f0b157

commit e2127abb105ae72b6fda64fff150e6b24b3f1317
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Jul 23 19:53:55 2018 +0000

    upstream: oops, failed to notice that SEE ALSO got messed up;
    
    OpenBSD-Commit-ID: 61c1306542cefdc6e59ac331751afe961557427d

commit ddf1b797c2d26bbbc9d410aa4f484cbe94673587
Author: kn@openbsd.org <kn@openbsd.org>
Date:   Mon Jul 23 19:02:49 2018 +0000

    upstream: Point to glob in section 7 for the actual list of special
    
    characters instead the C API in section 3.
    
    OK millert jmc nicm, "the right idea" deraadt
    
    OpenBSD-Commit-ID: a74fd215488c382809e4d041613aeba4a4b1ffc6

commit 01c98d9661d0ed6156e8602b650f72eed9fc4d12
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jul 22 12:16:59 2018 +0000

    upstream: Switch authorized_keys example from ssh-dss to ssh-rsa
    
    since the former is no longer enabled by default.  Pointed out by Daniel A.
    Maierhofer, ok jmc
    
    OpenBSD-Commit-ID: 6a196cef53d7524e0c9b58cdbc1b5609debaf8c7

commit 472269f8fe19343971c2d08f504ab5cbb8234b33
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 20 05:01:10 2018 +0000

    upstream: slightly-clearer description for AuthenticationMethods - the
    
    lists have comma-separated elements; bz#2663 from Hans Meier
    
    OpenBSD-Commit-ID: 931c983d0fde4764d0942fb2c2b5017635993b5a

commit c59aca8adbdf7f5597084ad360a19bedb3f80970
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 20 14:53:42 2018 +1000

    Create control sockets in clean temp directories
    
    Adds a regress/mkdtemp tool and uses it to create empty temp
    directories for tests needing control sockets.
    
    Patch from Colin Watson via bz#2660; ok dtucker

commit 6ad8648e83e4f4ace37b742a05c2a6b6b872514e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 20 03:46:34 2018 +0000

    upstream: remove unused zlib.h
    
    OpenBSD-Commit-ID: 8d274a9b467c7958df12668b49144056819f79f1

commit 3ba6e6883527fe517b6e4a824876e2fe62af22fc
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jul 19 23:03:16 2018 +0000

    upstream: Fix typo in comment. From Alexandru Iacob via github.
    
    OpenBSD-Commit-ID: eff4ec07c6c8c5483533da43a4dda37d72ef7f1d

commit c77bc73c91bc656e343a1961756e09dd1b170820
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 20 13:48:51 2018 +1000

    Explicitly include openssl before zlib.
    
    Some versions of OpenSSL have "free_func" in their headers, which zlib
    typedefs.  Including openssl after zlib (eg via sshkey.h) results in
    "syntax error before `free_func'", which this fixes.

commit 95d41e90eafcd1286a901e8e361e4a37b98aeb52
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jul 19 10:28:47 2018 +0000

    upstream: Deprecate UsePrivilegedPort now that support for running
    
    ssh(1) setuid has been removed, remove supporting code and clean up
    references to it in the man pages
    
    We have not shipped ssh(1) the setuid bit since 2002.  If ayone
    really needs to make connections from a low port number this can
    be implemented via a small setuid ProxyCommand.
    
    ok markus@ jmc@ djm@
    
    OpenBSD-Commit-ID: d03364610b7123ae4c6792f5274bd147b6de717e

commit 258dc8bb07dfb35a46e52b0822a2c5b7027df60a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jul 18 11:34:04 2018 +0000

    upstream: Remove support for running ssh(1) setuid and fatal if
    
    attempted. Do not link uidwap.c into ssh any more.  Neuters
    UsePrivilegedPort, which will be marked as deprecated shortly. ok markus@
    djm@
    
    OpenBSD-Commit-ID: c4ba5bf9c096f57a6ed15b713a1d7e9e2e373c42

commit ac590760b251506b0a152551abbf8e8d6dc2f527
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 16 22:25:01 2018 +0000

    upstream: Slot 0 in the hostbased key array was previously RSA1,
    
    but that is now gone and the slot is unused so remove it.  Remove two
    now-unused macros, and add an array bounds check to the two remaining ones
    (array is statically sized, so mostly a safety check on future changes). ok
    markus@
    
    OpenBSD-Commit-ID: 2e4c0ca6cc1d8daeccead2aa56192a3f9d5e1e7a

commit 26efc2f5df0e3bcf6a6bbdd0506fd682d60c2145
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 16 11:05:41 2018 +0000

    upstream: Remove support for loading HostBasedAuthentication keys
    
    directly in ssh(1) and always use ssh-keysign.  This removes one of the few
    remaining reasons why ssh(1) might be setuid.  ok markus@
    
    OpenBSD-Commit-ID: 97f01e1448707129a20d75f86bad5d27c3cf0b7d

commit 3eb7f1038d17af7aea3c2c62d1e30cd545607640
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 16 07:06:50 2018 +0000

    upstream: keep options.identity_file_userprovided array in sync when we
    
    load keys, fixing some spurious error messages; ok markus
    
    OpenBSD-Commit-ID: c63e3d5200ee2cf9e35bda98de847302566c6a00

commit 2f131e1b34502aa19f345e89cabf6fa3fc097f09
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 16 03:09:59 2018 +0000

    upstream: memleak in unittest; found by valgrind
    
    OpenBSD-Regress-ID: 168c23b0fb09fc3d0b438628990d3fd9260a8a5e

commit de2997a4cf22ca0a524f0e5b451693c583e2fd89
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 16 03:09:13 2018 +0000

    upstream: memleaks; found by valgrind
    
    OpenBSD-Commit-ID: 6c3ba22be53e753c899545f771e8399fc93cd844

commit 61cc0003eb37fa07603c969c12b7c795caa498f3
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Jul 14 16:49:01 2018 +1000

    Undef a few new macros in sys-queue.h.
    
    Prevents macro redefinition warnings on OSX.

commit 30a2c213877a54a44dfdffb6ca8db70be5b457e0
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 13 13:40:20 2018 +1000

    Include unistd.h for geteuid declaration.

commit 1dd32c23f2a85714dfafe2a9cc516971d187caa4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 13 13:38:10 2018 +1000

    Fallout from buffer conversion in AUDIT_EVENTS.
    
    Supply missing "int r" and fix error path for sshbuf_new().

commit 7449c178e943e5c4f6c8416a4e41d93b70c11c9e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 13 02:13:50 2018 +0000

    upstream: make this use ssh_proxy rather than starting/stopping a
    
    daemon for each testcase
    
    OpenBSD-Regress-ID: 608b7655ea65b1ba8fff5a13ce9caa60ef0c8166

commit dbab02f9208d9baa134cec1d007054ec82b96ca9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 13 02:13:19 2018 +0000

    upstream: fix leaks in unit test; with this, all unit tests are
    
    leak free (as far as valgrind can spot anyway)
    
    OpenBSD-Regress-ID: b824d8b27998365379963440e5d18b95ca03aa17

commit 2f6accff5085eb79b0dbe262d8b85ed017d1a51c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 13 11:39:25 2018 +1000

    Enable leak checks for unit tests with valgrind
    
    Leave the leak checking on unconditionally when running with valgrind.
    The unit tests are leak-free and I want them to stay that way.

commit e46cfbd9db5e907b821bf4fd0184d4dab99815ee
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 13 11:38:59 2018 +1000

    increase timeout to match cfgmatch.sh
    
    lets test pass under valgrind (on my workstation at least)

commit 6aa1bf475cf3e7a2149acc5a1e80e904749f064c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 12 14:54:18 2018 +1000

    rm regress/misc/kexfuzz/*.o in distclean target

commit eef1447ddb559c03725a23d4aa6d03f40e8b0049
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 12 14:49:26 2018 +1000

    repair !WITH_OPENSSL build

commit 4d3b2f36fd831941d1627ac587faae37b6d3570f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 12 14:49:14 2018 +1000

    missing headers

commit 3f420a692b293921216549c1099c2e46ff284eae
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 12 14:57:46 2018 +1000

    Remove key.h from portable files too.
    
    Commit 5467fbcb removed key.h so stop including it in portable files
    too.  Fixes builds on lots of platforms.

commit e2c4af311543093f16005c10044f7e06af0426f0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 12 04:35:25 2018 +0000

    upstream: remove prototype to long-gone function
    
    OpenBSD-Commit-ID: 0414642ac7ce01d176b9f359091a66a8bbb640bd

commit 394a842e60674bf8ee5130b9f15b01452a0b0285
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jul 11 18:55:11 2018 +0000

    upstream: treat ssh_packet_write_wait() errors as fatal; ok djm@
    
    OpenBSD-Commit-ID: f88ba43c9d54ed2d911218aa8d3f6285430629c3

commit 5467fbcb09528ecdcb914f4f2452216c24796790
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jul 11 18:53:29 2018 +0000

    upstream: remove legacy key emulation layer; ok djm@
    
    OpenBSD-Commit-ID: 2b1f9619259e222bbd4fe9a8d3a0973eafb9dd8d

commit 5dc4c59d5441a19c99e7945779f7ec9051126c25
Author: martijn@openbsd.org <martijn@openbsd.org>
Date:   Wed Jul 11 08:19:35 2018 +0000

    upstream: s/wuth/with/ in comment
    
    OpenBSD-Commit-ID: 9de41468afd75f54a7f47809d2ad664aa577902c

commit 1c688801e9dd7f9889fb2a29bc2b6fbfbc35a11f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 11 12:12:38 2018 +1000

    Include stdlib.h for declaration of free.
    
    Fixes build with -Werror on at least Fedora and probably others.

commit fccfa239def497615f92ed28acc57cfe63da3666
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 11 10:19:56 2018 +1000

    VALGRIND_CHECK_LEAKS logic was backwards :(

commit 416287d45fcde0a8e66eee8b99aa73bd58607588
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 11 10:10:26 2018 +1000

    Fix sshbuf_new error path in skey.

commit 7aab109b8b90a353c1af780524f1ac0d3af47bab
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 11 10:06:18 2018 +1000

    Supply missing third arg in skey.
    
    During the change to the new buffer api the third arg to
    sshbuf_get_cstring was ommitted.  Fixes build when configured with skey.

commit 380320bb72cc353a901790ab04b6287fd335dc4a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 11 10:03:34 2018 +1000

    Supply some more missing "int r" in skey

commit d20720d373d8563ee737d1a45dc5e0804d622dbc
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 11 09:56:36 2018 +1000

    disable valgrind memleak checking by default
    
    Add VALGRIND_CHECK_LEAKS knob to turn it back on.

commit 79c9d35018f3a5e30ae437880b669aa8636cd3cd
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jul 11 09:54:00 2018 +1000

    Supply missing "int r" in skey code.

commit 984bacfaacbbe31c35191b828fb5b5b2f0362c36
Author: sf@openbsd.org <sf@openbsd.org>
Date:   Tue Jul 10 09:36:58 2018 +0000

    upstream: re-remove some pre-auth compression bits
    
    This time, make sure to not remove things that are necessary for
    pre-auth compression on the client. Add a comment that pre-auth
    compression is still supported in the client.
    
    ok markus@
    
    OpenBSD-Commit-ID: 282c6fec7201f18a5c333bbb68d9339734d2f784

commit 120a1ec74e8d9d29f4eb9a27972ddd22351ddef9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 10 19:39:52 2018 +1000

    Adapt portable to legacy buffer API removal

commit 0f3958c1e6ffb8ea4ba27e2a97a00326fce23246
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 10 09:13:30 2018 +0000

    upstream: kerberos/gssapi fixes for buffer removal
    
    OpenBSD-Commit-ID: 1cdf56fec95801e4563c47f21696f04cd8b60c4c

commit c74ae8e7c45f325f3387abd48fa7dfef07a08069
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 10 06:45:29 2018 +0000

    upstream: buffer.[ch] and bufaux.c are no more
    
    OpenBSD-Commit-ID: d1a1852284e554f39525eb4d4891b207cfb3d3a0

commit a881e5a133d661eca923fb0633a03152ab2b70b2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 10 06:43:52 2018 +0000

    upstream: one mention of Buffer that almost got away :)
    
    OpenBSD-Commit-ID: 30d7c27a90b4544ad5dfacf654595710cd499f02

commit 49f47e656b60bcd1d1db98d88105295f4b4e600d
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 9 21:59:10 2018 +0000

    upstream: replace cast with call to sshbuf_mutable_ptr(); ok djm@
    
    OpenBSD-Commit-ID: 4dfe9d29fa93d9231645c89084f7217304f7ba29

commit cb30cd47041edb03476be1c8ef7bc1f4b69d1555
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 9 21:56:06 2018 +0000

    upstream: remove legacy buffer API emulation layer; ok djm@
    
    OpenBSD-Commit-ID: 2dd5dc17cbc23195be4299fa93be2707a0e08ad9

commit 235c7c4e3bf046982c2d8242f30aacffa01073d1
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 9 21:53:45 2018 +0000

    upstream: sshd: switch monitor to sshbuf API; lots of help & ok
    
    djm@
    
    OpenBSD-Commit-ID: d89bd02d33974fd35ca0b8940d88572227b34a48

commit b8d9214d969775e409e1408ecdf0d58fad99b344
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 9 21:37:55 2018 +0000

    upstream: sshd: switch GSSAPI to sshbuf API; ok djm@
    
    OpenBSD-Commit-ID: e48449ab4be3f006f7ba33c66241b7d652973e30

commit c7d39ac8dc3587c5f05bdd5bcd098eb5c201c0c8
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 9 21:35:50 2018 +0000

    upstream: sshd: switch authentication to sshbuf API; ok djm@
    
    OpenBSD-Commit-ID: 880aa06bce4b140781e836bb56bec34873290641

commit c3cb7790e9efb14ba74b2d9f543ad593b3d55b31
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 9 21:29:36 2018 +0000

    upstream: sshd: switch config to sshbuf API; ok djm@
    
    OpenBSD-Commit-ID: 72b02017bac7feac48c9dceff8355056bea300bd

commit 2808d18ca47ad3d251836c555f0e22aaca03d15c
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 9 21:26:02 2018 +0000

    upstream: sshd: switch loginmsg to sshbuf API; ok djm@
    
    OpenBSD-Commit-ID: f3cb4e54bff15c593602d95cc43e32ee1a4bac42

commit 89dd615b8b531979be63f05f9d5624367c9b28e6
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 9 21:20:26 2018 +0000

    upstream: ttymodes: switch to sshbuf API; ok djm@
    
    OpenBSD-Commit-ID: 5df340c5965e822c9da21e19579d08dea3cbe429

commit f4608a7065480516ab46214f554e5f853fb7870f
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 9 21:18:10 2018 +0000

    upstream: client: switch mux to sshbuf API; with & ok djm@
    
    OpenBSD-Commit-ID: 5948fb98d704f9c4e075b92edda64e0290b5feb2

commit cecee2d607099a7bba0a84803e2325d15be4277b
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 9 21:03:30 2018 +0000

    upstream: client: switch to sshbuf API; ok djm@
    
    OpenBSD-Commit-ID: 60cb0356114acc7625ab85105f6f6a7cd44a8d05

commit ff55f4ad898137d4703e7a2bcc81167dfe8e9324
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 9 20:39:28 2018 +0000

    upstream: pkcs11: switch to sshbuf API; ok djm@
    
    OpenBSD-Commit-ID: 98cc4e800f1617c51caf59a6cb3006f14492db79

commit 168b46f405d6736960ba7930389eecb9b6710b7e
Author: sf@openbsd.org <sf@openbsd.org>
Date:   Mon Jul 9 13:37:10 2018 +0000

    upstream: Revert previous two commits
    
    It turns out we still support pre-auth compression on the client.
    Therefore revert the previous two commits:
    
    date: 2018/07/06 09:06:14;  author: sf;  commitid: yZVYKIRtUZWD9CmE;
     Rename COMP_DELAYED to COMP_ZLIB
    
     Only delayed compression is supported nowadays.
    
     ok markus@
    
    date: 2018/07/06 09:05:01;  author: sf;  commitid: rEGuT5UgI9f6kddP;
     Remove leftovers from pre-authentication compression
    
     Support for this has been removed in 2016.
     COMP_DELAYED will be renamed in a later commit.
    
     ok markus@
    
    OpenBSD-Commit-ID: cdfef526357e4e1483c86cf599491b2dafb77772

commit ab39267fa1243d02b6c330615539fc4b21e17dc4
Author: sf@openbsd.org <sf@openbsd.org>
Date:   Fri Jul 6 09:06:14 2018 +0000

    upstream: Rename COMP_DELAYED to COMP_ZLIB
    
    Only delayed compression is supported nowadays.
    
    ok markus@
    
    OpenBSD-Commit-ID: 5b1dbaf3d9a4085aaa10fec0b7a4364396561821

commit 95db395d2e56a6f868193aead6cadb2493f036c6
Author: sf@openbsd.org <sf@openbsd.org>
Date:   Fri Jul 6 09:05:01 2018 +0000

    upstream: Remove leftovers from pre-authentication compression
    
    Support for this has been removed in 2016.
    COMP_DELAYED will be renamed in a later commit.
    
    ok markus@
    
    OpenBSD-Commit-ID: 6a99616c832627157113fcb0cf5a752daf2e6b58

commit f28a4d5cd24c4aa177e96b4f96957991e552cb70
Author: sf@openbsd.org <sf@openbsd.org>
Date:   Fri Jul 6 09:03:02 2018 +0000

    upstream: Remove unused ssh_packet_start_compression()
    
    ok markus@
    
    OpenBSD-Commit-ID: 9d34cf2f59aca5422021ae2857190578187dc2b4

commit 872517ddbb72deaff31d4760f28f2b0a1c16358f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jul 6 13:32:02 2018 +1000

    Defer setting bufsiz in getdelim.
    
    Do not write to bufsiz until we are sure the malloc has succeeded,
    in case any callers rely on it (which they shouldn't).  ok djm@

commit 3deb56f7190a414dc264e21e087a934fa1847283
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Jul 5 13:32:01 2018 +1000

    Fix other callers of read_environment_file.
    
    read_environment_file recently gained an extra argument   Some platform
    specific code also calls it so add the argument to those too.  Fixes
    build on Solaris and AIX.

commit 314908f451e6b2d4ccf6212ad246fa4619c721d3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 4 13:51:45 2018 +0000

    upstream: deal with API rename: match_filter_list() =>
    
    match_filter_blacklist()
    
    OpenBSD-Regress-ID: 2da342be913efeb51806351af906fab01ba4367f

commit 89f54cdf6b9cf1cf5528fd33897f1443913ddfb4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 4 13:51:12 2018 +0000

    upstream: exercise new expansion behaviour of
    
    PubkeyAcceptedKeyTypes and, by proxy, test kex_assemble_names()
    
    ok markus@
    
    OpenBSD-Regress-ID: 292978902e14d5729aa87e492dd166c842f72736

commit 187633f24c71564e970681c8906df5a6017dcccf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 3 13:53:26 2018 +0000

    upstream: add a comment that could have saved me 45 minutes of wild
    
    goose chasing
    
    OpenBSD-Regress-ID: d469b29ffadd3402c090e21b792d627d46fa5297

commit 312d2f2861a2598ed08587cb6c45c0e98a85408f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 4 13:49:31 2018 +0000

    upstream: repair PubkeyAcceptedKeyTypes (and friends) after RSA
    
    signature work - returns ability to add/remove/specify algorithms by
    wildcard.
    
    Algorithm lists are now fully expanded when the server/client configs
    are finalised, so errors are reported early and the config dumps
    (e.g. "ssh -G ...") now list the actual algorithms selected.
    
    Clarify that, while wildcards are accepted in algorithm lists, they
    aren't full pattern-lists that support negation.
    
    (lots of) feedback, ok markus@
    
    OpenBSD-Commit-ID: a8894c5c81f399a002f02ff4fe6b4fa46b1f3207

commit 303af5803bd74bf05d375c04e1a83b40c30b2be5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 3 11:43:49 2018 +0000

    upstream: some magic for RSA-SHA2 checks
    
    OpenBSD-Regress-ID: e5a9b11368ff6d86e7b25ad10ebe43359b471cd4

commit 7d68e262944c1fff1574600fe0e5e92ec8b398f5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 3 23:27:11 2018 +1000

    depend

commit b4d4eda633af433d20232cbf7e855ceac8b83fe5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 3 13:20:25 2018 +0000

    upstream: some finesse to fix RSA-SHA2 certificate authentication
    
    for certs hosted in ssh-agent
    
    OpenBSD-Commit-ID: e5fd5edd726137dda2d020e1cdebc464110a010f

commit d78b75df4a57e0f92295f24298e5f2930e71c172
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 3 13:07:58 2018 +0000

    upstream: check correct variable; unbreak agent keys
    
    OpenBSD-Commit-ID: c36981fdf1f3ce04966d3310826a3e1e6233d93e

commit 2f30300c5e15929d0e34013f38d73e857f445e12
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 3 11:42:12 2018 +0000

    upstream: crank version number to 7.8; needed for new compat flag
    
    for prior version; part of RSA-SHA2 strictification, ok markus@
    
    OpenBSD-Commit-ID: 84a11fc0efd2674c050712336b5093f5d408e32b

commit 4ba0d54794814ec0de1ec87987d0c3b89379b436
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 3 11:39:54 2018 +0000

    upstream: Improve strictness and control over RSA-SHA2 signature
    
    In ssh, when an agent fails to return a RSA-SHA2 signature when
    requested and falls back to RSA-SHA1 instead, retry the signature to
    ensure that the public key algorithm sent in the SSH_MSG_USERAUTH
    matches the one in the signature itself.
    
    In sshd, strictly enforce that the public key algorithm sent in the
    SSH_MSG_USERAUTH message matches what appears in the signature.
    
    Make the sshd_config PubkeyAcceptedKeyTypes and
    HostbasedAcceptedKeyTypes options control accepted signature algorithms
    (previously they selected supported key types). This allows these
    options to ban RSA-SHA1 in favour of RSA-SHA2.
    
    Add new signature algorithms "rsa-sha2-256-cert-v01@openssh.com" and
    "rsa-sha2-512-cert-v01@openssh.com" to force use of RSA-SHA2 signatures
    with certificate keys.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: c6e9f6d45eed8962ad502d315d7eaef32c419dde

commit 95344c257412b51199ead18d54eaed5bafb75617
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 3 10:59:35 2018 +0000

    upstream: allow sshd_config PermitUserEnvironment to accept a
    
    pattern-list of whitelisted environment variable names in addition to yes|no.
    
    bz#1800, feedback and ok markus@
    
    OpenBSD-Commit-ID: 77dc2b468e0bf04b53f333434ba257008a1fdf24

commit 6f56fe4b9578b0627667f8bce69d4d938a88324c
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Tue Jun 26 11:23:59 2018 +0000

    upstream: Fix "WARNING: line 6 disappeared in /etc/moduli, giving up"
    
    when choosing a prime.  An extra increment of linenum snuck in as part of the
    conversion to getline().  OK djm@ markus@
    
    OpenBSD-Commit-ID: 0019225cb52ed621b71cd9f19ee2e78e57e3dd38

commit 1eee79a11c1b3594f055b01e387c49c9a6e80005
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 2 14:13:30 2018 +0000

    upstream: One ampersand is enough to backgroud an process. OpenBSD
    
    doesn't seem to mind, but some platforms in -portable object to the second.
    
    OpenBSD-Regress-ID: d6c3e404871764343761dc25c3bbe29c2621ff74

commit 6301e6c787d4e26bfae1119ab4f747bbcaa94e44
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Jul 2 21:16:58 2018 +1000

    Add implementation of getline.
    
    Add getline for the benefit of platforms that don't have it.  Sourced
    from NetBSD (OpenBSD's implementation is a little too chummy with the
    internals of FILE).

commit 84623e0037628f9992839063151f7a9f5f13099a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 26 02:02:36 2018 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: 9276951caf4daf555f6d262e95720e7f79244572

commit 90e51d672711c19a36573be1785caf35019ae7a8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 25 22:28:33 2018 +0000

    upstream: fix NULL dereference in open_listen_match_tcpip()
    
    OpenBSD-Commit-ID: c968c1d29e392352383c0f9681fcc1e93620c4a9

commit f535ff922a67d9fcc5ee69d060d1b21c8bb01d14
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Jun 19 05:36:57 2018 +0000

    upstream: spelling;
    
    OpenBSD-Commit-ID: db542918185243bea17202383a581851736553cc

commit 80e199d6175904152aafc5c297096c3e18297691
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 19 03:02:17 2018 +0000

    upstream: test PermitListen with bare port numbers
    
    OpenBSD-Regress-ID: 4b50a02dfb0ccaca08247f3877c444126ba901b3

commit 87ddd676da0f3abd08b778b12b53b91b670dc93c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 19 02:59:41 2018 +0000

    upstream: allow bare port numbers to appear in PermitListen directives,
    
    e.g.
    
    PermitListen 2222 8080
    
    is equivalent to:
    
    PermitListen *:2222 *:8080
    
    Some bonus manpage improvements, mostly from markus@
    
    "looks fine" markus@
    
    OpenBSD-Commit-ID: 6546b0cc5aab7f53d65ad0a348ca0ae591d6dd24

commit 26f96ca10ad0ec5da9b05b99de1e1ccea15a11be
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 15 07:01:11 2018 +0000

    upstream: invalidate supplemental group cache used by
    
    temporarily_use_uid() when the target uid differs; could cause failure to
    read authorized_keys under some configurations. patch by Jakub Jelen via
    bz2873; ok dtucker, markus
    
    OpenBSD-Commit-ID: 48a345f0ee90f6c465a078eb5e89566b23abd8a1

commit 89a85d724765b6b82e0135ee5a1181fdcccea9c6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jun 10 23:45:41 2018 +0000

    upstream: unbreak SendEnv; patch from tb@
    
    OpenBSD-Commit-ID: fc808daced813242563b80976e1478de95940056

commit acf4260f0951f89c64e1ebbc4c92f451768871ad
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Jun 9 06:36:31 2018 +0000

    upstream: sort previous;
    
    OpenBSD-Commit-ID: 27d80d8b8ca99bc33971dee905e8ffd0053ec411

commit 1678d4236451060b735cb242d2e26e1ac99f0947
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 9 03:18:11 2018 +0000

    upstream: slightly better wording re handing of $TERM, from Jakub
    
    Jelen via bz2386
    
    OpenBSD-Commit-ID: 14bea3f069a93c8be66a7b97794255a91fece964

commit 28013759f09ed3ebf7e8335e83a62936bd7a7f47
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 9 03:03:10 2018 +0000

    upstream: add a SetEnv directive for sshd_config to allow an
    
    administrator to explicitly specify environment variables set in sessions
    started by sshd. These override the default environment and any variables set
    by user configuration (PermitUserEnvironment, etc), but not the SSH_*
    variables set by sshd itself.
    
    ok markus@
    
    OpenBSD-Commit-ID: b6a96c0001ccd7dd211df6cae9e961c20fd718c0

commit 7082bb58a2eb878d23ec674587c742e5e9673c36
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 9 03:01:12 2018 +0000

    upstream: add a SetEnv directive to ssh_config that allows setting
    
    environment variables for the remote session (subject to the server accepting
    them)
    
    refactor SendEnv to remove the arbitrary limit of variable names.
    
    ok markus@
    
    OpenBSD-Commit-ID: cfbb00d9b0e10c1ffff1d83424351fd961d1f2be

commit 3b9798bda15bd3f598f5ef07595d64e23504da91
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 9 02:58:02 2018 +0000

    upstream: reorder child environment preparation so that variables
    
    read from ~/.ssh/environment (if enabled) do not override SSH_* variables set
    by the server.
    
    OpenBSD-Commit-ID: 59f9d4c213cdcef2ef21f4b4ae006594dcf2aa7a

commit 0368889f82f63c82ff8db9f8c944d89e7c657db4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 8 03:35:36 2018 +0000

    upstream: fix incorrect expansion of %i in
    
    load_public_identity_files(); reported by Roumen Petrov
    
    OpenBSD-Commit-ID: a827289e77149b5e0850d72a350c8b0300e7ef25

commit 027607fc2db6a0475a3380f8d95c635482714cb0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 8 01:55:40 2018 +0000

    upstream: fix some over-long lines and __func__ up some debug
    
    messages
    
    OpenBSD-Commit-ID: c70a60b4c8207d9f242fc2351941ba50916bb267

commit 6ff6fda705bc204456a5fa12518dde6e8790bb02
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Jun 7 11:26:14 2018 +0000

    upstream: tweak previous;
    
    OpenBSD-Commit-ID: f98f16af10b28e24bcecb806cb71ea994b648fd6

commit f2c06ab8dd90582030991f631a2715216bf45e5a
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 8 17:43:36 2018 +1000

    Remove ability to override $LD.
    
    Since autoconf always uses $CC to link C programs, allowing users to
    override LD caused mismatches between what LD_LINK_IFELSE thought worked
    and what ld thought worked.  If you do need to do this kind of thing you
    need to set a compiler flag such as gcc's -fuse-ld in LDFLAGS.

commit e1542a80797b4ea40a91d2896efdcc76a57056d2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Jun 8 13:55:59 2018 +1000

    Better detection of unsupported compiler options.
    
    Should prevent "unsupported -Wl,-z,retpoline" warnings during linking.
    ok djm@

commit 57379dbd013ad32ee3f9989bf5f5741065428360
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 7 14:29:43 2018 +0000

    upstream: test the correct configuration option name
    
    OpenBSD-Regress-ID: 492279ea9f65657f97a970e0e7c7fd0b339fee23

commit 6d41815e202fbd6182c79780b6cc90e1ec1c9981
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 7 09:26:42 2018 +0000

    upstream: some permitlisten fixes from markus@ that I missed in my
    
    insomnia-fueled commits last night
    
    OpenBSD-Commit-ID: 26f23622e928996086e85b1419cc1c0f136e359c

commit 4319f7a868d86d435fa07112fcb6153895d03a7f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 7 04:46:34 2018 +0000

    upstream: permitlisten/PermitListen unit test from Markus
    
    OpenBSD-Regress-ID: ab12eb42f0e14926980441cf7c058a6d1d832ea5

commit fa09076410ffc2d34d454145af23c790d728921e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 7 04:31:51 2018 +0000

    upstream: fix regression caused by recent permitlisten option commit:
    
    authorized_keys lines that contained permitopen/permitlisten were being
    treated as invalid.
    
    OpenBSD-Commit-ID: 7ef41d63a5a477b405d142dc925b67d9e7aaa31b

commit 7f90635216851f6cb4bf3999e98b825f85d604f8
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jun 6 18:29:18 2018 +0000

    upstream: switch config file parsing to getline(3) as this avoids
    
    static limits noted by gerhard@; ok dtucker@, djm@
    
    OpenBSD-Commit-ID: 6d702eabef0fa12e5a1d75c334a8c8b325298b5c

commit 392db2bc83215986a91c0b65feb0e40e7619ce7e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 6 18:25:33 2018 +0000

    upstream: regress test for PermitOpen
    
    OpenBSD-Regress-ID: ce8b5f28fc039f09bb297fc4a92319e65982ddaf

commit 803d896ef30758135e2f438bdd1a0be27989e018
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 6 18:24:15 2018 +0000

    upstream: man bits for permitlisten authorized_keys option
    
    OpenBSD-Commit-ID: 86910af8f781a4ac5980fea125442eb25466dd78

commit 04df43208b5b460d7360e1598f876b92a32f5922
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 6 18:24:00 2018 +0000

    upstream: man bits for PermitListen
    
    OpenBSD-Commit-ID: 35b200cba4e46a16a4db6a80ef11838ab0fad67c

commit 93c06ab6b77514e0447fe4f1d822afcbb2a9be08
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 6 18:23:32 2018 +0000

    upstream: permitlisten option for authorized_keys; ok markus@
    
    OpenBSD-Commit-ID: 8650883018d7aa893173d703379e4456a222c672

commit 115063a6647007286cc8ca70abfd2a7585f26ccc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 6 18:22:41 2018 +0000

    upstream: Add a PermitListen directive to control which server-side
    
    addresses may be listened on when the client requests remote forwarding (ssh
    -R).
    
    This is the converse of the existing PermitOpen directive and this
    includes some refactoring to share much of its implementation.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: 15a931238c61a3f2ac74ea18a98c933e358e277f

commit 7703ae5f5d42eb302ded51705166ff6e19c92892
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Jun 6 16:04:29 2018 +1000

    Use ssh-keygen -A to generate missing host keys.
    
    Instead of testing for each specific key type, use ssh-keygen -A to
    generate any missing host key types.

commit e8d59fef1098e24f408248dc64e5c8efa5d01f3c
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jun 1 06:23:10 2018 +0000

    upstream: add missing punctuation after %i in ssh_config.5, and
    
    make the grammatical format in sshd_config.5 match that in ssh_config.5;
    
    OpenBSD-Commit-ID: e325663b9342f3d556e223e5306e0d5fa1a74fa0

commit a1f737d6a99314e291a87856122cb4dbaf64c641
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jun 1 05:52:26 2018 +0000

    upstream: oops - further adjustment to text neccessary;
    
    OpenBSD-Commit-ID: 23585576c807743112ab956be0fb3c786bdef025

commit 294028493471e0bd0c7ffe55dc0c0a67cba6ec41
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jun 1 05:50:18 2018 +0000

    upstream: %U needs to be escaped; tweak text;
    
    OpenBSD-Commit-ID: 30887b73ece257273fb619ab6f4e86dc92ddc15e

commit e5019da3c5a31e6e729a565f2b886a80c4be96cc
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 1 04:31:48 2018 +0000

    upstream: Apply umask to all incoming files and directories not
    
    just files. This makes sure it gets applied to directories too, and prevents
    a race where files get chmodded after creation.  bz#2839, ok djm@
    
    OpenBSD-Commit-ID: 3168ee6c7c39093adac4fd71039600cfa296203b

commit a1dcafc41c376332493b9385ee39f9754dc145ec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 1 03:52:37 2018 +0000

    upstream: Adapt to extra default verboisity from ssh-keygen when
    
    searching for and hashing known_hosts entries in a single operation
    (ssh-keygen -HF ...) Patch from Anton Kremenetsky
    
    OpenBSD-Regress-ID: 519585a4de35c4611285bd6a7272766c229b19dd

commit 76f314c75dffd4a55839d50ee23622edad52c168
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 22 00:22:49 2018 +0000

    upstream: Add TEST_SSH_FAIL_FATAL variable, to force all failures
    
    to instantly abort the test. Useful in capturing clean logs for individual
    failure cases.
    
    OpenBSD-Regress-ID: feba18cf338c2328b9601bd4093cabdd9baa3af1

commit 065c8c055df8d83ae7c92e5e524a579d87668aab
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 11 03:51:06 2018 +0000

    upstream: Clean up comment.
    
    OpenBSD-Regress-ID: 6adb35f384d447e7dcb9f170d4f0d546d3973e10

commit 01b048c8eba3b021701bd0ab26257fc82903cba8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 1 04:21:29 2018 +0000

    upstream: whitespace
    
    OpenBSD-Commit-ID: e5edb5e843ddc9b73a8e46518899be41d5709add

commit 854ae209f992465a276de0b5f10ef770510c2418
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 1 04:05:29 2018 +0000

    upstream: make ssh_remote_ipaddr() capable of being called after
    
    the ssh->state has been torn down; bz#2773
    
    OpenBSD-Commit-ID: 167f12523613ca3d16d7716a690e7afa307dc7eb

commit 3e088aaf236ef35beeef3c9be93fd53700df5861
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 1 03:51:34 2018 +0000

    upstream: return correct exit code when searching for and hashing
    
    known_hosts entries in a single operation (ssh-keygen -HF hostname); bz2772
    Report and fix from Anton Kremenetsky
    
    OpenBSD-Commit-ID: ac10ca13eb9bb0bc50fcd42ad11c56c317437b58

commit 9c935dd9bf05628826ad2495d3e8bdf3d3271c21
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 1 03:33:53 2018 +0000

    upstream: make UID available as a %-expansion everywhere that the
    
    username is available currently. In the client this is via %i, in the server
    %U (since %i was already used in the client in some places for this, but used
    for something different in the server); bz#2870, ok dtucker@
    
    OpenBSD-Commit-ID: c7e912b0213713316cb55db194b3a6415b3d4b95

commit d8748b91d1d6c108c0c260ed41fa55f37b9ef34b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 1 03:11:49 2018 +0000

    upstream: prefer argv0 to "ssh" when re-executing ssh for ProxyJump
    
    directive; bz2831, feedback and ok dtucker@
    
    OpenBSD-Commit-ID: 3cec709a131499fbb0c1ea8a0a9e0b0915ce769e

commit fbb4b5fd4f8e0bb89732670a01954e18b69e15ba
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 25 07:11:01 2018 +0000

    upstream: Do not ban PTY allocation when a sshd session is restricted
    
    because the user password is expired as it breaks password change dialog.
    
    regression in openssh-7.7 reported by Daniel Wagner
    
    OpenBSD-Commit-ID: 9fc09c584c6f1964b00595e3abe7f83db4d90d73

commit f6a59a22b0c157c4c4e5fd7232f868138223be64
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 25 04:25:46 2018 +0000

    upstream: Fix return value confusion in several functions (readdir,
    
    download and fsync). These should return -1 on error, not a sftp status code.
    
    patch from Petr Cerny in bz#2871
    
    OpenBSD-Commit-ID: 651aa0220ad23c9167d9297a436162d741f97a09

commit 1da5934b860ac0378d52d3035b22b6670f6a967e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 25 03:20:59 2018 +0000

    upstream: If select() fails in ssh_packet_read_seqnr go directly to
    
    the error path instead of trying to read from the socket on the way out,
    which resets errno and causes the true error to be misreported.  ok djm@
    
    OpenBSD-Commit-ID: 2614edaadbd05a957aa977728aa7a030af7c6f0a

commit 4ef75926ef517d539f2c7aac3188b09f315c86a7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 25 13:36:58 2018 +1000

    Permit getuid()/geteuid() syscalls.
    
    Requested for Linux/s390; patch from Eduardo Barretto via bz#2752;
    ok dtucker

commit 4b22fd8ecefd059a66140be67f352eb6145a9d88
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 22 00:13:26 2018 +0000

    upstream: support ProxyJump=none to disable ProxyJump
    
    functionality; bz#2869 ok dtucker@
    
    OpenBSD-Commit-ID: 1c06ee08eb78451b5837fcfd8cbebc5ff3a67a01

commit f41bcd70f55b4f0fc4d8e1039cb361ac922b23fb
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue May 15 05:40:11 2018 +0000

    upstream: correct keyowrd name (permitemptypasswords); from brendan
    
    macdonell
    
    OpenBSD-Commit-ID: ef1bdbc936b2ea693ee37a4c20a94d4d43f5fda3

commit f18bc97151340127859634d20d79fd39ec8a7f39
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 11 04:01:11 2018 +0000

    upstream: Emphasise that -w implicitly sets Tunnel=point-to-point
    
    and that users should specify an explicit Tunnel directive if they don't want
    this. bz#2365.
    
    OpenBSD-Commit-ID: 1a8d9c67ae213ead180481900dbbb3e04864560d

commit 32e4e94e1511fe0020fbfbb62399d31b2d22a801
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 14 14:40:08 2018 +1000

    sync fmt_scaled.c
    
    revision 1.17
    date: 2018/05/14 04:39:04;  author: djm;  state: Exp;  lines: +5 -2;
    commitid: 53zY8GjViUBnWo8Z;
    constrain fractional part to [0-9] (less confusing to static analysis); ok ian@

commit 54268d589e85ecc43d3eba8d83f327bdada9d696
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 11 14:04:40 2018 +1000

    fix key-options.sh on platforms without openpty(3)
    
    Skip the pty tests if the platform lacks openpty(3) and has to chown(2)
    the pty device explicitly. This typically requires root permissions that
    this test lacks.
    
    bz#2856 ok dtucker@

commit b2140a739be4c3b43cc1dc08322dca39a1e39d20
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 11 03:38:51 2018 +0000

    upstream: implement EMFILE mitigation for ssh-agent: remember the
    
    fd rlimit and stop accepting new connections when it is exceeded (with some
    grace). Accept is resumed when enough connections are closed.
    
    bz#2576. feedback deraadt; ok dtucker@
    
    OpenBSD-Commit-ID: 6a85d9cec7b85741961e7116a49f8dae777911ea

commit fdba503fdfc647ee8a244002f1581e869c1f3d90
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 11 03:22:55 2018 +0000

    upstream: Explicit cast when snprintf'ing an uint64. Prevents
    
    warnings on platforms where int64 is long not long long.  ok djm@
    
    OpenBSD-Commit-ID: 9c5359e2fbfce11dea2d93f7bc257e84419bd001

commit e7751aa4094d51a9bc00778aa8d07e22934c55ee
Author: bluhm@openbsd.org <bluhm@openbsd.org>
Date:   Thu Apr 26 14:47:03 2018 +0000

    upstream: Since the previous commit, ssh regress test sftp-chroot was
    
    failing. The sftp program terminated with the wrong exit code as sftp called
    fatal() instad of exit(0).  So when the sigchld handler waits for the child,
    remember that it was found.  Then don't expect that main() can wait again. OK
    dtucker@
    
    OpenBSD-Commit-ID: bfafd940c0de5297940c71ddf362053db0232266

commit 7c15301841e2e9d37cae732400de63ae9c0961d6
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Apr 29 17:54:12 2018 +1000

    Use includes.h instead of config.h.
    
    This ensures it picks up the definition of DEF_WEAK, the lack of which
    can cause compile errors in some cases (eg modern AIX).  From
    michael at felt.demon.nl.

commit cec338967a666b7c8ad8b88175f2faeddf268116
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Apr 19 09:53:14 2018 +1000

    Omit 3des-cbc if OpenSSL built without DES.
    
    Patch from hongxu.jia at windriver.com, ok djm@

commit a575ddd58835759393d2dddd16ebe5abdb56485e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Apr 16 22:50:44 2018 +0000

    upstream: Disable SSH2_MSG_DEBUG messages for Twisted Conch clients
    
    without version numbers since they choke on them under some circumstances.
    https://twistedmatrix.com/trac/ticket/9422 via Colin Watson
    
    Newer Conch versions have a version number in their ident string and
    handle debug messages okay. https://twistedmatrix.com/trac/ticket/9424
    
    OpenBSD-Commit-ID: 6cf7be262af0419c58ddae11324d9c0dc1577539

commit 390c7000a8946db565b66eab9e52fb11948711fa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Apr 14 21:50:41 2018 +0000

    upstream: don't free the %C expansion, it's used later for
    
    LocalCommand
    
    OpenBSD-Commit-ID: 857b5cb37b2d856bfdfce61289a415257a487fb1

commit 3455f1e7c48e2e549192998d330214975b9b1dc7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 13 05:04:12 2018 +0000

    upstream: notify user immediately when underlying ssh process dies;
    
    patch from Thomas Kuthan in bz2719; ok dtucker@
    
    OpenBSD-Commit-ID: 78fac88c2f08054d1fc5162c43c24162b131cf78

commit 1c5b4bc827f4abc3e65888cda061ad5edf1b8c7c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 13 16:23:57 2018 +1000

    Allow nanosleep in preauth privsep child.
    
    The new timing attack mitigation code uses nanosleep in the preauth
    codepath, allow in systrace andbox too.

commit 0e73428038d5ecfa5d2a28cff26661502a7aff4e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 13 16:06:29 2018 +1000

    Allow nanosleep in preauth privsep child.
    
    The new timing attack mitigation code uses nanosleep in the preauth
    codepath, allow in sandbox.

commit e9d910b0289c820852f7afa67f584cef1c05fe95
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 13 03:57:26 2018 +0000

    upstream: Defend against user enumeration timing attacks. This
    
    establishes a minimum time for each failed authentication attempt (5ms) and
    adds a per-user constant derived from a host secret (0-4ms).  Based on work
    by joona.kannisto at tut.fi, ok markus@ djm@.
    
    OpenBSD-Commit-ID: b7845b355bb7381703339c8fb0e57e81a20ae5ca

commit d97874cbd909eb706886cd0cdd418f812c119ef9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 13 13:43:55 2018 +1000

    Using "==" in shell tests is not portable.
    
    Patch from rsbecker at nexbridge.com.

commit cfb1d9bc76734681e3dea532a1504fcd466fbe91
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 13 13:38:06 2018 +1000

    Fix tunnel forwarding broken in 7.7p1
    
    bz2855, ok dtucker@

commit afa6e79b76fb52a0c09a29688b5c0d125eb08302
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 13 13:31:42 2018 +1000

    prefer to use getrandom() for PRNG seeding
    
    Only applies when built --without-openssl. Thanks Jann Horn for
    reminder.

commit 575fac34a97f69bc217b235f81de9f8f433eceed
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Apr 13 13:13:33 2018 +1000

    Revert $REGRESSTMP changes.
    
    Revert 3fd2d229 and subsequent changes as they turned out to be a
    portability hassle.

commit 10479cc2a4acd6faaf643eb305233b49d70c31c1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 10 10:19:02 2018 +1000

    Many typo fixes from Karsten Weiss
    
    Spotted using https://github.com/lucasdemarchi/codespell

commit 907da2f88519b34189fd03fac96de0c52d448233
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 10 00:14:10 2018 +0000

    upstream: more typos spotted by Karsten Weiss using codespell
    
    OpenBSD-Regress-ID: d906a2aea0663810a658b7d0bc61a1d2907d4d69

commit 37e5f4a7ab9a8026e5fc2f47dafb0f1b123d39e9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 10 00:13:27 2018 +0000

    upstream: make this a bit more portable-friendly
    
    OpenBSD-Regress-ID: 62f7b9e055e8dfaab92b3825f158beeb4ca3f963

commit 001aa55484852370488786bd40e9fdad4b465811
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 10 00:10:49 2018 +0000

    upstream: lots of typos in comments/docs. Patch from Karsten Weiss
    
    after checking with codespell tool
    (https://github.com/lucasdemarchi/codespell)
    
    OpenBSD-Commit-ID: 373222f12d7ab606598a2d36840c60be93568528

commit 260ede2787fe80b18b8d5920455b4fb268519c7d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Apr 9 23:54:49 2018 +0000

    upstream: don't kill ssh-agent's listening socket entriely if we
    
    fail to accept a connection; bz#2837, patch from Lukas Kuster
    
    OpenBSD-Commit-ID: 52413f5069179bebf30d38f524afe1a2133c738f

commit ebc8b4656f9b0f834a642a9fb3c9fbca86a61838
Author: tj@openbsd.org <tj@openbsd.org>
Date:   Mon Apr 9 20:41:22 2018 +0000

    upstream: the UseLogin option was removed, so remove it here too.
    
    ok dtucker
    
    OpenBSD-Commit-ID: 7080be73a64d68e21f22f5408a67a0ba8b1b6b06

commit 3e36f281851fc8e9c996b33f108b2ae167314fbe
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sun Apr 8 07:36:02 2018 +0000

    upstream: tweak previous;
    
    OpenBSD-Commit-ID: 2b9c23022ea7b9dddb62864de4e906000f9d7474

commit 8368571efd6693c5c57f850e23a2372acf3f865f
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Apr 7 13:50:10 2018 +0000

    upstream: tweak previous;
    
    OpenBSD-Commit-ID: 38e347b6f8e888f5e0700d01abb1eba7caa154f9

commit 555294a7279914ae6795b71bedf4e6011b7636df
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 6 13:02:39 2018 +0000

    upstream: Allow "SendEnv -PATTERN" to clear environment variables
    
    previously labeled for sendind. bz#1285 ok dtucker@
    
    OpenBSD-Commit-ID: f6fec9e3d0f366f15903094fbe1754cb359a0df9

commit 40f5f03544a07ebd2003b443d42e85cb51d94d59
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 6 04:15:45 2018 +0000

    upstream: relax checking of authorized_keys environment="..."
    
    options to allow underscores in variable names (regression introduced in
    7.7). bz2851, ok deraadt@
    
    OpenBSD-Commit-ID: 69690ffe0c97ff393f2c76d25b4b3d2ed4e4ac9c

commit 30fd7f9af0f553aaa2eeda5a1f53f26cfc222b5e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 6 03:51:27 2018 +0000

    upstream: add a couple of missed options to the config dump; patch
    
    from Jakub Jelen via bz2835
    
    OpenBSD-Commit-ID: 5970adadf6ef206bee0dddfc75d24c2019861446

commit 8d6829be324452d2acd282d5f8ceb0adaa89a4de
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 6 03:34:27 2018 +0000

    upstream: ssh does not accept -oInclude=... on the commandline, the
    
    Include keyword is for configuration files only. bz#2840, patch from Jakub
    Jelen
    
    OpenBSD-Commit-ID: 32d052b4a7a7f22df35fe3f71c368c02b02cacb0

commit 00c5222ddc0c8edcaa4ea45ac03befdc8013d137
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 5 22:54:28 2018 +0000

    upstream: We don't offer CBC cipher by default any more. Spotted by
    
    Renaud Allard (via otto@)
    
    OpenBSD-Commit-ID: a559b1eef741557dd959ae378b665a2977d92dca

commit 5ee8448ad7c306f05a9f56769f95336a8269f379
Author: job@openbsd.org <job@openbsd.org>
Date:   Wed Apr 4 15:12:17 2018 +0000

    upstream: Update default IPQoS in ssh(1), sshd(8) to DSCP AF21 for
    
    interactive and CS1 for bulk
    
    AF21 was selected as this is the highest priority within the low-latency
    service class (and it is higher than what we have today). SSH is elastic
    and time-sensitive data, where a user is waiting for a response via the
    network in order to continue with a task at hand. As such, these flows
    should be considered foreground traffic, with delays or drops to such
    traffic directly impacting user-productivity.
    
    For bulk SSH traffic, the CS1 "Lower Effort" marker was chosen to enable
    networks implementing a scavanger/lower-than-best effort class to
    discriminate scp(1) below normal activities, such as web surfing. In
    general this type of bulk SSH traffic is a background activity.
    
    An advantage of using "AF21" for interactive SSH and "CS1" for bulk SSH
    is that they are recognisable values on all common platforms (IANA
    https://www.iana.org/assignments/dscp-registry/dscp-registry.xml), and
    for AF21 specifically a definition of the intended behavior exists
    https://tools.ietf.org/html/rfc4594#section-4.7 in addition to the definition
    of the Assured Forwarding PHB group https://tools.ietf.org/html/rfc2597, and
    for CS1 (Lower Effort) there is https://tools.ietf.org/html/rfc3662
    
    The first three bits of "AF21" map to the equivalent IEEEE 802.1D PCP, IEEE
    802.11e, MPLS EXP/CoS and IP Precedence value of 2 (also known as "Immediate",
    or "AC_BE"), and CS1's first 3 bits map to IEEEE 802.1D PCP, IEEE 802.11e,
    MPLS/CoS and IP Precedence value 1 ("Background" or "AC_BK").
    
    OK deraadt@, "no objection" djm@
    
    OpenBSD-Commit-ID: d11d2a4484f461524ef0c20870523dfcdeb52181

commit 424b544fbda963f973da80f884717c3e0a513288
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Apr 3 02:14:08 2018 +0000

    upstream: Import regenerated moduli file.
    
    OpenBSD-Commit-ID: 1de0e85522051eb2ffa00437e1885e9d7b3e0c2e

commit 323f66ce934df2da551f256f37d69822428e1ca1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 6 04:18:35 2018 +0000

    upstream: Add test for username options parsing order, prompted by
    
    bz#2849.
    
    OpenBSD-Regress-ID: 6985cd32f38596882a3ac172ff8c510693b65283

commit e8f474554e3bda102a797a2fbab0594ccc66f097
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 6 14:11:44 2018 +1000

    Expose SSH_AUTH_INFO_0 to PAM auth modules
    
    bz#2408, patch from Radoslaw Ejsmont; ok dtucker@

commit 014ba209cf4c6a159baa30ecebbaddfa97da7100
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Apr 3 12:18:00 2018 +1000

    Import regenerated moduli file.

commit a0349a1cc4a18967ad1dbff5389bcdf9da098814
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 2 15:38:28 2018 +1000

    update versions in .spec files

commit 816ad38f79792f5617e3913be306ddb27e91091c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 2 15:38:20 2018 +1000

    update version number

commit 2c71ca1dd1efe458cb7dee3f8a1a566f913182c2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Mar 30 18:23:07 2018 +1100

    Disable native strndup and strnlen on AIX.
    
    On at least some revisions of AIX, strndup returns unterminated strings
    under some conditions, apparently because strnlen returns incorrect
    values in those cases.  Disable both on AIX and use the replacements
    from openbsd-compat.  Fixes problem with ECDSA keys there, ok djm.

commit 6b5a17bc14e896e3904dc58d889b58934cfacd24
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 26 13:12:44 2018 +1100

    Include ssh_api.h for struct ssh.
    
    struct ssh is needed by implementations of sys_auth_passwd() that were
    converted in commit bba02a50.  Needed to fix build on AIX, I assume for
    the other platforms too (although it should be harmless if not needed).

commit bc3f80e4d191b8e48650045dfa8a682cd3aabd4d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 26 12:58:09 2018 +1100

    Remove UNICOS code missed during removal.
    
    Fixes compile error on AIX.

commit 9d57762c24882e2f000a21a0ffc8c5908a1fa738
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Sat Mar 24 19:29:03 2018 +0000

    upstream: openssh-7.7
    
    OpenBSD-Commit-ID: 274e614352460b9802c905f38fb5ea7ed5db3d41

commit 4b7d8acdbbceef247dc035e611e577174ed8a87e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 26 09:37:02 2018 +1100

    Remove authinfo.sh test dependency on printenv
    
    Some platforms lack printenv in the default $PATH.
    Reported by Tom G. Christensen

commit 4afeaf3dcb7dc70efd98fcfcb0ed28a6b40b820e
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Mar 25 10:00:21 2018 -0700

            Use libiaf on all sysv5 systems

commit bba02a5094b3db228ceac41cb4bfca165d0735f3
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Mar 25 09:17:33 2018 -0700

            modified:   auth-sia.c
            modified:   openbsd-compat/port-aix.c
            modified:   openbsd-compat/port-uw.c
    
            propogate changes to auth-passwd.c in commit
            7c856857607112a3dfe6414696bf4c7ab7fb0cb3 to other providers
            of sys_auth_passwd()

commit d7a7a39168bdfe273587bf85d779d60569100a3f
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Sat Mar 24 19:29:03 2018 +0000

    upstream: openssh-7.7
    
    OpenBSD-Commit-ID: 274e614352460b9802c905f38fb5ea7ed5db3d41

commit 9efcaaac314c611c6c0326e8bac5b486c424bbd2
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Sat Mar 24 19:28:43 2018 +0000

    upstream: fix bogus warning when signing cert keys using agent;
    
    from djm; ok deraadt dtucker
    
    OpenBSD-Commit-ID: 12e50836ba2040042383a8b71e12d7ea06e9633d

commit 393436024d2e4b4c7a01f9cfa5854e7437896d11
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Mar 25 09:40:46 2018 +1100

    Replace /dev/stdin with "-".
    
    For some reason sftp -b doesn't work with /dev/stdin on Cygwin, as noted
    and suggested by vinschen at redhat.com.

commit b5974de1a1d419e316ffb6524b1b277dda2f3b49
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Mar 23 13:21:14 2018 +1100

    Provide $OBJ to paths in PuTTY interop tests.

commit dc31e79454e9b9140b33ad380565fdb59b9c4f33
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 16 09:06:31 2018 +0000

    upstream: Tell puttygen to use /dev/urandom instead of /dev/random. On
    
    OpenBSD they are both non-blocking, but on many other -portable platforms it
    blocks, stalling tests.
    
    OpenBSD-Regress-ID: 397d0d4c719c353f24d79f5b14775e0cfdf0e1cc

commit cb1f94431ef319cd48618b8b771b58739a8210cf
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Mar 22 07:06:11 2018 +0000

    upstream: ssh/xmss: fix build; ok djm@
    
    OpenBSD-Commit-ID: c9374ca41d4497f1c673ab681cc33f6e7c5dd186

commit 27979da9e4074322611355598f69175b9ff10d39
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Mar 22 07:05:48 2018 +0000

    upstream: ssh/xmss: fix deserialize for certs; ok djm@
    
    OpenBSD-Commit-ID: f44c41636c16ec83502039828beaf521c057dddc

commit c6cb2565c9285eb54fa9dfbb3890f5464aff410f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Mar 22 17:00:28 2018 +1100

    Save $? before case statement.
    
    In some shells (FreeBSD 9, ash) the case statement resets $?, so save
    for later testing.

commit 4c4e7f783b43b264c247233acb887ee10ed4ce4d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 14 05:35:40 2018 +0000

    upstream: rename recently-added "valid-before" key restriction to
    
    "expiry-time" as the former is confusing wrt similar terminology in X.509;
    pointed out by jsing@
    
    OpenBSD-Regress-ID: ac8b41dbfd90cffd525d58350c327195b0937793

commit 500396b204c58e78ad9d081516a365a9f28dc3fd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 12 00:56:03 2018 +0000

    upstream: check valid-before option in authorized_keys
    
    OpenBSD-Regress-ID: 7e1e4a84f7f099a290e5a4cbf4196f90ff2d7e11

commit a76b5d26c2a51d7dd7a5164e683ab3f4419be215
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 12 00:54:04 2018 +0000

    upstream: explicitly specify RSA/SHA-2 keytype here too
    
    OpenBSD-Regress-ID: 74d7b24e8c72c27af6b481198344eb077e993a62

commit 3a43297ce29d37c64e37c7e21282cb219e28d3d1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 12 00:52:57 2018 +0000

    upstream: exlicitly include RSA/SHA-2 keytypes in
    
    PubkeyAcceptedKeyTypes here
    
    OpenBSD-Regress-ID: 954d19e0032a74e31697fb1dc7e7d3d1b2d65fe9

commit 037fdc1dc2d68e1d43f9c9e2586c02cabc8f7cc8
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Mar 14 06:56:20 2018 +0000

    upstream: sort expiry-time;
    
    OpenBSD-Commit-ID: 8c7d82ee1e63e26ceb2b3d3a16514019f984f6bf

commit abc0fa38c9bc136871f28e452c3465c3051fc785
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 14 05:35:40 2018 +0000

    upstream: rename recently-added "valid-before" key restriction to
    
    "expiry-time" as the former is confusing wrt similar terminology in X.509;
    pointed out by jsing@
    
    OpenBSD-Commit-ID: 376939466a1f562f3950a22314bc6505733aaae6

commit bf0fbf2b11a44f06a64b620af7d01ff171c28e13
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 12 00:52:01 2018 +0000

    upstream: add valid-before="[time]" authorized_keys option. A
    
    simple way of giving a key an expiry date. ok markus@
    
    OpenBSD-Commit-ID: 1793b4dd5184fa87f42ed33c7b0f4f02bc877947

commit fbd733ab7adc907118a6cf56c08ed90c7000043f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 12 19:17:26 2018 +1100

    Add AC_LANG_PROGRAM to AC_COMPILE_IFELSE.
    
    The recently added MIPS ABI tests need AC_LANG_PROGRAM to prevent
    warnings from autoconf.  Pointed out by klausz at haus-gisela.de.

commit c7c458e8261b04d161763cd333d74e7a5842e917
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 7 23:53:08 2018 +0000

    upstream: revert recent strdelim() change, it causes problems with
    
    some configs.
    
    revision 1.124
    date: 2018/03/02 03:02:11;  author: djm;  state: Exp;  lines: +19 -8;  commitid: nNRsCijZiGG6SUTT;
    Allow escaped quotes \" and \' in ssh_config and sshd_config quotes
    option strings. bz#1596 ok markus@
    
    OpenBSD-Commit-ID: 59c40b1b81206d713c06b49d8477402c86babda5

commit 0bcd871ccdf3baf2b642509ba4773d5be067cfa2
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Mar 5 07:03:18 2018 +0000

    upstream: move the input format details to -f; remove the output
    
    format details and point to sshd(8), where it is documented;
    
    ok dtucker
    
    OpenBSD-Commit-ID: 95f17e47dae02a6ac7329708c8c893d4cad0004a

commit 45011511a09e03493568506ce32f4891a174a3bd
Author: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date:   Tue Jun 20 16:42:28 2017 +0100

    configure.ac: properly set seccomp_audit_arch for MIPS64
    
    Currently seccomp_audit_arch is set to AUDIT_ARCH_MIPS64 or
    AUDIT_ARCH_MIPSEL64 (depending on the endinness) when openssh is built
    for MIPS64. However, that's only valid for n64 ABI. The right macros for
    n32 ABI defined in seccomp.h are AUDIT_ARCH_MIPS64N32 and
    AUDIT_ARCH_MIPSEL64N32, for big and little endian respectively.
    
    Because of that an sshd built for MIPS64 n32 rejects connection attempts
    and the output of strace reveals that the problem is related to seccomp
    audit:
    
    [pid   194] prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, {len=57,
    filter=0x555d5da0}) = 0
    [pid   194] write(7, "\0\0\0]\0\0\0\5\0\0\0Ulist_hostkey_types: "..., 97) = ?
    [pid   193] <... poll resumed> )        = 2 ([{fd=5, revents=POLLIN|POLLHUP},
    {fd=6, revents=POLLHUP}])
    [pid   194] +++ killed by SIGSYS +++
    
    This patch fixes that problem by setting the right value to
    seccomp_audit_arch taking into account the MIPS64 ABI.
    
    Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

commit 580086704c31de91dc7ba040a28e416bf1fefbca
Author: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date:   Tue Jun 20 16:42:11 2017 +0100

    configure.ac: detect MIPS ABI
    
    Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

commit cd4e937aa701f70366cd5b5969af525dff6fdf15
Author: Alan Yee <alyee@ucsd.edu>
Date:   Wed Mar 7 15:12:14 2018 -0800

    Use https URLs for links that support it.

commit c0a0c3fc4a76b682db22146b28ddc46566db1ce9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 5 20:03:07 2018 +1100

    Disable UTMPX on SunOS4.

commit 58fd4c5c0140f6636227ca7acbb149ab0c2509b9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 5 19:28:08 2018 +1100

    Check for and work around buggy fflush(NULL).
    
    Some really old platforms (eg SunOS4) segfault on fflush(NULL) so check
    for and work around.  With klausz at haus-gisela.de.

commit 71e48bc7945f867029e50e06c665c66aed6d3c64
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Mar 5 10:22:32 2018 +1100

    Remove extra XMSS #endif
    
    Extra #endif breaks compile with -DWITH_XMSS.  Pointed out by Jack
    Schmidt via github.

commit 055e09e2212ff52067786bf6d794ca9512ff7f0c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sat Mar 3 06:37:53 2018 +0000

    upstream: Update RSA minimum modulus size to 1024. sshkey.h rev 1.18
    
    bumped the minimum from 768 to 1024, update man page accordingly.
    
    OpenBSD-Commit-ID: 27563ab4e866cd2aac40a5247876f6787c08a338

commit 7e4fadd3248d6bb7d39d6688c76a613d35d2efc1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Mar 4 01:46:48 2018 +0000

    upstream: for the pty control tests, just check that the PTY path
    
    points to something in /dev (rather than checking the device node itself);
    makes life easier for portable, where systems with dynamic ptys can delete
    nodes before we get around to testing their existence.
    
    OpenBSD-Regress-ID: b1e455b821e62572bccd98102f8dd9d09bb94994

commit 13ef4cf53f24753fe920832b990b25c9c9cd0530
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 3 16:21:20 2018 +1100

    Update PAM password change to new opts API.

commit 33561e68e0b27366cb769295a077aabc6a49d2a1
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 3 14:56:09 2018 +1100

    Add strndup for platforms that need it.
    
    Some platforms don't have strndup, which includes Solaris 10, NetBSD 3
    and FreeBSD 6.

commit e8a17feba95eef424303fb94441008f6c5347aaf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Mar 3 14:49:07 2018 +1100

    Flatten and alphabetize object file lists.
    
    This will make maintenance and changes easier.  "no objection" tim@

commit de1920d743d295f50e6905e5957c4172c038e8eb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Mar 3 03:16:17 2018 +0000

    upstream: unit tests for new authorized_keys options API
    
    OpenBSD-Regress-ID: 820f9ec9c6301f6ca330ad4052d85f0e67d0bdc1

commit dc3e92df17556dc5b0ab19cee8dcb2a6ba348717
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 2 02:53:27 2018 +0000

    upstream: fix testing of pty option, include positive test and
    
    testing of restrict keyword
    
    OpenBSD-Regress-ID: 4268f27c2706a0a95e725d9518c5bcbec9814c6d

commit 3d1edd1ebbc0aabea8bbe61903060f37137f7c61
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 2 02:51:55 2018 +0000

    upstream: better testing for port-forwarding and restrict flags in
    
    authorized_keys
    
    OpenBSD-Regress-ID: ee771df8955f2735df54746872c6228aff381daa

commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Mar 3 03:15:51 2018 +0000

    upstream: switch over to the new authorized_keys options API and
    
    remove the legacy one.
    
    Includes a fairly big refactor of auth2-pubkey.c to retain less state
    between key file lines.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: dece6cae0f47751b9892080eb13d6625599573df

commit 90c4bec8b5f9ec4c003ae4abdf13fc7766f00c8b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Mar 3 03:06:02 2018 +0000

    upstream: Introduce a new API for handling authorized_keys options.
    
    This API parses options to a dedicated structure rather than the old API's
    approach of setting global state. It also includes support for merging
    options, e.g. from authorized_keys, authorized_principals and/or
    certificates.
    
    feedback and ok markus@
    
    OpenBSD-Commit-ID: 98badda102cd575210d7802943e93a34232c80a2

commit 26074380767e639ef89321610e146ae11016b385
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Mar 3 03:01:50 2018 +0000

    upstream: warn when the agent returns a signature type that was
    
    different to what was requested. This might happen when an old/non-OpenSSH
    agent is asked to make a rsa-sha2-256/512 signature but only supports
    ssh-rsa. bz#2799 feedback and ok markus@
    
    OpenBSD-Commit-ID: 760c0f9438c5c58abc16b5f98008ff2d95cb13ce

commit f493d2b0b66fb003ed29f31dd66ff1aeb64be1fc
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Mar 2 21:40:15 2018 +0000

    upstream: apply a lick of paint; tweaks/ok dtucker
    
    OpenBSD-Commit-ID: 518a6736338045e0037f503c21027d958d05e703

commit 713d9cb510e0e7759398716cbe6dcf43e574be71
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 2 03:02:11 2018 +0000

    upstream: Allow escaped quotes \" and \' in ssh_config and
    
    sshd_config quotes option strings. bz#1596 ok markus@
    
    OpenBSD-Commit-ID: dd3a29fc2dc905e8780198e5a6a30b096de1a1cb

commit 94b4e2d29afaaaef89a95289b16c18bf5627f7cd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 2 02:08:03 2018 +0000

    upstream: refactor sshkey_read() to make it a little more, err,
    
    readable. ok markus
    
    OpenBSD-Commit-ID: 2e9247b5762fdac3b6335dc606d3822121714c28

commit 5886b92968b360623491699247caddfb77a74d80
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Mar 1 20:32:16 2018 +0000

    upstream: missing #ifdef for _PATH_HOST_XMSS_KEY_FILE; report by
    
    jmc@
    
    OpenBSD-Commit-ID: 9039cb69a3f9886bfef096891a9e7fcbd620280b

commit 3b36bed3d26f17f6a2b7e036e01777770fe1bcd4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 26 12:14:53 2018 +0000

    upstream: Remove unneeded (local) include. ok markus@
    
    OpenBSD-Commit-ID: 132812dd2296b1caa8cb07d2408afc28e4e60f93

commit 27b9f3950e0289e225b57b7b880a8f1859dcd70b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 26 03:56:44 2018 +0000

    upstream: Add $OpenBSD$ markers to xmss files to help keep synced
    
    with portable. ok djm@.
    
    OpenBSD-Commit-ID: 5233a27aafd1dfadad4b957225f95ae51eb365c1

commit afd830847a82ebbd5aeab05bad6d2c8ce74df1cd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 26 03:03:05 2018 +0000

    upstream: Add newline at end of file to prevent compiler warnings.
    
    OpenBSD-Commit-ID: 52f247d4eafe840c7c14c8befa71a760a8eeb063

commit 941e0d3e9bb8d5e4eb70cc694441445faf037c84
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 28 19:59:35 2018 +1100

    Add WITH_XMSS, move to prevent conflicts.
    
    Add #ifdef WITH_XMSS to ssh-xmss.c, move it in the other files to after
    includes.h so it's less likely to conflict and will pick up WITH_XMSS if
    added to config.h.

commit a10d8552d0d2438da4ed539275abcbf557d1e7a8
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 27 14:45:17 2018 +1100

    Conditionally compile XMSS code.
    
    The XMSS code is currently experimental and, unlike the rest of OpenSSH
    cannot currently be compiled with a c89 compiler.

commit 146c3bd28c8dbee9c4b06465d9c9facab96b1e9b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 26 12:51:29 2018 +1100

    Check dlopen has RTLD_NOW before enabling pkcs11.

commit 1323f120d06a26074c4d154fcbe7f49bcad3d741
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 27 08:41:25 2018 +1100

    Check for attributes on prototype args.
    
    Some compilers (gcc 2.9.53, 3.0 and probably others, see gcc bug #3481)
    do not accept __attribute__ on function pointer prototype args.  Check for
    this and hide them if they're not accepted.

commit f0b245b0439e600fab782d19e97980e9f2c2533c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 26 11:43:48 2018 +1100

    Check if HAVE_DECL_BZERO correctly.

commit c7ef4a399155e1621a532cc5e08e6fa773658dd4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 26 17:42:56 2018 +1100

    Wrap <stdint.h> in #ifdef HAVE_STDINT_H.

commit ac53ce46cf8165cbda7f57ee045f9f32e1e92b31
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 26 16:24:23 2018 +1100

    Replace $(CURDIR) with $(PWD).
    
    The former doesn't work on Solaris or BSDs.

commit 534b2680a15d14e7e60274d5b29b812d44cc5a44
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 26 14:51:59 2018 +1100

    Comment out hexdump().
    
    Nothing currently uses them but they cause conflicts on at least
    FreeBSD, possibly others.  ok djm@

commit 5aea4aa522f61bb2f34c3055a7de203909dfae77
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 26 14:39:14 2018 +1100

    typo: missing ;

commit cd3ab57f9b388f8b1abf601dc4d78ff82d83b75e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 26 14:37:06 2018 +1100

    Hook up flock() compat code.
    
    Also a couple of minor changes: fail if we can't lock instead of
    silently succeeding, and apply a couple of minor style fixes.

commit b087998d1ba90dd1ddb6bfdb17873dc3e7392798
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 26 14:27:02 2018 +1100

    Import flock() compat from NetBSD.
    
    From NetBSD's src/trunk/tools/compat/flock.c, no OpenSSH changes yet.

commit 89212533dde6798324e835b1499084658df4579e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 26 12:32:14 2018 +1100

    Fix breakage when REGRESSTMP not set.
    
    BUILDDIR is not set where used for REGRESSTMP, use make's CURDIR
    instead.  Pointed out by djm@.

commit f885474137df4b89498c0b8834c2ac72c47aa4bd
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 26 12:18:14 2018 +1100

    XMSS-related files get includes.h

commit 612faa34c72e421cdc9e63f624526bae62d557cc
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 26 12:17:55 2018 +1100

    object files end with .o - not .c

commit bda709b8e13d3eef19e69c2d1684139e3af728f5
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 26 12:17:22 2018 +1100

    avoid inclusion of deprecated selinux/flask.h
    
    Use string_to_security_class() instead.

commit 2e396439365c4ca352cac222717d09b14f8a0dfd
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 26 11:48:27 2018 +1100

    updatedepend

commit 1b11ea7c58cd5c59838b5fa574cd456d6047b2d4
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Feb 23 15:58:37 2018 +0000

    upstream: Add experimental support for PQC XMSS keys (Extended
    
    Hash-Based Signatures) The code is not compiled in by default (see WITH_XMSS
    in Makefile.inc) Joint work with stefan-lukas_gazdag at genua.eu See
    https://tools.ietf.org/html/draft-irtf-cfrg-xmss-hash-based-signatures-12 ok
    djm@
    
    OpenBSD-Commit-ID: ef3eccb96762a5d6f135d7daeef608df7776a7ac

commit 7d330a1ac02076de98cfc8fda05353d57b603755
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Feb 23 07:38:09 2018 +0000

    upstream: some cleanup for BindInterface and ssh-keyscan;
    
    OpenBSD-Commit-ID: 1a719ebeae22a166adf05bea5009add7075acc8c

commit c7b5a47e3b9db9a0f0198f9c90c705f6307afc2b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 25 23:55:41 2018 +1100

    Invert sense of getpgrp test.
    
    AC_FUNC_GETPGRP tests if getpgrp(0) works, which it does if it's not
    declared.  Instead, test if the zero-arg version we want to use works.

commit b39593a6de5290650a01adf8699c6460570403c2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 25 13:25:15 2018 +1100

    Add no-op getsid implmentation.

commit 11057564eb6ab8fd987de50c3d7f394c6f6632b7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 25 11:22:57 2018 +1100

    bsd-statvfs: include sys/vfs.h, check for f_flags.

commit e9dede06e5bc582a4aeb5b1cd5a7a640d7de3609
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 25 10:20:31 2018 +1100

    Handle calloc(0,x) where different from malloc.
    
    Configure assumes that if malloc(0) returns null then calloc(0,n)
    also does.  On some old platforms (SunOS4) malloc behaves as expected
    (as determined by AC_FUNC_MALLOC) but calloc doesn't.  Test for this
    at configure time and activate the replacement function if found, plus
    handle this case in rpl_calloc.

commit 2eb4041493fd2635ffdc64a852d02b38c4955e0b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 24 21:06:48 2018 +1100

    Add prototype for readv if needed.

commit 6c8c9a615b6d31db8a87bc25033f053d5b0a831e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 24 20:46:37 2018 +1100

    Check for raise and supply if needed.

commit a9004425a032d7a7141a5437cfabfd02431e2a74
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 24 20:25:22 2018 +1100

    Check for bzero and supply if needed.
    
    Since explicit_bzero uses it via an indirect it needs to be a function
    not just a macro.

commit 1a348359e4d2876203b5255941bae348557f4f54
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 23 05:14:05 2018 +0000

    upstream: Add ssh-keyscan -D option to make it print its results in
    
    SSHFP format bz#2821, ok dtucker@
    
    OpenBSD-Commit-ID: 831446b582e0f298ca15c9d99c415c899e392221

commit 3e19fb976a47b44b3d7c4f8355269f7f2c5dd82c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 23 04:18:46 2018 +0000

    upstream: Add missing braces.
    
    Caught by the tinderbox's -Werror=misleading-indentation,  ok djm@
    
    OpenBSD-Commit-ID: d44656af594c3b2366eb87d6abcef83e1c88a6ca

commit b59162da99399d89bd57f71c170c0003c55b1583
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 23 15:20:42 2018 +1100

    Check for ifaddrs.h for BindInterface.
    
    BindInterface required getifaddr and friends so disable if not available
    (eg Solaris 10).  We should be able to add support for some systems with
    a bit more work but this gets the building again.

commit a8dd6fe0aa10b6866830b4688a73ef966f0aed88
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 23 14:19:11 2018 +1100

    space before tab in previous

commit b5e9263c7704247f9624c8f5c458e9181fcdbc09
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 9 03:40:22 2018 +0000

    upstream: Replace fatal with exit in the case that we do not have
    
    $SUDO set. Prevents test failures when neither sudo nor doas are configured.
    
    OpenBSD-Regress-ID: 6a0464decc4f8ac7d6eded556a032b0fc521bc7b

commit 3e9d3192ad43758ef761c5b0aa3ac5ccf8121ef2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 23 14:10:53 2018 +1100

    Use portable syntax for REGRESSTMP.

commit 73282b61187883a2b2bb48e087fdda1d751d6059
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 23 03:03:00 2018 +0000

    upstream: unbreak interop test after SSHv1 purge; patch from Colin
    
    Watson via bz#2823
    
    OpenBSD-Regress-ID: 807d30a597756ed6612bdf46dfebca74f49cb31a

commit f8985dde5f46aedade0373365cbf86ed3f1aead2
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 9 03:42:57 2018 +0000

    upstream: Skip sftp-chroot test when SUDO not set instead of
    
    fatal().
    
    OpenBSD-Regress-ID: cd4b5f1109b0dc09af4e5ea7d4968c43fbcbde88

commit df88551c02d4e3445c44ff67ba8757cff718609a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 9 03:40:22 2018 +0000

    upstream: Replace fatal with exit in the case that we do not have
    
    $SUDO set. Prevents test failures when neither sudo nor doas are configured.
    
    OpenBSD-Regress-ID: 6a0464decc4f8ac7d6eded556a032b0fc521bc7b

commit 3b252c20b19f093e87363de197f1100b79705dd3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 8 08:46:20 2018 +0000

    upstream: some helpers to check verbose/quiet mode
    
    OpenBSD-Regress-ID: e736aac39e563f5360a0935080a71d5fdcb976de

commit ac2e3026bbee1367e4cda34765d1106099be3287
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 23 02:34:33 2018 +0000

    upstream: Add BindInterface ssh_config directive and -B
    
    command-line argument to ssh(1) that directs it to bind its outgoing
    connection to the address of the specified network interface.
    
    BindInterface prefers to use addresses that aren't loopback or link-
    local, but will fall back to those if no other addresses of the
    required family are available on that interface.
    
    Based on patch by Mike Manning in bz#2820, ok dtucker@
    
    OpenBSD-Commit-ID: c5064d285c2851f773dd736a2c342aa384fbf713

commit fcdb9d777839a3fa034b3bc3067ba8c1f6886679
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 19 00:55:02 2018 +0000

    upstream: emphasise that the hostkey rotation may send key types
    
    that the client may not support, and that the client should simply disregard
    such keys (this is what ssh does already).
    
    OpenBSD-Commit-ID: 65f8ffbc32ac8d12be8f913d7c0ea55bef8622bf

commit ce066f688dc166506c082dac41ca686066e3de5f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 22 20:45:09 2018 +1100

    Add headers for sys/audit.h.
    
    On some older platforms (at least sunos4, probably others) sys/audit.h
    requires some other headers.  Patch from klausz at haus-gisela.de.

commit 3fd2d2291a695c96a54269deae079bacce6e3fb9
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Mon Feb 19 18:37:40 2018 +1100

    Add REGRESSTMP make var override.
    
    Defaults to original location ($srcdir/regress) but allows overriding
    if desired, eg a directory in /tmp.

commit f8338428588f3ecb5243c86336eccaa28809f97e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 18 15:53:15 2018 +1100

    Remove now-unused check for getrusage.
    
    getrusage was used in ssh-rand-helper but that's now long gone.
    Patch from klauszh at haus-gisela.de.

commit 8570177195f6a4b3173c0a25484a83641ee3faa6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 16 04:43:11 2018 +0000

    upstream: Don't send IUTF8 to servers that don't like them.
    
    Some SSH servers eg "ConfD" drop the connection if the client sends the
    new IUTF8 (RFC8160) terminal mode even if it's not set.  Add a bug bit
    for such servers and avoid sending IUTF8 to them.  ok djm@
    
    OpenBSD-Commit-ID: 26425855402d870c3c0a90491e72e2a8a342ceda

commit f6dc2ba3c9d12be53057b9371f5109ec553a399f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Fri Feb 16 17:32:28 2018 +1100

    freezero should check for NULL.

commit 680321f3eb46773883111e234b3c262142ff7c5b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 16 02:40:45 2018 +0000

    upstream: Mention recent DH KEX methods:
    
    diffie-hellman-group14-sha256
    diffie-hellman-group16-sha512
    diffie-hellman-group18-sha512
    
    From Jakub Jelen via bz#2826
    
    OpenBSD-Commit-ID: 51bf769f06e55447f4bfa7306949e62d2401907a

commit 88c50a5ae20902715f0fca306bb9c38514f71679
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 16 02:32:40 2018 +0000

    upstream: stop loading DSA keys by default, remove sshd_config
    
    stanza and manpage bits; from Colin Watson via bz#2662, ok dtucker@
    
    OpenBSD-Commit-ID: d33a849f481684ff655c140f5eb1b4acda8c5c09

commit d2b3db2860c962927def39a52f67f1c23f7b201a
Author: jsing@openbsd.org <jsing@openbsd.org>
Date:   Wed Feb 14 16:27:24 2018 +0000

    upstream: Ensure that D mod (P-1) and D mod (Q-1) are calculated in
    
    constant time.
    
    This avoids a potential side channel timing leak.
    
    ok djm@ markus@
    
    OpenBSD-Commit-ID: 71ff3c16be03290e63d8edab8fac053d8a82968c

commit 4270efad7048535b4f250f493d70f9acfb201593
Author: jsing@openbsd.org <jsing@openbsd.org>
Date:   Wed Feb 14 16:03:32 2018 +0000

    upstream: Some obvious freezero() conversions.
    
    This also zeros an ed25519_pk when it was not being zeroed previously.
    
    ok djm@ dtucker@
    
    OpenBSD-Commit-ID: 5c196a3c85c23ac0bd9b11bcadaedd90b7a2ce82

commit affa6ba67ffccc30b85d6e98f36eb5afd9386882
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 15 22:32:04 2018 +1100

    Remove execute bit from modpipe.c.

commit 9879dca438526ae6dfd656fecb26b0558c29c731
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 15 22:26:16 2018 +1100

    Update prngd link to point to sourceforge.

commit b6973fa5152b1a0bafd2417b7c3ad96f6e87d014
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 15 22:22:38 2018 +1100

    Remove references to UNICOS.

commit f1ca487940449f0b64f38f1da575078257609966
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 15 22:18:37 2018 +1100

    Remove extra newline.

commit 6d4e980f3cf27f409489cf89cd46c21501b13731
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 15 22:16:54 2018 +1100

    OpenSSH's builtin entropy gathering is long gone.

commit 389125b25d1a1d7f22e907463b7e8eca74af79ea
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 15 21:43:01 2018 +1100

    Replace remaining mysignal() with signal().
    
    These seem to have been missed during the replacement of mysignal
    with #define signal in commit 5ade9ab.  Both include the requisite
    headers to pick up the #define.

commit 265d88d4e61e352de6791733c8b29fa3d7d0c26d
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 15 20:06:19 2018 +1100

    Remove remaining now-obsolete cvs $Ids.

commit 015749e9b1d2f6e14733466d19ba72f014d0845c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 15 17:01:54 2018 +1100

    Regenerate dependencies after UNICOS removal.

commit ddc0f3814881ea279a6b6d4d98e03afc60ae1ed7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 13 09:10:46 2018 +1100

    Remove UNICOS support.
    
    The code required to support it is quite invasive to the mainline
    code that is synced with upstream and is an ongoing maintenance burden.
    Both the hardware and software are literal museum pieces these days and
    we could not find anyone still running OpenSSH on one.

commit 174bed686968494723e6db881208cc4dac0d020f
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 13 18:12:47 2018 +1100

    Retpoline linker flag only needed for linking.

commit 075e258c2cc41e1d7f3ea2d292c5342091728d40
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 13 17:36:43 2018 +1100

    Default PidFile is sshd.pid not ssh.pid.

commit 49f3c0ec47730ea264e2bd1e6ece11167d6384df
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 13 16:27:09 2018 +1100

    Remove assigned-to-but-never-used variable.
    
    'p' was removed in previous change but I neglected to remove the
    otherwise-unused assignment to it.

commit b8bbff3b3fc823bf80c5ab226c94f13cb887d5b1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 13 03:36:56 2018 +0000

    upstream: remove space before tab
    
    OpenBSD-Commit-ID: 674edd214d0a7332dd4623c9cf8117301b012890

commit 05046d907c211cb9b4cd21b8eff9e7a46cd6c5ab
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Feb 11 21:16:56 2018 +0000

    upstream Don't reset signal handlers inside handlers.
    
    The signal handlers from the original ssh1 code on which OpenSSH
    is based assume unreliable signals and reinstall their handlers.
    Since OpenBSD (and pretty much every current system) has reliable
    signals this is not needed.  In the unlikely even that -portable
    is still being used on such systems we will deal with it in the
    compat layer.  ok deraadt@
    
    OpenBSD-Commit-ID: f53a1015cb6908431b92116130d285d71589612c

commit 3c51143c639ac686687c7acf9b373b8c08195ffb
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 13 09:07:29 2018 +1100

    Whitespace sync with upstream.

commit 19edfd4af746bedf0df17f01953ba8c6d3186eb7
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Tue Feb 13 08:25:46 2018 +1100

    Whitespace sync with upstream.

commit fbfa6f980d7460b3e12b0ce88ed3b6018edf4711
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 11 21:25:11 2018 +1300

    Move signal compat code into bsd-signal.{c,h}

commit 24d2a33bd3bf5170700bfdd8675498aa09a79eab
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 11 21:20:39 2018 +1300

    Include headers for linux/if.h.
    
    Prevents configure-time "present but cannot be compiled" warning.

commit bc02181c24fc551aab85eb2cff0f90380928ef43
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 11 19:45:47 2018 +1300

    Fix test for -z,retpolineplt linker flag.

commit 3377df00ea3fece5293db85fe63baef33bf5152e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sun Feb 11 09:32:37 2018 +1100

    Add checks for Spectre v2 mitigation (retpoline)
    
    This adds checks for gcc and clang flags for mitigations for Spectre
    variant 2, ie "retpoline".  It'll automatically enabled if the compiler
    supports it as part of toolchain hardening flag.  ok djm@

commit d9e5cf078ea5380da6df767bb1773802ec557ef0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 10 09:25:34 2018 +0000

    upstream commit
    
    constify some private key-related functions; based on
    https://github.com/openssh/openssh-portable/pull/56 by Vincent Brillault
    
    OpenBSD-Commit-ID: dcb94a41834a15f4d00275cb5051616fdc4c988c

commit a7c38215d564bf98e8e9eb40c1079e3adf686f15
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 10 09:03:54 2018 +0000

    upstream commit
    
    Mention ServerAliveTimeout in context of TCPKeepAlives;
    prompted by Christoph Anton Mitterer via github
    
    OpenBSD-Commit-ID: f0cf1b5bd3f1fbf41d71c88d75d93afc1c880ca2

commit 62562ceae61e4f7cf896566592bb840216e71061
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 10 06:54:38 2018 +0000

    upstream commit
    
    clarify IgnoreUserKnownHosts; based on github PR from
    Christoph Anton Mitterer.
    
    OpenBSD-Commit-ID: 4fff2c17620c342fb2f1f9c2d2e679aab3e589c3

commit 4f011daa4cada6450fa810f7563b8968639bb562
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 10 06:40:28 2018 +0000

    upstream commit
    
    Shorter, more accurate explanation of
    NoHostAuthenticationForLocalhost without the confusing example. Prompted by
    Christoph Anton Mitterer via github and bz#2293.
    
    OpenBSD-Commit-ID: 19dc96bea25b80d78d416b581fb8506f1e7b76df

commit 77e05394af21d3f5faa0c09ed3855e4505a5cf9f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 10 06:15:12 2018 +0000

    upstream commit
    
    Disable RemoteCommand and RequestTTY in the ssh session
    started by scp. sftp is already doing this. From Camden Narzt via github; ok
    dtucker
    
    OpenBSD-Commit-ID: 59e2611141c0b2ee579c6866e8eb9d7d8217bc6b

commit ca613249a00b64b2eea9f52d3834b55c28cf2862
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 10 05:48:46 2018 +0000

    upstream commit
    
    Refuse to create a certificate with an unusable number of
    principals; Prompted by gdestuynder via github
    
    OpenBSD-Commit-ID: 8cfae2451e8f07810e3e2546dfdcce66984cbd29

commit b56ac069d46b6f800de34e1e935f98d050731d14
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 10 05:43:26 2018 +0000

    upstream commit
    
    fatal if we're unable to write all the public key; previously
    we would silently ignore errors writing the comment and terminating newline.
    Prompted by github PR from WillerZ; ok dtucker
    
    OpenBSD-Commit-ID: 18fbfcfd4e8c6adbc84820039b64d70906e49831

commit cdb10bd431f9f6833475c27e9a82ebb36fdb12db
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 10 11:18:38 2018 +1100

    Add changelog entry for binary strip change.

commit fbddd91897cfaf456bfc2081f39fb4a2208a0ebf
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 10 11:14:54 2018 +1100

    Remove unused variables.

commit 937d96587df99c16c611d828cded292fa474a32b
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 10 11:12:45 2018 +1100

    Don't strip binaries so debuginfo gets built.
    
    Tell install not to strip binaries during package creation so that the
    debuginfo package can be built.

commit eb0865f330f59c889ec92696b97bd397090e720c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 10 10:33:11 2018 +1100

    Fix bogus dates in changelog.

commit 7fbde1b34c1f6c9ca9e9d10805ba1e5e4538e165
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 10 10:25:15 2018 +1100

    Remove SSH1 from description.

commit 9c34a76f099c4e0634bf6ecc2f40ce93925402c4
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 10 10:19:16 2018 +1100

    Add support for compat-openssl10 build dep.

commit 04f4e8193cb5a5a751fcc356bd6656291fec539e
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 10 09:57:04 2018 +1100

    Add leading zero so it'll work when rhel not set.
    
    When rhel is not set it will error out with "bad if". Add leading zero
    as per https://fedoraproject.org/wiki/Packaging:DistTag so it'll work
    on non-RHEL.

commit 12abd67a6af28476550807a443b38def2076bb92
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Sat Feb 10 09:56:34 2018 +1100

    Update openssl-devel dependency.

commit b33e7645f8813719d7f9173fef24463c8833ebb3
Author: nkadel <nkadel@gmail.com>
Date:   Sun Nov 16 18:19:58 2014 -0500

    Add mandir with-mandir' for RHEL 5 compatibility.
    
    Activate '--mandir' and '--with-mandir' settings in setup for RHEL
    5 compatibility.

commit 94f8bf360eb0162e39ddf39d69925c2e93511e40
Author: nkadel <nkadel@gmail.com>
Date:   Sun Nov 16 18:18:51 2014 -0500

    Discard 'K5DIR' reporting.
    
    It does not work inside 'mock' build environment.

commit bb7e54dbaf34b70b3e57acf7982f3a2136c94ee5
Author: nkadel <nkadel@gmail.com>
Date:   Sun Nov 16 18:17:15 2014 -0500

    Add 'dist' to 'rel' for OS specific RPM names.

commit 87346f1f57f71150a9b8c7029d8c210e27027716
Author: nkadel <nkadel@gmail.com>
Date:   Sun Nov 16 14:17:38 2014 -0500

    Add openssh-devel >= 0.9.8f for redhat spec file.

commit bec1478d710866d3c1b119343a35567a8fc71ec3
Author: nkadel <nkadel@gmail.com>
Date:   Sun Nov 16 13:10:24 2014 -0500

    Enhance BuildRequires for openssh-x11-askpass.

commit 3104fcbdd3c70aefcb0cdc3ee24948907db8dc8f
Author: nkadel <nkadel@gmail.com>
Date:   Sun Nov 16 13:04:14 2014 -0500

    Always include x11-ssh-askpass SRPM.
    
    Always include x11-ssh-askpass tarball in redhat SRPM, even if unused.

commit c61d0d038d58eebc365f31830be6e04ce373ad1b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 10 09:43:12 2018 +1100

    this is long unused; prompted by dtucker@

commit 745771fb788e41bb7cdad34e5555bf82da3af7ed
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 9 02:37:36 2018 +0000

    upstream commit
    
    Remove unused sKerberosTgtPassing from enum.  From
    calestyo via github pull req #11, ok djm@
    
    OpenBSD-Commit-ID: 1008f8870865a7c4968b7aed402a0a9e3e5b9540

commit 1f385f55332db830b0ae22a7663b98279ca2d657
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Feb 8 04:12:32 2018 +0000

    upstream commit
    
    Rename struct umac_ctx to umac128_ctx too.  In portable
    some linkers complain about two symbols with the same name having differing
    sizes.  ok djm@
    
    OpenBSD-Commit-ID: cbebf8bdd3310a9795b4939a1e112cfe24061ca3

commit f1f047fb031c0081dbc8738f05bf5d4cc47acadf
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Feb 7 22:52:45 2018 +0000

    upstream commit
    
    ssh_free checks for and handles NULL args, remove NULL
    checks from remaining callers.  ok djm@
    
    OpenBSD-Commit-ID: bb926825c53724c069df68a93a2597f9192f7e7b

commit aee49b2a89b6b323c80dd3b431bd486e51f94c8c
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Thu Feb 8 12:36:22 2018 +1100

    Set SO_REUSEADDR in regression test netcat.
    
    Sometimes multiplex tests fail on Solaris with "netcat: local_listen:
    Address already in use" which is likely due to previous invocations
    leaving the port in TIME_WAIT.  Set SO_REUSEADDR (in addition to
    SO_REUSEPORT which is alread set on platforms that support it).  ok djm@

commit 1749991c55bab716877b7c687cbfbf19189ac6f1
Author: jsing@openbsd.org <jsing@openbsd.org>
Date:   Wed Feb 7 05:17:56 2018 +0000

    upstream commit
    
    Convert some explicit_bzero()/free() calls to freezero().
    
    ok deraadt@ dtucker@
    
    OpenBSD-Commit-ID: f566ab99149650ebe58b1d4b946ea726c3829609

commit 94ec2b69d403f4318b7a0d9b17f8bc3efbf4d0d2
Author: jsing@openbsd.org <jsing@openbsd.org>
Date:   Wed Feb 7 05:15:49 2018 +0000

    upstream commit
    
    Remove some #ifdef notyet code from OpenSSL 0.9.8 days.
    
    These functions have never appeared in OpenSSL and are likely never to do
    so.
    
    "kill it with fire" djm@
    
    OpenBSD-Commit-ID: fee9560e283fd836efc2631ef381658cc673d23e

commit 7cd31632e3a6607170ed0c9ed413a7ded5b9b377
Author: jsing@openbsd.org <jsing@openbsd.org>
Date:   Wed Feb 7 02:06:50 2018 +0000

    upstream commit
    
    Remove all guards for calls to OpenSSL free functions -
    all of these functions handle NULL, from at least OpenSSL 1.0.1g onwards.
    
    Prompted by dtucker@ asking about guards for RSA_free(), when looking at
    openssh-portable pr#84 on github.
    
    ok deraadt@ dtucker@
    
    OpenBSD-Commit-ID: 954f1c51b94297d0ae1f749271e184141e0cadae

commit 3c000d57d46882eb736c6563edfc4995915c24a2
Author: Darren Tucker <dtucker@dtucker.net>
Date:   Wed Feb 7 09:19:38 2018 +1100

    Remove obsolete "Smartcard support" message
    
    The configure checks that populated $SCARD_MSG were removed in commits
    7ea845e4 and d8f60022 when the smartcard support was replaced with
    PKCS#11.

commit 3e615090de0ce36a833d811e01c28aec531247c4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Feb 6 06:01:54 2018 +0000

    upstream commit
    
    Replace "trojan horse" with the correct term (MITM).
    From maikel at predikkta.com via bz#2822, ok markus@
    
    OpenBSD-Commit-ID: e86ac64c512057c89edfadb43302ac0aa81a6c53

commit 3484380110d437c50e17f87d18544286328c75cb
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Mon Feb 5 05:37:46 2018 +0000

    upstream commit
    
    Add a couple of non-negativity checks to avoid close(-1).
    
    ok djm
    
    OpenBSD-Commit-ID: 4701ce0b37161c891c838d0931305f1d37a50880

commit 5069320be93c8b2a6584b9f944c86f60c2b04e48
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Mon Feb 5 05:36:49 2018 +0000

    upstream commit
    
    The file descriptors for socket, stdin, stdout and stderr
    aren't necessarily distinct, so check if they are the same to avoid closing
    the same fd several times.
    
    ok djm
    
    OpenBSD-Commit-ID: 60d71fd22e9a32f5639d4ba6e25a2f417fc36ac1

commit 2b428f90ea1b21d7a7c68ec1ee334253b3f9324d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 5 04:02:53 2018 +0000

    upstream commit
    
    I accidentially a word
    
    OpenBSD-Commit-ID: 4547ee713fa941da861e83ae7a3e6432f915e14a

commit 130283d5c2545ff017c2162dc1258c5354e29399
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 25 03:34:43 2018 +0000

    upstream commit
    
    certificate options are case-sensitive; fix case on one
    that had it wrong.
    
    move a badly-place sentence to a less bad place
    
    OpenBSD-Commit-ID: 231e516bba860699a1eece6d48532d825f5f747b

commit 89f09ee68730337015bf0c3f138504494a34e9a6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 24 12:20:44 2018 +1100

    crypto_api.h needs includes.h

commit c9c1bba06ad1c7cad8548549a68c071bd807af60
Author: stsp@openbsd.org <stsp@openbsd.org>
Date:   Tue Jan 23 20:00:58 2018 +0000

    upstream commit
    
    Fix a logic bug in sshd_exchange_identification which
    prevented clients using major protocol version 2 from connecting to the
    server. ok millert@
    
    OpenBSD-Commit-ID: 8668dec04586e27f1c0eb039ef1feb93d80a5ee9

commit a60c5dcfa2538ffc94dc5b5adb3db5b6ed905bdb
Author: stsp@openbsd.org <stsp@openbsd.org>
Date:   Tue Jan 23 18:33:49 2018 +0000

    upstream commit
    
    Add missing braces; fixes 'write: Socket is not
    connected' error in ssh. ok deraadt@
    
    OpenBSD-Commit-ID: db73a3a9e147722d410866cac34d43ed52e1ad24

commit 20d53ac283e1c60245ea464bdedd015ed9b38f4a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 23 16:49:43 2018 +1100

    rebuild depends

commit 552ea155be44f9c439c1f9f0c38f9e593428f838
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 23 16:49:22 2018 +1100

    one SSH_BUG_BANNER instance that got away

commit 14b5c635d1190633b23ac3372379517fb645b0c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 23 05:27:21 2018 +0000

    upstream commit
    
    Drop compatibility hacks for some ancient SSH
    implementations, including ssh.com <=2.* and OpenSSH <= 3.*.
    
    These versions were all released in or before 2001 and predate the
    final SSH RFCs. The hacks in question aren't necessary for RFC-
    compliant SSH implementations.
    
    ok markus@
    
    OpenBSD-Commit-ID: 4be81c67db57647f907f4e881fb9341448606138

commit 7c77991f5de5d8475cbeb7cbb06d0c7d1611d7bb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 23 05:17:04 2018 +0000

    upstream commit
    
    try harder to preserve errno during
    ssh_connect_direct() to make the final error message possibly accurate;
    bz#2814, ok dtucker@
    
    OpenBSD-Commit-ID: 57de882cb47381c319b04499fef845dd0c2b46ca

commit 9e9c4a7e57b96ab29fe6d7545ed09d2e5bddbdec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 23 05:12:12 2018 +0000

    upstream commit
    
    unbreak support for clients that advertise a protocol
    version of "1.99" (indicating both v2 and v1 support). Busted by me during
    SSHv1 purge in r1.358; bz2810, ok dtucker
    
    OpenBSD-Commit-ID: e8f9c2bee11afc16c872bb79d6abe9c555bd0e4b

commit fc21ea97968264ad9bb86b13fedaaec8fd3bf97d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 23 05:06:25 2018 +0000

    upstream commit
    
    don't attempt to force hostnames that are addresses to
    lowercase, but instead canonicalise them through getnameinfo/getaddrinfo to
    remove ambiguities (e.g. ::0001 => ::1) before they are matched against
    known_hosts; bz#2763, ok dtucker@
    
    OpenBSD-Commit-ID: ba0863ff087e61e5c65efdbe53be3cb92c9aefa0

commit d6364f6fb1a3d753d7ca9bf15b2adce961324513
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 23 05:01:15 2018 +0000

    upstream commit
    
    avoid modifying pw->pw_passwd; let endpwent() clean up
    for us, but keep a scrubbed copy; bz2777, ok dtucker@
    
    OpenBSD-Commit-ID: 715afc0f59c6b82c4929a73279199ed241ce0752

commit a69bbb07cd6fb4dfb9bdcacd370ab26d0a2b4215
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Sat Jan 13 00:24:09 2018 +0000

    upstream commit
    
    clarify authorship; prodded by and ok markus@
    
    OpenBSD-Commit-ID: e1938eee58c89b064befdabe232835fa83bb378c

commit 04214b30be3d3e73a01584db4e040d5ccbaaddd4
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 8 15:37:21 2018 +0000

    upstream commit
    
    group shared source files (e.g. SRCS_KEX) and allow
    compilation w/o OPENSSL ok djm@
    
    OpenBSD-Commit-ID: fa728823ba21c4b45212750e1d3a4b2086fd1a62

commit 25cf9105b849932fc3b141590c009e704f2eeba6
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 8 15:21:49 2018 +0000

    upstream commit
    
    move subprocess() so scp/sftp do not need uidswap.o; ok
    djm@
    
    OpenBSD-Commit-ID: 6601b8360388542c2e5fef0f4085f8e54750bea8

commit b0d34132b3ca26fe94013f01d7b92101e70b68bb
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 8 15:18:46 2018 +0000

    upstream commit
    
    switch ssh-pkcs11-helper to new API; ok djm@
    
    OpenBSD-Commit-ID: e0c0ed2a568e25b1d2024f3e630f3fea837c2a42

commit ec4a9831184c0c6ed5f7f0cfff01ede5455465a3
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 8 15:15:36 2018 +0000

    upstream commit
    
    split client/server kex; only ssh-keygen needs
    uuencode.o; only scp/sftp use progressmeter.o; ok djm@
    
    OpenBSD-Commit-ID: f2c9feb26963615c4fece921906cf72e248b61ee

commit ec77efeea06ac62ee1d76fe0b3225f3000775a9e
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 8 15:15:17 2018 +0000

    upstream commit
    
    only ssh-keygen needs uuencode.o; only scp/sftp use
    progressmeter.o
    
    OpenBSD-Commit-ID: a337e886a49f96701ccbc4832bed086a68abfa85

commit 25aae35d3d6ee86a8c4c0b1896acafc1eab30172
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 8 15:14:44 2018 +0000

    upstream commit
    
    uuencode.h is not used
    
    OpenBSD-Commit-ID: 238eb4659f3c119904326b9e94a5e507a912796c

commit 4f29309c4cb19bcb1774931db84cacc414f17d29
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 3 19:50:43 2018 +1100

    unbreak fuzz harness

commit f6b50bf84dc0b61f22c887c00423e0ea7644e844
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 21 05:46:35 2017 +0000

    upstream commit
    
    another libssh casualty
    
    OpenBSD-Regress-ID: 839b970560246de23e7c50215095fb527a5a83ec

commit 5fb4fb5a0158318fb8ed7dbb32f3869bbf221f13
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 21 03:01:49 2017 +0000

    upstream commit
    
    missed one (unbreak after ssh/lib removal)
    
    OpenBSD-Regress-ID: cfdd132143131769e2d2455e7892b5d55854c322

commit e6c4134165d05447009437a96e7201276688807f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 21 00:41:22 2017 +0000

    upstream commit
    
    unbreak unit tests after removal of src/usr.bin/ssh/lib
    
    OpenBSD-Regress-ID: 3a79760494147b20761cbd2bd5c20e86c63dc8f9

commit d45d69f2a937cea215c7f0424e5a4677b6d8c7fe
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 21 00:00:28 2017 +0000

    upstream commit
    
    revert stricter key type / signature type checking in
    userauth path; too much software generates inconsistent messages, so we need
    a better plan.
    
    OpenBSD-Commit-ID: 4a44ddc991c803c4ecc8f1ad40e0ab4d22e1c519

commit c5a6cbdb79752f7e761074abdb487953ea6db671
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 19 00:49:30 2017 +0000

    upstream commit
    
    explicitly test all key types and their certificate
    counterparts
    
    refactor a little
    
    OpenBSD-Regress-ID: e9ecd5580821b9ef8b7106919c6980d8e45ca8c4

commit f689adb7a370b5572612d88be9837ca9aea75447
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Dec 11 11:41:56 2017 +0000

    upstream commit
    
    use cmp in a loop instead of diff -N to compare
    directories. The former works on more platforms for Portable.
    
    OpenBSD-Regress-ID: c3aa72807f9c488e8829a26ae50fe5bcc5b57099

commit 748dd8e5de332b24c40f4b3bbedb902acb048c98
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 19 16:17:59 2017 +1100

    remove blocks.c from Makefile

commit 278856320520e851063b06cef6ef1c60d4c5d652
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 19 00:24:34 2017 +0000

    upstream commit
    
    include signature type and CA key (if applicable) in some
    debug messages
    
    OpenBSD-Commit-ID: b71615cc20e78cec7105bb6e940c03ce9ae414a5

commit 7860731ef190b52119fa480f8064ab03c44a120a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 23:16:23 2017 +0000

    upstream commit
    
    unbreak hostkey rotation; attempting to sign with a
    desired signature algorithm of kex->hostkey_alg is incorrect when the key
    type isn't capable of making those signatures. ok markus@
    
    OpenBSD-Commit-ID: 35ae46864e1f5859831ec0d115ee5ea50953a906

commit 966ef478339ad5e631fb684d2a8effe846ce3fd4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 23:14:34 2017 +0000

    upstream commit
    
    log mismatched RSA signature types; ok markus@
    
    OpenBSD-Commit-ID: 381bddfcc1e297a42292222f3bcb5ac2b7ea2418

commit 349ecd4da3a985359694a74635748009be6baca6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 23:13:42 2017 +0000

    upstream commit
    
    pass kex->hostkey_alg and kex->hostkey_nid from pre-auth
    to post-auth unpriviledged child processes; ok markus@
    
    OpenBSD-Commit-ID: 4a35bc7af0a5f8a232d1361f79f4ebc376137302

commit c9e37a8725c083441dd34a8a53768aa45c3c53fe
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Mon Dec 18 17:28:54 2017 +0000

    upstream commit
    
    Add helper function for uri handing in scp where a
    missing path simply means ".".  Also fix exit code and add warnings when an
    invalid uri is encountered.  OK otto@
    
    OpenBSD-Commit-ID: 47dcf872380586dabf7fcc6e7baf5f8ad508ae1a

commit 04c7e28f83062dc42f2380d1bb3a6bf0190852c0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 02:25:15 2017 +0000

    upstream commit
    
    pass negotiated signing algorithm though to
    sshkey_verify() and check that the negotiated algorithm matches the type in
    the signature (only matters for RSA SHA1/SHA2 sigs). ok markus@
    
    OpenBSD-Commit-ID: 735fb15bf4adc060d3bee9d047a4bcaaa81b1af9

commit 931c78dfd7fe30669681a59e536bbe66535f3ee9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 18 02:22:29 2017 +0000

    upstream commit
    
    sshkey_sigtype() function to return the type of a
    signature; ok markus@
    
    OpenBSD-Commit-ID: d3772b065ad6eed97285589bfb544befed9032e8

commit 4cdc5956f2fcc9e9078938db833142dc07d8f523
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Thu Dec 14 21:07:39 2017 +0000

    upstream commit
    
    Replace ED25519's private SHA-512 implementation with a
    call to the regular digest code.  This speeds up compilation considerably. ok
    markus@
    
    OpenBSD-Commit-ID: fcce8c3bcfe7389462a28228f63c823e80ade41c

commit 012e5cb839faf76549e3b6101b192fe1a74d367e
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Tue Dec 12 15:06:12 2017 +0000

    upstream commit
    
    Create a persistent umac128.c source file: #define the
    output size and the name of the entry points for UMAC-128 before including
    umac.c. Idea from FreeBSD. ok dtucker@
    
    OpenBSD-Commit-ID: 463cfacfa07cb8060a4d4961e63dca307bf3f4b1

commit b35addfb4cd3b5cdb56a2a489d38e940ada926c7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 11 16:23:28 2017 +1100

    Update .depend with empty config.h

commit 2d96f28246938e0ca474a939d8ac82ecd0de27e3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 11 16:21:55 2017 +1100

    Ensure config.h is always in dependencies.
    
    Put an empty config.h into the dependency list to ensure that it's
    always listed and consistent.

commit ac4987a55ee5d4dcc8e87f7ae7c1f87be7257d71
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sun Dec 10 19:37:57 2017 +0000

    upstream commit
    
    ssh/lib hasn't worked towards our code-sharing goals for
    a quit while, perhaps it is too verbose?  Change each */Makefile to
    specifying exactly what sources that program requires, compiling it seperate.
     Maybe we'll iterate by sorting those into seperatable chunks, splitting up
    files which contain common code + server/client specific code, or whatnot.
    But this isn't one step, or we'd have done it a long time ago.. ok dtucker
    markus djm
    
    OpenBSD-Commit-ID: 5317f294d63a876bfc861e19773b1575f96f027d

commit 48c23a39a8f1069a57264dd826f6c90aa12778d5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Dec 10 05:55:29 2017 +0000

    upstream commit
    
    Put remote client info back into the ClientAlive
    connection termination message.  Based in part on diff from  lars.nooden at
    gmail, ok djm
    
    OpenBSD-Commit-ID: 80a0f619a29bbf2f32eb5297a69978a0e05d0ee0

commit aabd75ec76575c1b17232e6526a644097cd798e5
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Dec 8 03:45:52 2017 +0000

    upstream commit
    
    time_t printing needs %lld and (long long) casts ok djm
    
    OpenBSD-Commit-ID: 4a93bc2b0d42a39b8f8de8bb74d07ad2e5e83ef7

commit fd4eeeec16537870bd40d04836c7906ec141c17d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 8 02:14:33 2017 +0000

    upstream commit
    
    fix ordering in previous to ensure errno isn't clobbered
    before logging.
    
    OpenBSD-Commit-ID: e260bc1e145a9690dcb0d5aa9460c7b96a0c8ab2

commit 155072fdb0d938015df828836beb2f18a294ab8a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 8 02:13:02 2017 +0000

    upstream commit
    
    for some reason unix_listener() logged most errors twice
    with each message containing only some of the useful information; merge these
    
    OpenBSD-Commit-ID: 1978a7594a9470c0dddcd719586066311b7c9a4a

commit 79c0e1d29959304e5a49af1dbc58b144628c09f3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 11 14:38:33 2017 +1100

    Add autogenerated dependency info to Makefile.
    
    Adds a .depend file containing dependency information generated by
    makedepend, which is appended to the generated Makefile by configure.
    
    You can regen the file with "make -f Makefile.in depend" if necessary,
    but we'll be looking at some way to automatically keep this up to date.
    
    "no objection" djm@

commit f001de8fbf7f3faddddd8efd03df18e57601f7eb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 11 13:42:51 2017 +1100

    Fix pasto in ldns handling.
    
    When ldns-config is not found, configure would check the wrong variable.
    ok djm@

commit c5bfe83f67cb64e71cf2fe0d1500f6904b0099ee
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Dec 9 10:12:23 2017 +1100

    Portable switched to git so s/CVS/git/.

commit bb82e61a40a4ee52e4eb904caaee2c27b763ab5b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Dec 9 08:06:00 2017 +1100

    Remove now-used check for perl.

commit e0ce54c0b9ca3a9388f9c50f4fa6cc25c28a3240
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Dec 6 05:06:21 2017 +0000

    upstream commit
    
    don't accept junk after "yes" or "no" responses to
    hostkey prompts. bz#2803 reported by Maksim Derbasov; ok dtucker@
    
    OpenBSD-Commit-ID: e1b159fb2253be973ce25eb7a7be26e6f967717c

commit 609d96b3d58475a15b2eb6b3d463f2c5d8e510c0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Dec 5 23:59:47 2017 +0000

    upstream commit
    
    Replace atoi and strtol conversions for integer arguments
    to config keywords with a checking wrapper around strtonum.  This will
    prevent and flag invalid and negative arguments to these keywords.  ok djm@
    
    OpenBSD-Commit-ID: 99ae3981f3d608a219ccb8d2fff635ae52c17998

commit 168ecec13f9d7cb80c07df3bf7d414f4e4165e84
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Dec 5 23:56:07 2017 +0000

    upstream commit
    
    Add missing break for rdomain.  Prevents spurious
    "Deprecated option" warnings.  ok djm@
    
    OpenBSD-Commit-ID: ba28a675d39bb04a974586241c3cba71a9c6099a

commit 927f8514ceffb1af380a5f63ab4d3f7709b1b198
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 5 01:30:19 2017 +0000

    upstream commit
    
    include the addr:port in bind/listen failure messages
    
    OpenBSD-Commit-ID: fdadb69fe1b38692608809cf0376b71c2c28e58e

commit a8c89499543e2d889629c4e5e8dcf47a655cf889
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Nov 29 05:49:54 2017 +0000

    upstream commit
    
    Import updated moduli.
    
    OpenBSD-Commit-ID: 524d210f982af6007aa936ca7f4c977f4d32f38a

commit 3dde09ab38c8e1cfc28252be473541a81bc57097
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Nov 28 21:10:22 2017 +0000

    upstream commit
    
    Have sftp print a warning about shell cleanliness when
    decoding the first packet fails, which is usually caused by shells polluting
    stdout of non-interactive starups.  bz#2800, ok markus@ deraadt@.
    
    OpenBSD-Commit-ID: 88d6a9bf3470f9324b76ba1cbd53e50120f685b5

commit 6c8a246437f612ada8541076be2414846d767319
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 1 17:11:47 2017 +1100

    Replace mkinstalldirs with mkdir -p.
    
    Check for MIKDIR_P and use it instead of mkinstalldirs.  Should fix "mkdir:
    cannot create directory:... File exists" during "make install".
    Patch from eb at emlix.com.

commit 3058dd78d2e43ed0f82ad8eab8bb04b043a72023
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 1 17:07:08 2017 +1100

    Pull in newer install-sh from autoconf-2.69.
    
    Suggested by eb at emlix.com

commit 79226e5413c5b0fda3511351a8511ff457e306d8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 1 16:55:35 2017 +1100

    Remove RSA1 host key generation.
    
    SSH1 support is now gone, remove SSH1 key generation.
    Patch from eb at emlix.com.

commit 2937dd02c572a12f33d5c334d518f6cbe0b645eb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 28 06:09:38 2017 +0000

    upstream commit
    
    more whitespace errors
    
    OpenBSD-Commit-ID: 5e11c125378327b648940b90145e0d98beb05abb

commit 7f257bf3fd3a759f31098960cbbd1453fafc4164
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Tue Nov 28 06:04:51 2017 +0000

    upstream commit
    
    whitespace at EOL
    
    OpenBSD-Commit-ID: 76d3965202b22d59c2784a8df3a8bfa5ee67b96a

commit 5db6fbf1438b108e5df3e79a1b4de544373bc2d4
Author: dtucker@openbsd.org@openbsd.org <dtucker@openbsd.org@openbsd.org>
Date:   Sat Nov 25 06:46:22 2017 +0000

    upstream commit
    
    Add monotime_ts and monotime_tv that return monotonic
    timespec and timeval respectively.  Replace calls to gettimeofday() in packet
    timing with monotime_tv so that the callers will work over a clock step.
    Should prevent integer overflow during clock steps reported by wangle6 at
    huawei.com. "I like" markus@
    
    OpenBSD-Commit-ID: 74d684264814ff806f197948b87aa732cb1b0b8a

commit 2d638e986085bdf1a40310ed6e2307463db96ea0
Author: dtucker@openbsd.org@openbsd.org <dtucker@openbsd.org@openbsd.org>
Date:   Sat Nov 25 05:58:47 2017 +0000

    upstream commit
    
    Remove get_current_time() and replace with calls to
    monotime_double() which uses CLOCK_MONOTONIC and works over clock steps.  "I
    like" markus@
    
    OpenBSD-Commit-ID: 3ad2f7d2414e2cfcaef99877a7a5b0baf2242952

commit ba460acae48a36ef749cb23068f968f4d5d90a24
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 24 16:24:31 2017 +1100

    Include string.h for explicit_bzero.

commit a65655fb1a12b77fb22f9e71559b9d73030ec8ff
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 24 10:23:47 2017 +1100

    fix incorrect range of OpenSSL versions supported
    
    Pointed out by Solar Designer

commit 83a1e5dbec52d05775174f368e0c44b08619a308
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Wed Nov 15 02:10:16 2017 +0000

    upstream commit
    
    downgrade a couple more request parsing errors from
    process-fatal to just returning failure, making them consistent with the
    others that were already like that.
    
    OpenBSD-Commit-ID: c111461f7a626690a2d53018ef26557b34652918

commit 93c68a8f3da8e5e6acdc3396f54d73919165e242
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Wed Nov 15 00:13:40 2017 +0000

    upstream commit
    
    fix regression in 7.6: failure to parse a signature request
    message shouldn't be fatal to the process, just the request. Reported by Ron
    Frederick
    
    OpenBSD-Commit-ID: e5d01b3819caa1a2ad51fc57d6ded43f48bbcc05

commit 548d3a66feb64c405733932a6b1abeaf7198fa71
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Tue Nov 14 00:45:29 2017 +0000

    upstream commit
    
    fix problem in configuration parsing when in config dump mode
    (sshd -T) without providing a full connection specification (sshd -T -C ...)
    
    spotted by bluhm@
    
    OpenBSD-Commit-ID: 7125faf5740eaa9d3a2f25400a0bc85e94e28b8f

commit 33edb6ebdc2f81ebed1bceadacdfb8910b64fb88
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Fri Nov 3 05:18:44 2017 +0000

    upstream commit
    
    reuse parse_multistate for parse_flag (yes/no arguments).
    Saves a few lines of code and makes the parser more consistent wrt case-
    sensitivity.  bz#2664 ok dtucker@
    
    OpenBSD-Commit-ID: b2ad1b6086858d5db71c7b11e5a74dba6d60efef

commit d52131a98316e76c0caa348f09bf6f7b9b01a1b9
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Fri Nov 3 05:14:04 2017 +0000

    upstream commit
    
    allow certificate validity intervals that specify only a
    start or stop time (we already support specifying both or neither)
    
    OpenBSD-Commit-ID: 9be486545603c003030bdb5c467d1318b46b4e42

commit fbe8e7ac94c2fa380421a9205a8bc966549c2f91
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Fri Nov 3 03:46:52 2017 +0000

    upstream commit
    
    allow "cd" and "lcd" commands with no explicit path
    argument. lcd will change to the local user's home directory as usual. cd
    will change to the starting directory for session (because the protocol
    offers no way to obtain the remote user's home directory). bz#2760 ok
    dtucker@
    
    OpenBSD-Commit-ID: 15333f5087cee8c1ed1330cac1bd0a3e6a767393

commit 0208a48517b5e8e8b091f32fa4addcd67c31ca9e
Author: dtucker@openbsd.org@openbsd.org <dtucker@openbsd.org@openbsd.org>
Date:   Fri Nov 3 03:18:53 2017 +0000

    upstream commit
    
    When doing a config test with sshd -T, only require the
    attributes that are actually used in Match criteria rather than (an
    incomplete list of) all criteria.  ok djm@, man page help jmc@
    
    OpenBSD-Commit-ID: b4e773c4212d3dea486d0259ae977551aab2c1fc

commit c357eed5a52cd2f4ff358b17e30e3f9a800644da
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Fri Nov 3 02:32:19 2017 +0000

    upstream commit
    
    typos in ECDSA certificate names; bz#2787 reported by
    Mike Gerow
    
    OpenBSD-Commit-ID: 824938b6aba1b31321324ba1f56c05f84834b163

commit ecbf005b8fd80b81d0c61dfc1e96fe3da6099395
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Fri Nov 3 02:29:17 2017 +0000

    upstream commit
    
    Private keys in PEM format have been encrypted by AES-128 for
    a while (not 3DES). bz#2788 reported by Calum Mackay
    
    OpenBSD-Commit-ID: bd33da7acbbb3c882f0a0ee56007a35ce0d8a11a

commit 81c9ccdbf6ddbf9bfbd6f1f775a5a7c13e47e185
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 3 14:52:51 2017 +1100

    Check for linux/if.h when enabling rdomain.
    
    musl libc doesn't seem to have linux/if.h, so check for its presence
    before enabling rdomain support on Linux.

commit fa1b834cce41a1ce3e6a8d57fb67ef18c9dd803f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 3 14:09:45 2017 +1100

    Add headers for sys/sysctl.h and net/route.h
    
    On at least older OpenBSDs, sys/sysctl.h and net/route.h require
    sys/types and, in the case of sys/sysctl.h, sys/param.h for MAXLOGNAME.

commit 41bff4da21fcd8a7c6a83a7e0f92b018f904f6fb
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Fri Nov 3 02:22:41 2017 +0000

    upstream commit
    
    avoid unused variable warnings for !WITH_OPENSSL; patch from
    Marcus Folkesson
    
    OpenBSD-Commit-ID: c01d27a3f907acdc3dd4ea48170fac3ba236d229

commit 6b373e4635a7470baa94253dd1dc8953663da9e8
Author: Marcus Folkesson <marcus.folkesson@gmail.com>
Date:   Sat Oct 28 19:48:39 2017 +0200

    only enable functions in dh.c when openssl is used
    
    Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>

commit 939b30ba23848b572e15bf92f0f1a3d9cf3acc2b
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Wed Nov 1 00:04:15 2017 +0000

    upstream commit
    
    fix broken stdout in ControlPersist mode, introduced by me in
    r1.467 and reported by Alf Schlichting
    
    OpenBSD-Commit-ID: 3750a16e02108fc25f747e4ebcedb7123c1ef509

commit f21455a084f9cc3942cf1bde64055a4916849fed
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 31 10:09:33 2017 +1100

    Include includes.h for HAVE_GETPAGESIZE.
    
    The configure script checks for getpagesize() and sets HAVE_GETPAGESIZE in
    config.h, but bsd-getpagesize.c forgot to include includes.h (which
    indirectly includes config.h) so the checks always fails, causing linker
    issues when linking statically on systems with getpagesize().
    
    Patch from Peter Korsgaard <peter at korsgaard.com>

commit f2ad63c0718b93ac1d1e85f53fee33b06eef86b5
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Mon Oct 30 22:01:52 2017 +0000

    upstream commit
    
    whitespace at EOL
    
    OpenBSD-Regress-ID: f4b5df99b28c6f63478deb916c6ed0e794685f07

commit c6415b1f8f1d0c2735564371647fd6a177fb9a3e
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Mon Oct 30 21:59:43 2017 +0000

    upstream commit
    
    whitespace at EOL
    
    OpenBSD-Regress-ID: 19b1394393deee4c8a2114a3b7d18189f27a15cd

commit e4d4ddbbba0e585ca3ec3a455430750b4622a6d3
Author: millert@openbsd.org@openbsd.org <millert@openbsd.org@openbsd.org>
Date:   Wed Oct 25 20:08:36 2017 +0000

    upstream commit
    
    Use printenv to test whether an SSH_USER_AUTH is set
    instead of using $SSH_USER_AUTH.  The latter won't work with csh which treats
    unknown variables as an error when expanding them.  OK markus@
    
    OpenBSD-Regress-ID: f601e878dd8b71aa40381573dde3a8f567e6f2d1

commit 116b1b439413a724ebb3320633a64dd0f3ee1fe7
Author: millert@openbsd.org@openbsd.org <millert@openbsd.org@openbsd.org>
Date:   Tue Oct 24 19:33:32 2017 +0000

    upstream commit
    
    Add tests for URI parsing.  OK markus@
    
    OpenBSD-Regress-ID: 5d1df19874f3b916d1a2256a905526e17a98bd3b

commit dbe0662e9cd482593a4a8bf58c6481bfe8a747a4
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Fri Oct 27 01:57:06 2017 +0000

    upstream commit
    
    whitespace at EOL
    
    OpenBSD-Commit-ID: c95549cf5a07d56ea11aaff818415118720214f6

commit d2135474344335a7c6ee643b6ade6db400fa76ee
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Fri Oct 27 01:01:17 2017 +0000

    upstream commit
    
    whitespace at EOL (lots)
    
    OpenBSD-Commit-ID: 757257dd44116794ee1b5a45c6724973de181747

commit b77c29a07f5a02c7c1998701c73d92bde7ae1608
Author: djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org>
Date:   Fri Oct 27 00:18:41 2017 +0000

    upstream commit
    
    improve printing of rdomain on accept() a little
    
    OpenBSD-Commit-ID: 5da58db2243606899cedaa646c70201b2d12247a

commit 68d3bbb2e6dfbf117c46e942142795b2cdd0274b
Author: jmc@openbsd.org@openbsd.org <jmc@openbsd.org@openbsd.org>
Date:   Thu Oct 26 06:44:01 2017 +0000

    upstream commit
    
    mark up the rdomain keyword;
    
    OpenBSD-Commit-ID: 1b597d0ad0ad20e94dbd61ca066057e6f6313b8a

commit 0b2e2896b9d0d6cfb59e9ec8271085296bd4e99b
Author: jmc@openbsd.org@openbsd.org <jmc@openbsd.org@openbsd.org>
Date:   Wed Oct 25 06:19:46 2017 +0000

    upstream commit
    
    tweak the uri text, specifically removing some markup to
    make it a bit more readable;
    
    issue reported by - and diff ok - millert
    
    OpenBSD-Commit-ID: 8b56a20208040b2d0633536fd926e992de37ef3f

commit 7530e77bdc9415386d2a8ea3d086e8b611b2ba40
Author: jmc@openbsd.org@openbsd.org <jmc@openbsd.org@openbsd.org>
Date:   Wed Oct 25 06:18:06 2017 +0000

    upstream commit
    
    simplify macros in previous, and some minor tweaks;
    
    OpenBSD-Commit-ID: 6efeca3d8b095b76e21b484607d9cc67ac9a11ca

commit eb9c582b710dc48976b48eb2204218f6863bae9a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 31 00:46:29 2017 +1100

    Switch upstream git repository.
    
    Previously portable OpenSSH has synced against a conversion of OpenBSD's
    CVS repository made using the git cvsimport tool, but this has become
    increasingly unreliable.
    
    As of this commit, portable OpenSSH now tracks a conversion of the
    OpenBSD CVS upstream made using the excellent cvs2gitdump tool from
    YASUOKA Masahiko: https://github.com/yasuoka/cvs2gitdump
    
    cvs2gitdump is considerably more reliable than gitcvsimport and the old
    version of cvsps that it uses under the hood, and is the same tool used
    to export the entire OpenBSD repository to git (so we know it can cope
    with future growth).
    
    These new conversions are mirrored at github, so interested parties can
    match portable OpenSSH commits to their upstream counterparts.
    
    https://github.com/djmdjm/openbsd-openssh-src
    https://github.com/djmdjm/openbsd-openssh-regress
    
    An unfortunate side effect of switching upstreams is that we must have
    a flag day, across which the upstream commit IDs will be inconsistent.
    The old commit IDs are recorded with the tags "Upstream-ID" for main
    directory commits and "Upstream-Regress-ID" for regress commits.
    
    To make it clear that the commit IDs do not refer to the same
    things, the new repository will instead use "OpenBSD-ID" and
    "OpenBSD-Regress-ID" tags instead.
    
    Apart from being a longwinded explanation of what is going on, this
    commit message also serves to synchronise our tools with the state of
    the tree, which happens to be:
    
    OpenBSD-ID: 9c43a9968c7929613284ea18e9fb92e4e2a8e4c1
    OpenBSD-Regress-ID: b33b385719420bf3bc57d664feda6f699c147fef

commit 2de5c6b53bf063ac698596ef4e23d8e3099656ea
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 27 08:42:33 2017 +1100

    fix rdomain compilation errors

commit 6bd5b569fd6dfd5e8c8af20bbc41e45c2d6462ab
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 25 14:15:42 2017 +1100

    autoconf glue to enable Linux VRF

commit 97c5aaf925d61641d599071abb56012cde265978
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 25 14:09:56 2017 +1100

    basic valid_rdomain() implementation for Linux

commit ce1cca39d7935dd394080ce2df62f5ce5b51f485
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 25 13:47:59 2017 +1100

    implement get/set_rdomain() for Linux
    
    Not enabled, pending implementation of valid_rdomain() and autoconf glue

commit 6eee79f9b8d4a3b113b698383948a119acb82415
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 25 13:22:29 2017 +1100

    stubs for rdomain replacement functions

commit f5594f939f844bbb688313697d6676238da355b3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 25 13:13:57 2017 +1100

    rename port-tun.[ch] => port-net.[ch]
    
    Ahead of adding rdomain support

commit d685e5a31feea35fb99e1a31a70b3c60a7f2a0eb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 25 02:10:39 2017 +0000

    upstream commit
    
    uninitialised variable in PermitTunnel printing code
    
    Upstream-ID: f04dc33e42855704e116b8da61095ecc71bc9e9a

commit 43c29bb7cfd46bbbc61e0ffa61a11e74d49a712f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 25 13:10:59 2017 +1100

    provide hooks and fallbacks for rdomain support

commit 3235473bc8e075fad7216b7cd62fcd2b0320ea04
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 25 11:25:43 2017 +1100

    check for net/route.h and sys/sysctl.h

commit 4d5456c7de108e17603a0920c4d15bca87244921
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 25 00:21:37 2017 +0000

    upstream commit
    
    transfer ownership of stdout to the session channel by
    dup2'ing /dev/null to fd 1. This allows propagation of remote stdout close to
    the local side; reported by David Newall, ok markus@
    
    Upstream-ID: 8d9ac18a11d89e6b0415f0cbf67b928ac67f0e79

commit 68af80e6fdeaeb79432209db614386ff0f37e75f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 25 00:19:47 2017 +0000

    upstream commit
    
    add a "rdomain" criteria for the sshd_config Match
    keyword to allow conditional configuration that depends on which rdomain(4) a
    connection was recevied on. ok markus@
    
    Upstream-ID: 27d8fd5a3f1bae18c9c6e533afdf99bff887a4fb

commit 35eb33fb957979e3fcbe6ea0eaee8bf4a217421a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 25 00:17:08 2017 +0000

    upstream commit
    
    add sshd_config RDomain keyword to place sshd and the
    subsequent user session (including the shell and any TCP/IP forwardings) into
    the specified rdomain(4)
    
    ok markus@
    
    Upstream-ID: be2358e86346b5cacf20d90f59f980b87d1af0f5

commit acf559e1cffbd1d6167cc1742729fc381069f06b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 25 00:15:35 2017 +0000

    upstream commit
    
    Add optional rdomain qualifier to sshd_config's
    ListenAddress option to allow listening on a different rdomain(4), e.g.
    
    ListenAddress 0.0.0.0 rdomain 4
    
    Upstream-ID: 24b6622c376feeed9e9be8b9605e593695ac9091

commit b9903ee8ee8671b447fc260c2bee3761e26c7227
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Tue Oct 24 19:41:45 2017 +0000

    upstream commit
    
    Kill dead store and some spaces vs. tabs indent in
    parse_user_host_path(). Noticed by markus@
    
    Upstream-ID: 114fec91dadf9af46c7c94fd40fc630ea2de8200

commit 0869627e00f4ee2a038cb62d7bd9ffad405e1800
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Oct 24 06:27:42 2017 +0000

    upstream commit
    
    tweak previous; ok djm
    
    Upstream-ID: 7d913981ab315296be1f759c67b6e17aea38fca9

commit e3fa20e2e58fdc88a0e842358778f2de448b771b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 23 16:25:24 2017 +1100

    avoid -Wsign-compare warning in argv copying

commit b7548b12a6b2b4abf4d057192c353147e0abba08
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 23 05:08:00 2017 +0000

    upstream commit
    
    Expose devices allocated for tun/tap forwarding.
    
    At the client, the device may be obtained from a new %T expansion
    for LocalCommand.
    
    At the server, the allocated devices will be listed in a
    SSH_TUNNEL variable exposed to the environment of any user sessions
    started after the tunnel forwarding was established.
    
    ok markus
    
    Upstream-ID: e61e53f8ae80566e9ddc0d67a5df5bdf2f3c9f9e

commit 887669ef032d63cf07f53cada216fa8a0c9a7d72
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Sat Oct 21 23:06:24 2017 +0000

    upstream commit
    
    Add URI support to ssh, sftp and scp.  For example
    ssh://user@host or sftp://user@host/path.  The connection parameters
    described in draft-ietf-secsh-scp-sftp-ssh-uri-04 are not implemented since
    the ssh fingerprint format in the draft uses md5 with no way to specify the
    hash function type.  OK djm@
    
    Upstream-ID: 4ba3768b662d6722de59e6ecb00abf2d4bf9cacc

commit d27bff293cfeb2252f4c7a58babe5ad3262c6c98
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 20 13:22:00 2017 +1100

    Fix missed RCSID merges

commit d3b6aeb546242c9e61721225ac4387d416dd3d5e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 20 02:13:41 2017 +0000

    upstream commit
    
    more RCSIDs
    
    Upstream-Regress-ID: 1aecbe3f8224793f0ec56741a86d619830eb33be

commit b011edbb32e41aaab01386ce4c0efcc9ff681c4a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 20 01:56:39 2017 +0000

    upstream commit
    
    add RCSIDs to these; they make syncing portable a bit
    easier
    
    Upstream-ID: 56cb7021faea599736dd7e7f09c2e714425b1e68

commit 6eb27597781dccaf0ec2b80107a9f0592a0cb464
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 20 12:54:15 2017 +1100

    upstream commit
    
    Apply missing commit 1.11 to kexc25519s.c
    
    Upstream-ID: 5f020e23a1ee6c3597af1f91511e68552cdf15e8

commit 6f72280553cb6918859ebcacc717f2d2fafc1a27
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 20 12:52:50 2017 +1100

    upstream commit
    
    Apply missing commit 1.127 to servconf.h
    
    Upstream-ID: f14c4bac74a2b7cf1e3cff6bea5c447f192a7d15

commit bb3e16ab25cb911238c2eb7455f9cf490cb143cc
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Oct 18 05:36:59 2017 +0000

    upstream commit
    
    remove unused Pp;
    
    Upstream-ID: 8ad26467f1f6a40be887234085a8e01a61a00550

commit 05b69e99570553c8e1eafb895b1fbf1d098d2e14
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 18 02:49:44 2017 +0000

    upstream commit
    
    In the description of pattern-lists, clarify negated
    matches by explicitly stating that a negated match will never yield a
    positive result, and that at least one positive term in the pattern-list must
    match. bz#1918
    
    Upstream-ID: 652d2f9d993f158fc5f83cef4a95cd9d95ae6a14

commit eb80e26a15c10bc65fed8b8cdb476819a713c0fd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 13 21:13:54 2017 +0000

    upstream commit
    
    log debug messages sent to peer; ok deraadt markus
    
    Upstream-ID: 3b4fdc0a06ea5083f61d96e20043000f477103d9

commit 071325f458d615d7740da5c1c1d5a8b68a0b4605
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Oct 13 16:50:45 2017 +0000

    upstream commit
    
    trim permitrootlogin description somewhat, to avoid
    ambiguity; original diff from walter alejandro iglesias, tweaked by sthen and
    myself
    
    ok sthen schwarze deraadt
    
    Upstream-ID: 1749418b2bc073f3fdd25fe21f8263c3637fe5d2

commit 10727487becb897a15f658e0cb2d05466236e622
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 13 06:45:18 2017 +0000

    upstream commit
    
    mention SSH_USER_AUTH in the list of environment
    variables
    
    Upstream-ID: 1083397c3ee54b4933121ab058c70a0fc6383691

commit 224f193d6a4b57e7a0cb2b9ecd3b6c54d721d8c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 13 06:24:51 2017 +0000

    upstream commit
    
    BIO_get_mem_data() is supposed to take a char* as pointer
    argument, so don't pass it a const char*
    
    Upstream-ID: 1ccd91eb7f4dd4f0fa812d4f956987cd00b5f6ec

commit cfa46825b5ef7097373ed8e31b01a4538a8db565
Author: benno@openbsd.org <benno@openbsd.org>
Date:   Mon Oct 9 20:12:51 2017 +0000

    upstream commit
    
    clarify the order in which config statements are used. ok
    jmc@ djm@
    
    Upstream-ID: e37e27bb6bbac71315e22cb9690fd8a556a501ed

commit dceabc7ad7ebc7769c8214a1647af64c9a1d92e5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 5 15:52:03 2017 +0000

    upstream commit
    
    replace statically-sized arrays in ServerOptions with
    dynamic ones managed by xrecallocarray, removing some arbitrary (though
    large) limits and saving a bit of memory; "much nicer" markus@
    
    Upstream-ID: 1732720b2f478fe929d6687ac7b0a97ff2efe9d2

commit 2b4f3ab050c2aaf6977604dd037041372615178d
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Oct 5 12:56:50 2017 +0000

    upstream commit
    
    %C is hashed; from klemens nanni ok markus
    
    Upstream-ID: 6ebed7b2e1b6ee5402a67875d74f5e2859d8f998

commit a66714508b86d6814e9055fefe362d9fe4d49ab3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 4 18:50:23 2017 +0000

    upstream commit
    
    exercise PermitOpen a little more thoroughly
    
    Upstream-Regress-ID: f41592334e227a4c1f9a983044522de4502d5eac

commit 609ecc8e57eb88e2eac976bd3cae7f7889aaeff6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Sep 26 22:39:25 2017 +0000

    upstream commit
    
    UsePrivilegeSeparation is gone, stop trying to test it.
    
    Upstream-Regress-ID: 796a5057cfd79456a20ea935cc53f6eb80ace191

commit 69bda0228861f3dacd4fb3d28b60ce9d103d254b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 4 18:49:30 2017 +0000

    upstream commit
    
    fix (another) problem in PermitOpen introduced during the
    channels.c refactor: the third and subsequent arguments to PermitOpen were
    being silently ignored; ok markus@
    
    Upstream-ID: 067c89f1f53cbc381628012ba776d6861e6782fd

commit 66bf74a92131b7effe49fb0eefe5225151869dc5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 2 19:33:20 2017 +0000

    upstream commit
    
    Fix PermitOpen crash; spotted by benno@, ok dtucker@ deraadt@
    
    Upstream-ID: c2cc84ffac070d2e1ff76182c70ca230a387983c

commit d63b38160a59039708fd952adc75a0b3da141560
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 1 10:32:25 2017 +1100

    update URL again
    
    I spotted a typo in the draft so uploaded a new version...

commit 6f64f596430cd3576c529f07acaaf2800aa17d58
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 1 10:01:56 2017 +1100

    sync release notes URL

commit 35ff70a04dd71663a5ac1e73b90d16d270a06e0d
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 1 10:01:25 2017 +1100

    sync contrib/ssh-copy-id with upstream

commit 290843b8ede85f8b30bf29cd7dceb805c3ea5b66
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 1 09:59:19 2017 +1100

    update version in RPM spec files

commit 4e4e0bb223c5be88d87d5798c75cc6b0d4fef31d
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 1 09:58:24 2017 +1100

    update agent draft URL

commit e4a798f001d2ecd8bf025c1d07658079f27cc604
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Sep 30 22:26:33 2017 +0000

    upstream commit
    
    openssh-7.6; ok deraadt@
    
    Upstream-ID: a39c3a5b63a1baae109ae1ae4c7c34c2a59acde0

commit 5fa1407e16e7e5fda9769d53b626ce39d5588d4d
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Sep 27 06:45:53 2017 +0000

    upstream commit
    
    tweak EposeAuthinfo; diff from lars nooden
    
    tweaked by sthen; ok djm dtucker
    
    Upstream-ID: 8f2ea5d2065184363e8be7a0ba24d98a3b259748

commit bba69c246f0331f657fd6ec97724df99fc1ad174
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 28 16:06:21 2017 -0700

    don't fatal ./configure for LibreSSL

commit 04dc070e8b4507d9d829f910b29be7e3b2414913
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 28 14:54:34 2017 -0700

    abort in configure when only openssl-1.1.x found
    
    We don't support openssl-1.1.x yet (see multiple threads on the
    openssh-unix-dev@ mailing list for the reason), but previously
    ./configure would accept it and the compilation would subsequently
    fail. This makes ./configure display an explicit error message and
    abort.
    
    ok dtucker@

commit 74c1c3660acf996d9dc329e819179418dc115f2c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Sep 27 07:44:41 2017 +1000

    Check for and handle calloc(p, 0) = NULL.
    
    On some platforms (AIX, maybe others) allocating zero bytes of memory
    via the various *alloc functions returns NULL, which is permitted
    by the standards.  Autoconf has some macros for detecting this (with
    the exception of calloc for some reason) so use these and if necessary
    activate shims for them.  ok djm@

commit 6a9481258a77b0b54b2a313d1761c87360c5f1f5
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Sep 21 19:18:12 2017 +0000

    upstream commit
    
    test reverse dynamic forwarding with SOCKS
    
    Upstream-Regress-ID: 95cf290470f7e5e2f691e4bc6ba19b91eced2f79

commit 1b9f321605733754df60fac8c1d3283c89b74455
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 26 16:55:55 2017 +1000

    sync missing changes in dynamic-forward.sh

commit 44fc334c7a9ebdd08addb6d5fa005369897fddeb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 25 09:48:10 2017 +1000

    Add minimal strsignal for platforms without it.

commit 218e6f98df566fb9bd363f6aa47018cb65ede196
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Sep 24 13:45:34 2017 +0000

    upstream commit
    
    fix inverted test on channel open failure path that
    "upgraded" a transient failure into a fatal error; reported by sthen and also
    seen by benno@; ok sthen@
    
    Upstream-ID: b58b3fbb79ba224599c6cd6b60c934fc46c68472

commit c704f641f7b8777497dc82e81f2ac89afec7e401
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Sep 24 09:50:01 2017 +0000

    upstream commit
    
    write the correct buffer when tunnel forwarding; doesn't
    matter on OpenBSD (they are the same) but does matter on portable where we
    use an output filter to translate os-specific tun/tap headers
    
    Upstream-ID: f1ca94eff48404827b12e1d12f6139ee99a72284

commit 55486f5cef117354f0c64f991895835077b7c7f7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Sep 23 22:04:07 2017 +0000

    upstream commit
    
    fix tunnel forwarding problem introduced in refactor;
    reported by stsp@ ok markus@
    
    Upstream-ID: 81a731cdae1122c8522134095d1a8b60fa9dcd04

commit 609d7a66ce578abf259da2d5f6f68795c2bda731
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Sep 21 19:16:53 2017 +0000

    upstream commit
    
    Add 'reverse' dynamic forwarding which combines dynamic
    forwarding (-D) with remote forwarding (-R) where the remote-forwarded port
    expects SOCKS-requests.
    
    The SSH server code is unchanged and the parsing happens at the SSH
    clients side. Thus the full SOCKS-request is sent over the forwarded
    channel and the client parses c->output. Parsing happens in
    channel_before_prepare_select(), _before_ the select bitmask is
    computed in the pre[] handlers, but after network input processing
    in the post[] handlers.
    
    help and ok djm@
    
    Upstream-ID: aa25a6a3851064f34fe719e0bf15656ad5a64b89

commit 36945fa103176c00b39731e1fc1919a0d0808b81
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Sep 20 05:19:00 2017 +0000

    upstream commit
    
    Use strsignal in debug message instead of casting for the
    benefit of portable where sig_atomic_t might not be int.  "much nicer"
    deraadt@
    
    Upstream-ID: 2dac6c1e40511c700bd90664cd263ed2299dcf79

commit 3e8d185af326bf183b6f78597d5e3d2eeb2dc40e
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Tue Sep 19 12:10:30 2017 +0000

    upstream commit
    
    Use explicit_bzero() instead of bzero() before free() to
    prevent the compiler from optimizing away the bzero() call.  OK djm@
    
    Upstream-ID: cdc6197e64c9684c7250e23d60863ee1b53cef1d

commit 5b8da1f53854c0923ec6e927e86709e4d72737b6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 19 04:24:22 2017 +0000

    upstream commit
    
    fix use-after-free in ~^Z escape handler path, introduced
    in channels.c refactor; spotted by millert@ "makes sense" deraadt@
    
    Upstream-ID: 8fa2cdc65c23ad6420c1e59444b0c955b0589b22

commit a3839d8d2b89ff1a80cadd4dd654336710de2c9e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Sep 18 12:03:24 2017 +0000

    upstream commit
    
    Prevent type mismatch warning in debug on platforms where
    sig_atomic_t != int.  ok djm@
    
    Upstream-ID: 306e2375eb0364a4c68e48f091739bea4f4892ed

commit 30484e5e5f0b63d2c6ba32c6b85f06b6c6fa55fc
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Sep 18 09:41:52 2017 +0000

    upstream commit
    
    Add braces missing after channels refactor.  ok markus@
    
    Upstream-ID: 72ab325c84e010680dbc88f226e2aa96b11a3980

commit b79569190b9b76dfacc6d996faa482f16e8fc026
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 19 12:29:23 2017 +1000

    add freezero(3) replacement
    
    ok dtucker@

commit 161af8f5ec0961b10cc032efb5cc1b44ced5a92e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 19 10:18:56 2017 +1000

    move FORTIFY_SOURCE into hardening options group
    
    It's still on by default, but now it's possible to turn it off using
    --without-hardening. This is useful since it's known to cause problems
    with some -fsanitize options. ok dtucker@

commit 09eacf856e0fe1a6e3fe597ec8032b7046292914
Author: bluhm@openbsd.org <bluhm@openbsd.org>
Date:   Wed Sep 13 14:58:26 2017 +0000

    upstream commit
    
    Print SKIPPED if sudo and doas configuration is missing.
    Prevents that running the regression test with wrong environment is reported
    as failure.  Keep the fatal there to avoid interfering with other setups for
    portable ssh. OK dtucker@
    
    Upstream-Regress-ID: f0dc60023caef496ded341ac5aade2a606fa234e

commit cdede10899892f25f1ccdccd7a3fe5e5ef0aa49a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Aug 7 03:52:55 2017 +0000

    upstream commit
    
    Remove obsolete privsep=no fallback test.
    
    Upstream-Regress-ID: 7d6e1baa1678ac6be50c2a1555662eb1047638df

commit ec218c105daa9f5b192f7aa890fdb2d4fdc4e9d8
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Aug 7 00:53:51 2017 +0000

    upstream commit
    
    Remove non-privsep test since disabling privsep is now
    deprecated.
    
    Upstream-Regress-ID: 77ad3f3d8d52e87f514a80f285c6c1229b108ce8

commit 239c57d5bc2253e27e3e6ad7ac52ec8c377ee24e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 28 10:32:08 2017 +0000

    upstream commit
    
    Don't call fatal from stop_sshd since it calls cleanup
    which calls stop_sshd which will probably fail in the same way.  Instead,
    just bail. Differentiate between sshd dying without cleanup and not shutting
    down.
    
    Upstream-Regress-ID: f97315f538618b349e2b0bea02d6b0c9196c6bc4

commit aea59a0d9f120f2a87c7f494a0d9c51eaa79b8ba
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 14 04:32:21 2017 +0000

    upstream commit
    
    Revert commitid: gJtIN6rRTS3CHy9b.
    
    -------------
    identify the case where SSHFP records are missing but other DNS RR
    types are present and display a more useful error message for this
    case; patch by Thordur Bjornsson; bz#2501; ok dtucker@
    -------------
    
    This caused unexpected failures when VerifyHostKeyDNS=yes, SSHFP results
    are missing but the user already has the key in known_hosts
    
    Spotted by dtucker@
    
    Upstream-ID: 97e31742fddaf72046f6ffef091ec0d823299920

commit 871f1e4374420b07550041b329627c474abc3010
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 12 18:01:35 2017 +1000

    adapt portable to channels API changes

commit 4ec0bb9f9ad7b4eb0af110fa8eddf8fa199e46bb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 12 07:55:48 2017 +0000

    upstream commit
    
    unused variable
    
    Upstream-ID: 2f9ba09f2708993d35eac5aa71df910dcc52bac1

commit 9145a73ce2ba30c82bbf91d7205bfd112529449f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 12 07:32:04 2017 +0000

    upstream commit
    
    fix tun/tap forwarding case in previous
    
    Upstream-ID: 43ebe37a930320e24bca6900dccc39857840bc53

commit 9f53229c2ac97dbc6f5a03657de08a1150a9ac7e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 12 06:35:31 2017 +0000

    upstream commit
    
    Make remote channel ID a u_int
    
    Previously we tracked the remote channel IDs in an int, but this is
    strictly incorrect: the wire protocol uses uint32 and there is nothing
    in-principle stopping a SSH implementation from sending, say, 0xffff0000.
    
    In practice everyone numbers their channels sequentially, so this has
    never been a problem.
    
    ok markus@
    
    Upstream-ID: b9f4cd3dc53155b4a5c995c0adba7da760d03e73

commit dbee4119b502e3f8b6cd3282c69c537fd01d8e16
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 12 06:32:07 2017 +0000

    upstream commit
    
    refactor channels.c
    
    Move static state to a "struct ssh_channels" that is allocated at
    runtime and tracked as a member of struct ssh.
    
    Explicitly pass "struct ssh" to all channels functions.
    
    Replace use of the legacy packet APIs in channels.c.
    
    Rework sshd_config PermitOpen handling: previously the configuration
    parser would call directly into the channels layer. After the refactor
    this is not possible, as the channels structures are allocated at
    connection time and aren't available when the configuration is parsed.
    The server config parser now tracks PermitOpen itself and explicitly
    configures the channels code later.
    
    ok markus@
    
    Upstream-ID: 11828f161656b965cc306576422613614bea2d8f

commit abd59663df37a42152e37980113ccaa405b9a282
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 7 23:48:09 2017 +0000

    upstream commit
    
    typo in comment
    
    Upstream-ID: a93b1e6f30f1f9b854b5b964b9fd092d0c422c47

commit 149a8cd24ce9dd47c36f571738681df5f31a326c
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Sep 4 06:34:43 2017 +0000

    upstream commit
    
    tweak previous;
    
    Upstream-ID: bb8cc40b61b15f6a13d81da465ac5bfc65cbfc4b

commit ec9d22cc251cc5acfe7b2bcef9cc7a1fe0e949d8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 8 12:44:13 2017 +1000

    Fuzzer harnesses for sig verify and pubkey parsing
    
    These are some basic clang libfuzzer harnesses for signature
    verification and public key parsing. Some assembly (metaphorical)
    required.

commit de35c382894964a896a63ecd5607d3a3b93af75d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 8 12:38:31 2017 +1000

    Give configure ability to set CFLAGS/LDFLAGS later
    
    Some CFLAGS/LDFLAGS may disrupt the configure script's operation,
    in particular santization and fuzzer options that break assumptions
    about memory and file descriptor dispositions.
    
    This adds two flags to configure --with-cflags-after and
    --with-ldflags-after that allow specifying additional compiler and
    linker options that are added to the resultant Makefiles but not
    used in the configure run itself.
    
    E.g.
    
    env CC=clang-3.9 ./configure \
      --with-cflags-after=-fsantize=address \
      --with-ldflags-after="-g -fsanitize=address"

commit 22376d27a349f62c502fec3396dfe0fdcb2a40b7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Sep 3 23:33:13 2017 +0000

    upstream commit
    
    Expand ssh_config's StrictModes option with two new
    settings:
    
    StrictModes=accept-new will automatically accept hitherto-unseen keys
    but will refuse connections for changed or invalid hostkeys.
    
    StrictModes=off is the same as StrictModes=no
    
    Motivation:
    
    StrictModes=no combines two behaviours for host key processing:
    automatically learning new hostkeys and continuing to connect to hosts
    with invalid/changed hostkeys. The latter behaviour is quite dangerous
    since it removes most of the protections the SSH protocol is supposed to
    provide.
    
    Quite a few users want to automatically learn hostkeys however, so
    this makes that feature available with less danger.
    
    At some point in the future, StrictModes=no will change to be a synonym
    for accept-new, with its current behaviour remaining available via
    StrictModes=off.
    
    bz#2400, suggested by Michael Samuel; ok markus
    
    Upstream-ID: 0f55502bf75fc93a74fb9853264a8276b9680b64

commit ff3c42384033514e248ba5d7376aa033f4a2b99a
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Sep 1 15:41:26 2017 +0000

    upstream commit
    
    remove blank line;
    
    Upstream-ID: 2f46b51a0ddb3730020791719e94d3e418e9f423

commit b828605d51f57851316d7ba402b4ae06cf37c55d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 1 05:53:56 2017 +0000

    upstream commit
    
    identify the case where SSHFP records are missing but
    other DNS RR types are present and display a more useful error message for
    this case; patch by Thordur Bjornsson; bz#2501; ok dtucker@
    
    Upstream-ID: 8f7a5a8344f684823d8317a9708b63e75be2c244

commit 8042bad97e2789a50e8f742c3bcd665ebf0add32
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 1 05:50:48 2017 +0000

    upstream commit
    
    document available AuthenticationMethods; bz#2453 ok
    dtucker@
    
    Upstream-ID: 2c70576f237bb699aff59889dbf2acba4276d3d0

commit 71e5a536ec815d542b199f2ae6d646c0db9f1b58
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 30 03:59:08 2017 +0000

    upstream commit
    
    pass packet state down to some of the channels function
    (more to come...); ok markus@
    
    Upstream-ID: d8ce7a94f4059d7ac1e01fb0eb01de0c4b36c81b

commit 6227fe5b362239c872b91bbdee4bf63cf85aebc5
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Aug 29 13:05:58 2017 +0000

    upstream commit
    
    sort options;
    
    Upstream-ID: cf21d68cf54e81968bca629aaeddc87f0c684f3c

commit 530591a5795a02d01c78877d58604723918aac87
Author: dlg@openbsd.org <dlg@openbsd.org>
Date:   Tue Aug 29 09:42:29 2017 +0000

    upstream commit
    
    add a -q option to ssh-add to make it quiet on success.
    
    if you want to silence ssh-add without this you generally redirect
    the output to /dev/null, but that can hide error output which you
    should see.
    
    ok djm@
    
    Upstream-ID: 2f31b9b13f99dcf587e9a8ba443458e6c0d8997c

commit a54eb27dd64b5eca3ba94e15cec3535124bd5029
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Aug 27 00:38:41 2017 +0000

    upstream commit
    
    Increase the buffer sizes for user prompts to ensure that
    they won't be truncated by snprintf.  Based on patch from cjwatson at
    debian.org via bz#2768, ok djm@
    
    Upstream-ID: 6ffacf1abec8f40b469de5b94bfb29997d96af3e

commit dd9d9b3381a4597b840d480b043823112039327e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 28 16:48:27 2017 +1000

    Switch Capsicum header to sys/capsicum.h.
    
    FreeBSD's <sys/capability.h> was renamed to <sys/capsicum.h> in 2014 to
    avoid future conflicts with POSIX capabilities (the last release that
    didn't have it was 9.3) so switch to that.  Patch from des at des.no.

commit f5e917ab105af5dd6429348d9bc463e52b263f92
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 27 08:55:40 2017 +1000

    Add missing includes for bsd-err.c.
    
    Patch from cjwatson at debian.org via bz#2767.

commit 878e029797cfc9754771d6f6ea17f8c89e11d225
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 25 13:25:01 2017 +1000

    Split platform_sys_dir_uid into its own file
    
    platform.o is too heavy for libssh.a use; it calls into the server on
    many platforms. Move just the function needed by misc.c into its own
    file.

commit 07949bfe9133234eddd01715592aa0dde67745f0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 23 20:13:18 2017 +1000

    misc.c needs functions from platform.c now

commit b074c3c3f820000a21953441cea7699c4b17d72f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 18 05:48:04 2017 +0000

    upstream commit
    
    add a "quiet" flag to exited_cleanly() that supresses
    errors about exit status (failure due to signal is still reported)
    
    Upstream-ID: db85c39c3aa08e6ff67fc1fb4ffa89f807a9d2f0

commit de4ae07f12dabf8815ecede54235fce5d22e3f63
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 18 05:36:45 2017 +0000

    upstream commit
    
    Move several subprocess-related functions from various
    locations to misc.c. Extend subprocess() to offer a little more control over
    stdio disposition.
    
    feedback & ok dtucker@
    
    Upstream-ID: 3573dd7109d13ef9bd3bed93a3deb170fbfce049

commit 643c2ad82910691b2240551ea8b14472f60b5078
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 12 06:46:01 2017 +0000

    upstream commit
    
    make "--" before the hostname terminate command-line
    option processing completely; previous behaviour would not prevent further
    options appearing after the hostname (ssh has a supported options after the
    hostname for >20 years, so that's too late to change).
    
    ok deraadt@
    
    Upstream-ID: ef5ee50571b98ad94dcdf8282204e877ec88ad89

commit 0f3455356bc284d7c6f4d3c1614d31161bd5dcc2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Aug 12 06:42:52 2017 +0000

    upstream commit
    
    Switch from aes256-cbc to aes256-ctr for encrypting
    new-style private keys. The latter having the advantage of being supported
    for no-OpenSSL builds; bz#2754 ok markus@
    
    Upstream-ID: 54179a2afd28f93470471030567ac40431e56909

commit c4972d0a9bd6f898462906b4827e09b7caea2d9b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 11 04:47:12 2017 +0000

    upstream commit
    
    refuse to a private keys when its corresponding .pub key
    does not match. bz#2737 ok dtucker@
    
    Upstream-ID: 54ff5e2db00037f9db8d61690f26ef8f16e0d913

commit 4b3ecbb663c919132dddb3758e17a23089413519
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 11 04:41:08 2017 +0000

    upstream commit
    
    don't print verbose error message when ssh disconnects
    under sftp; bz#2750; ok dtucker@
    
    Upstream-ID: 6d83708aed77b933c47cf155a87dc753ec01f370

commit 42a8f8bc288ef8cac504c5c73f09ed610bc74a34
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Aug 11 04:16:35 2017 +0000

    upstream commit
    
    Tweak previous keepalive commit: if last_time + keepalive
    <= now instead of just "<" so client_alive_check will fire if the select
    happens to return on exact second of the timeout.  ok djm@
    
    Upstream-ID: e02756bd6038d11bb8522bfd75a4761c3a684fcc

commit b60ff20051ef96dfb207b6bfa45c0ad6c34a542a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Aug 11 03:58:36 2017 +0000

    upstream commit
    
    Keep track of the last time we actually heard from the
    client and use this to also schedule a client_alive_check().  Prevents
    activity on a forwarded port from indefinitely preventing the select timeout
    so that client_alive_check() will eventually (although not optimally) be
    called.
    
    Analysis by willchan at google com via bz#2756, feedback & ok djm@
    
    Upstream-ID: c08721e0bbda55c6d18e2760f3fe1b17fb71169e

commit 94bc1e7ffba3cbdea8c7dcdab8376bf29283128f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 28 14:50:59 2017 +1000

    Expose list of completed auth methods to PAM
    
    bz#2408; ok dtucker@

commit c78e6eec78c88acf8d51db90ae05a3e39458603d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 21 14:38:16 2017 +1000

    fix problems in tunnel forwarding portability code
    
    This fixes a few problems in the tun forwarding code, mostly to do
    with host/network byte order confusion.
    
    Based on a  report and patch by stepe AT centaurus.uberspace.de;
    bz#2735; ok dtucker@

commit 2985d4062ebf4204bbd373456a810d558698f9f5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jul 25 09:22:25 2017 +0000

    upstream commit
    
    Make WinSCP patterns for SSH_OLD_DHGEX more specific to
    exclude WinSCP 5.10.x and up.  bz#2748, from martin at winscp.net, ok djm@
    
    Upstream-ID: 6fd7c32e99af3952db007aa180e73142ddbc741a

commit 9f0e44e1a0439ff4646495d5735baa61138930a9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 24 04:34:28 2017 +0000

    upstream commit
    
    g/c unused variable; make a little more portable
    
    Upstream-ID: 3f5980481551cb823c6fb2858900f93fa9217dea

commit 51676ec61491ec6d7cbd06082034e29b377b3bf6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jul 23 23:37:02 2017 +0000

    upstream commit
    
    Allow IPQoS=none in ssh/sshd to not set an explicit
    ToS/DSCP value and just use the operating system default; ok dtucker@
    
    Upstream-ID: 77906ff8c7b660b02ba7cb1e47b17d66f54f1f7e

commit 6c1fbd5a50d8d2415f06c920dd3b1279b741072d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 21 14:24:26 2017 +1000

    mention libedit

commit dc2bd308768386b02c7337120203ca477e67ba62
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jul 19 08:30:41 2017 +0000

    upstream commit
    
    fix support for unknown key types; ok djm@
    
    Upstream-ID: 53fb29394ed04d616d65b3748dee5aa06b07ab48

commit fd0e8fa5f89d21290b1fb5f9d110ca4f113d81d9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 19 01:15:02 2017 +0000

    upstream commit
    
    switch from select() to poll() for the ssh-agent
    mainloop; ok markus
    
    Upstream-ID: 4a94888ee67b3fd948fd10693973beb12f802448

commit b1e72df2b813ecc15bd0152167bf4af5f91c36d3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 14 03:18:21 2017 +0000

    upstream commit
    
    Make ""Killed by signal 1" LogLevel verbose so it's not
    shown at the default level.  Prevents it from appearing during ssh -J and
    equivalent ProxyCommand configs. bz#1906, bz#2744, feedback&ok markus@
    
    Upstream-ID: debfaa7e859b272246c2f2633335d288d2e2ae28

commit 1f3d202770a08ee6752ed2a234b7ca6f180eb498
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Jul 13 19:16:33 2017 +0000

    upstream commit
    
    man pages with pseudo synopses which list filenames end
    up creating very ugly output in man -k; after some discussion with ingo, we
    feel the simplest fix is to remove such SYNOPSIS sections: the info is hardly
    helpful at page top, is contained already in FILES, and there are
    sufficiently few that just zapping them is simple;
    
    ok schwarze, who also helpfully ran things through a build to check
    output;
    
    Upstream-ID: 3e211b99457e2f4c925c5927d608e6f97431336c

commit 7f13a4827fb28957161de4249bd6d71954f1f2ed
Author: espie@openbsd.org <espie@openbsd.org>
Date:   Mon Jul 10 14:09:59 2017 +0000

    upstream commit
    
    zap redundant Makefile variables. okay djm@
    
    Upstream-ID: e39b3902fe1d6c4a7ba6a3c58e072219f3c1e604

commit dc44dd3a9e2c9795394e6a7e1e71c929cbc70ce0
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Jul 8 18:32:54 2017 +0000

    upstream commit
    
    slightly rework previous, to avoid an article issue;
    
    Upstream-ID: 15a315f0460ddd3d4e2ade1f16d6c640a8c41b30

commit 853edbe057a84ebd0024c8003e4da21bf2b469f7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 7 03:53:12 2017 +0000

    upstream commit
    
    When generating all hostkeys (ssh-keygen -A), clobber
    existing keys if they exist but are zero length. zero-length keys could
    previously be made if ssh-keygen failed part way through generating them, so
    avoid that case too. bz#2561 reported by Krzysztof Cieplucha; ok dtucker@
    
    Upstream-ID: f662201c28ab8e1f086b5d43c59cddab5ade4044

commit 43616876ba68a2ffaece6a6c792def4b039f2d6e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jul 1 22:55:44 2017 +0000

    upstream commit
    
    actually remove these files
    
    Upstream-ID: 1bd41cba06a7752de4df304305a8153ebfb6b0ac

commit 83fa3a044891887369ce8b487ce88d713a04df48
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jul 1 13:50:45 2017 +0000

    upstream commit
    
    remove post-SSHv1 removal dead code from rsa.c and merge
    the remaining bit that it still used into ssh-rsa.c; ok markus
    
    Upstream-ID: ac8a048d24dcd89594b0052ea5e3404b473bfa2f

commit 738c73dca2c99ee78c531b4cbeefc2008fe438f0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 14 14:26:36 2017 +1000

    make explicit_bzero/memset safe for sz=0

commit 8433d51e067e0829f5521c0c646b6fd3fe17e732
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jul 11 18:47:56 2017 -0700

    modified:   configure.ac
    UnixWare needs BROKEN_TCGETATTR_ICANON like Solaris
    Analysis by Robbie Zhang

commit ff3507aea9c7d30cd098e7801e156c68faff7cc7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 7 11:21:27 2017 +1000

    typo

commit d79bceb9311a9c137d268f5bc481705db4151810
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 30 04:17:23 2017 +0000

    upstream commit
    
    Only call close once in confree().  ssh_packet_close will
    close the FD so only explicitly close non-SSH channels.  bz#2734, from
    bagajjal at microsoft.com, ok djm@
    
    Upstream-ID: a81ce0c8b023527167739fccf1732b154718ab02

commit 197dc9728f062e23ce374f44c95a2b5f9ffa4075
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 29 15:40:25 2017 +1000

    Update link for my patches.

commit a98339edbc1fc21342a390f345179a9c3031bef7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 28 01:09:22 2017 +0000

    upstream commit
    
    Allow ssh-keygen to use a key held in ssh-agent as a CA when
    signing certificates. bz#2377 ok markus
    
    Upstream-ID: fb42e920b592edcbb5b50465739a867c09329c8f

commit c9cdef35524bd59007e17d5bd2502dade69e2dfb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 24 06:35:24 2017 +0000

    upstream commit
    
    regress test for ExposeAuthInfo
    
    Upstream-Regress-ID: 190e5b6866376f4061c411ab157ca4d4e7ae86fd

commit f17ee61cad25d210edab69d04ed447ad55fe80c1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 24 07:08:57 2017 +0000

    upstream commit
    
    correct env var name
    
    Upstream-ID: 721e761c2b1d6a4dcf700179f16fd53a1dadb313

commit 40962198e3b132cecdb32e9350acd4294e6a1082
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Jun 24 06:57:04 2017 +0000

    upstream commit
    
    spelling;
    
    Upstream-ID: 606f933c8e2d0be902ea663946bc15e3eee40b25

commit 33f86265d7e8a0e88d3a81745d746efbdd397370
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 24 06:38:11 2017 +0000

    upstream commit
    
    don't pass pointer to struct sshcipher between privsep
    processes, just redo the lookup in each using the already-passed cipher name.
    bz#2704 based on patch from Brooks Davis; ok markus dtucker
    
    Upstream-ID: 2eab434c09bdf549dafd7da3e32a0d2d540adbe0

commit 8f574959272ac7fe9239c4f5d10fd913f8920ab0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 24 06:34:38 2017 +0000

    upstream commit
    
    refactor authentication logging
    
    optionally record successful auth methods and public credentials
    used in a file accessible to user sessions
    
    feedback and ok markus@
    
    Upstream-ID: 090b93036967015717b9a54fd0467875ae9d32fb

commit e2004d4bb7eb01c663dd3a3e7eb224f1ccdc9bba
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Jun 24 06:28:50 2017 +0000

    upstream commit
    
    word fix;
    
    Upstream-ID: 8539bdaf2366603a34a9b2f034527ca13bb795c5

commit 4540428cd0adf039bcf5a8a27f2d5cdf09191513
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 24 05:37:44 2017 +0000

    upstream commit
    
    switch sshconnect.c from (slightly abused) select() to
    poll(); ok deraadt@ a while back
    
    Upstream-ID: efc1937fc591bbe70ac9e9542bb984f354c8c175

commit 6f8ca3b92540fa1a9b91670edc98d15448e3d765
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 24 05:35:05 2017 +0000

    upstream commit
    
    use HostKeyAlias if specified instead of hostname for
    matching host certificate principal names; bz#2728; ok dtucker@
    
    Upstream-ID: dc2e11c83ae9201bbe74872a0c895ae9725536dd

commit 8904ffce057b80a7472955f1ec00d7d5c250076c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 24 05:24:11 2017 +0000

    upstream commit
    
    no need to call log_init to reinitialise logged PID in
    child sessions, since we haven't called openlog() in log_init() since 1999;
    ok markus@
    
    Upstream-ID: 0906e4002af5d83d3d544df75e1187c932a3cf2e

commit e238645d789cd7eb47541b66aea2a887ea122c9b
Author: mestre@openbsd.org <mestre@openbsd.org>
Date:   Fri Jun 23 07:24:48 2017 +0000

    upstream commit
    
    When using the escape sequence &~ the code path is
    client_loop() -> client_simple_escape_filter() -> process_escapes() -> fork()
    and the pledge for this path lacks the proc promise and therefore aborts the
    process. The solution is to just add proc the promise to this specific
    pledge.
    
    Reported by Gregoire Jadi gjadi ! omecha.info
    Insight with tb@, OK jca@
    
    Upstream-ID: 63c05e30c28209519f476023b65b0b1b0387a05b

commit 5abbb31c4e7a6caa922cc1cbb14e87a77f9d19d3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 23 03:30:42 2017 +0000

    upstream commit
    
    Import regenerated moduli.
    
    Upstream-ID: b25bf747544265b39af74fe0716dc8d9f5b63b95

commit 849c5468b6d9b4365784c5dd88e3f1fb568ba38f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 23 03:25:53 2017 +0000

    upstream commit
    
    Run the screen twice so we end up with more candidate
    groups.  ok djm@
    
    Upstream-ID: b92c93266d8234d493857bb822260dacf4366157

commit 4626e39c7053c6486c1c8b708ec757e464623f5f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jun 14 00:31:38 2017 +0000

    upstream commit
    
    Add user@host prefix to client's "Permisison denied"
    messages, useful in particular when using "stacked" connections where it's
    not clear which host is denying.  bz#2720, ok djm@ markus@
    
    Upstream-ID: de88e1e9dcb050c98e85377482d1287a9fe0d2be

commit c948030d54911b2d3cddb96a7a8e9269e15d11cd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 13 12:13:59 2017 +0000

    upstream commit
    
    Do not require that unknown EXT_INFO extension values not
    contain \0 characters. This would cause fatal connection errors if an
    implementation sent e.g. string-encoded sub-values inside a value.
    
    Reported by Denis Bider; ok markus@
    
    Upstream-ID: 030e10fdc605563c040244c4b4f1d8ae75811a5c

commit 6026f48dfca78b713e4a7f681ffa42a0afe0929e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 13 11:22:15 2017 +0000

    upstream commit
    
    missing prototype.
    
    Upstream-ID: f443d2be9910fd2165a0667956d03343c46f66c9

commit bcd1485075aa72ba9418003f5cc27af2b049c51b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 10 23:41:25 2017 +1000

    portability for sftp globbed ls sort by mtime
    
    Include replacement timespeccmp() for systems that lack it.
    Support time_t struct stat->st_mtime in addition to
    timespec stat->st_mtim, as well as unsorted fallback.

commit 072e172f1d302d2a2c6043ecbfb4004406717b96
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 10 06:36:46 2017 +0000

    upstream commit
    
    print '?' instead of incorrect link count (that the
    protocol doesn't provide) for remote listings. bz#2710 ok dtucker@
    
    Upstream-ID: c611f98a66302cea452ef10f13fff8cf0385242e

commit 72be5b2f8e7dc37235e8c4b8d0bc7b5ee1301505
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jun 10 06:33:34 2017 +0000

    upstream commit
    
    implement sorting for globbed ls; bz#2649 ok dtucker@
    
    Upstream-ID: ed3110f351cc9703411bf847ba864041fb7216a8

commit 5b2f34a74aa6a524cd57e856b23e1b7b25007721
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 9 06:47:13 2017 +0000

    upstream commit
    
    return failure rather than fatal() for more cases during
    mux negotiations. Causes the session to fall back to a non-mux connection if
    they occur. bz#2707 ok dtucker@
    
    Upstream-ID: d2a7892f464d434e1f615334a1c9d0cdb83b29ab

commit 7f5637c4a67a49ef256cb4eedf14e8590ac30976
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 9 06:43:01 2017 +0000

    upstream commit
    
    in description of public key authentication, mention that
    the server will send debug messages to the client for some error conditions
    after authentication has completed. bz#2709 ok dtucker
    
    Upstream-ID: 750127dbd58c5a2672c2d28bc35fe221fcc8d1dd

commit 2076e4adb986512ce8c415dd194fd4e52136c4b4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 9 06:40:24 2017 +0000

    upstream commit
    
    better translate libcrypto errors by looking deeper in
    the accursed error stack for codes that indicate the wrong passphrase was
    supplied for a PEM key. bz#2699 ok dtucker@
    
    Upstream-ID: 4da4286326d570f4f0489459bb71f6297e54b681

commit ad0531614cbe8ec424af3c0fa90c34a8e1ebee4c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 9 04:40:04 2017 +0000

    upstream commit
    
    Add comments referring to the relevant RFC sections for
    rekeying behaviour.
    
    Upstream-ID: 6fc8e82485757a27633f9175ad00468f49a07d40

commit ce9134260b9b1247e2385a1afed00c26112ba479
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 9 14:43:47 2017 +1000

    drop two more privileges in the Solaris sandbox
    
    Drop PRIV_DAX_ACCESS and PRIV_SYS_IB_INFO.
    Patch from huieying.lee AT oracle.com via bz#2723

commit e0f609c8a2ab940374689ab8c854199c3c285a76
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 9 13:36:29 2017 +1000

    Wrap stdint.h include in #ifdef.

commit 1de5e47a85850526a4fdaf77185134046c050f75
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 7 01:48:15 2017 +0000

    upstream commit
    
    unbreak after sshv1 purge
    
    Upstream-Regress-ID: 8ea01a92d5f571b9fba88c1463a4254a7552d51b

commit 550c053168123fcc0791f9952abad684704b5760
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jun 6 09:12:17 2017 +0000

    upstream commit
    
    Fix compression output stats broken in rev 1.201.  Patch
    originally by Russell Coker via Debian bug #797964 and Christoph Biedl.  ok
    djm@
    
    Upstream-ID: 83a1903b95ec2e4ed100703debb4b4a313b01016

commit 55d06c6e72a9abf1c06a7ac2749ba733134a1f39
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 2 06:06:10 2017 +0000

    upstream commit
    
    rationalise the long list of manual CDIAGFLAGS that we
    add; most of these were redundant to -Wall -Wextra
    
    Upstream-ID: ea80f445e819719ccdcb237022cacfac990fdc5c

commit 1527d9f61e6d50f6c2b4a3fa5b45829034b1b0b1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 1 06:59:21 2017 +0000

    upstream commit
    
    no need to bzero allocated space now that we use use
    recallocarray; ok deraadt@
    
    Upstream-ID: 53333c62ccf97de60b8cb570608c1ba5ca5803c8

commit cc812baf39b93d5355565da98648d8c31f955990
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 1 06:58:25 2017 +0000

    upstream commit
    
    unconditionally zero init size of buffer; ok markus@
    deraadt@
    
    Upstream-ID: 218963e846d8f26763ba25afe79294547b99da29

commit 65eb8fae0d7ba45ef4483a3cf0ae7fd0dbc7c226
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 1 16:25:09 2017 +1000

    avoid compiler warning

commit 2d75d74272dc2a0521fce13cfe6388800c9a2406
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 1 06:16:43 2017 +0000

    upstream commit
    
    some warnings spotted by clang; ok markus@
    
    Upstream-ID: 24381d68ca249c5cee4388ceb0f383fa5b43991b

commit 151c6e433a5f5af761c78de87d7b5d30a453cf5e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 1 15:25:13 2017 +1000

    add recallocarray replacement and dependency
    
    recallocarray() needs getpagesize() so add a tiny replacement for that.

commit 01e6f78924da308447e71e9a32c8a6104ef4e888
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 1 15:16:24 2017 +1000

    add *.0 manpage droppings

commit 4b2e2d3fd9dccff357e1e26ce9a5f2e103837a36
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 1 04:51:58 2017 +0000

    upstream commit
    
    fix casts re constness
    
    Upstream-ID: e38f2bac162b37dbaf784d349c8327a6626fa266

commit 75b8af8de805c0694b37fcf80ce82783b2acc86f
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed May 31 10:54:00 2017 +0000

    upstream commit
    
    make sure we don't pass a NULL string to vfprintf
    (triggered by the principals-command regress test); ok bluhm
    
    Upstream-ID: eb49854f274ab37a0b57056a6af379a0b7111990

commit 84008608c9ee944d9f72f5100f31ccff743b10f2
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed May 31 10:04:29 2017 +0000

    upstream commit
    
    use SO_ZEROIZE for privsep communication (if available)
    
    Upstream-ID: abcbb6d2f8039fc4367a6a78096e5d5c39de4a62

commit 9e509d4ec97cb3d71696f1a2f1fdad254cbbce11
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed May 31 09:15:42 2017 +0000

    upstream commit
    
    Switch to recallocarray() for a few operations.  Both
    growth and shrinkage are handled safely, and there also is no need for
    preallocation dances. Future changes in this area will be less error prone.
    Review and one bug found by markus
    
    Upstream-ID: 822d664d6a5a1d10eccb23acdd53578a679d5065

commit dc5dc45662773c0f7745c29cf77ae2d52723e55e
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed May 31 08:58:52 2017 +0000

    upstream commit
    
    These shutdown() SHUT_RDWR are not needed before close()
    ok djm markus claudio
    
    Upstream-ID: 36f13ae4ba10f5618cb9347933101eb4a98dbcb5

commit 1e0cdf8efb745d0d1116e1aa22bdc99ee731695e
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed May 31 08:09:45 2017 +0000

    upstream commit
    
    clear session keys from memory; ok djm@
    
    Upstream-ID: ecd178819868975affd5fd6637458b7c712b6a0f

commit 92e9fe633130376a95dd533df6e5e6a578c1e6b8
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed May 31 07:00:13 2017 +0000

    upstream commit
    
    remove now obsolete ctx from ssh_dispatch_run; ok djm@
    
    Upstream-ID: 9870aabf7f4d71660c31fda91b942b19a8e68d29

commit 17ad5b346043c5bbc5befa864d0dbeb76be39390
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed May 31 05:34:14 2017 +0000

    upstream commit
    
    use the ssh_dispatch_run_fatal variant
    
    Upstream-ID: 28c5b364e37c755d1b22652b8cd6735a05c625d8

commit 39896b777320a6574dd06707aebac5fb98e666da
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 31 05:08:46 2017 +0000

    upstream commit
    
    another ctx => ssh conversion (in GSSAPI code)
    
    Upstream-ID: 4d6574c3948075c60608d8e045af42fe5b5d8ae0

commit 6116bd4ed354a71a733c8fd0f0467ce612f12911
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 31 14:56:07 2017 +1000

    fix conversion of kexc25519s.c to struct ssh too
    
    git cvsimport missed this commit for some reason

commit d40dbdc85b6fb2fd78485ba02225511b8cbf20d7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 31 04:29:44 2017 +0000

    upstream commit
    
    spell out that custom options/extensions should follow the
    usual SSH naming rules, e.g. "extension@example.com"
    
    Upstream-ID: ab326666d2fad40769ec96b5a6de4015ffd97b8d

commit 2a108277f976e8d0955c8b29d1dfde04dcbb3d5b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 31 04:17:12 2017 +0000

    upstream commit
    
    one more void *ctx => struct ssh *ssh conversion
    
    Upstream-ID: d299d043471c10214cf52c03daa10f1c232759e2

commit c04e979503e97f52b750d3b98caa6fe004ab2ab9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 31 00:43:04 2017 +0000

    upstream commit
    
    fix possible OOB strlen() in SOCKS4A hostname parsing;
    ok markus@
    
    Upstream-ID: c67297cbeb0e5a19d81752aa18ec44d31270cd11

commit a3bb250c93bfe556838c46ed965066afce61cffa
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue May 30 19:38:17 2017 +0000

    upstream commit
    
    tweak previous;
    
    Upstream-ID: 66987651046c42d142f7318c9695fb81a6d14031

commit 1112b534a6a7a07190e497e6bf86b0d5c5fb02dc
Author: bluhm@openbsd.org <bluhm@openbsd.org>
Date:   Tue May 30 18:58:37 2017 +0000

    upstream commit
    
    Add RemoteCommand option to specify a command in the
    ssh config file instead of giving it on the client's command line.  This
    command will be executed on the remote host.  The feature allows to automate
    tasks using ssh config. OK markus@
    
    Upstream-ID: 5d982fc17adea373a9c68cae1021ce0a0904a5ee

commit eb272ea4099fd6157846f15c129ac5727933aa69
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 14:29:59 2017 +0000

    upstream commit
    
    switch auth2 to ssh_dispatch API; ok djm@
    
    Upstream-ID: a752ca19e2782900dd83060b5c6344008106215f

commit 5a146bbd4fdf5c571f9fb438e5210d28cead76d9
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 14:27:22 2017 +0000

    upstream commit
    
    switch auth2-none.c to modern APIs; ok djm@
    
    Upstream-ID: 07252b58e064d332214bcabbeae8e08c44b2001b

commit 60306b2d2f029f91927c6aa7c8e08068519a0fa2
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 14:26:49 2017 +0000

    upstream commit
    
    switch auth2-passwd.c to modern APIs; ok djm@
    
    Upstream-ID: cba0a8b72b4f97adfb7e3b3fd2f8ba3159981fc7

commit eb76698b91338bd798c978d4db2d6af624d185e4
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 14:25:42 2017 +0000

    upstream commit
    
    switch auth2-hostbased.c to modern APIs; ok djm@
    
    Upstream-ID: 146af25c36daeeb83d5dbbb8ca52b5d25de88f4e

commit 2ae666a8fc20b3b871b2f1b90ad65cc027336ccd
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 14:23:52 2017 +0000

    upstream commit
    
    protocol handlers all get struct ssh passed; ok djm@
    
    Upstream-ID: 0ca9ea2a5d01a6d2ded94c5024456a930c5bfb5d

commit 94583beb24a6c5fd19cedb9104ab2d2d5cd052b6
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 14:19:15 2017 +0000

    upstream commit
    
    ssh: pass struct ssh to auth functions, too; ok djm@
    
    Upstream-ID: d13c509cc782f8f19728fbea47ac7cf36f6e85dd

commit 5f4082d886c6173b9e90b9768c9a38a3bfd92c2b
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 14:18:15 2017 +0000

    upstream commit
    
    sshd: pass struct ssh to auth functions; ok djm@
    
    Upstream-ID: b00a80c3460884ebcdd14ef550154c761aebe488

commit 7da5df11ac788bc1133d8d598d298e33500524cc
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 14:16:41 2017 +0000

    upstream commit
    
    remove unused wrapper functions from key.[ch]; ok djm@
    
    Upstream-ID: ea0f4016666a6817fc11f439dd4be06bab69707e

commit ff7371afd08ac0bbd957d90451d4dcd0da087ef5
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 14:15:17 2017 +0000

    upstream commit
    
    sshkey_new() might return NULL (pkcs#11 code only); ok
    djm@
    
    Upstream-ID: de9f2ad4a42c0b430caaa7d08dea7bac943075dd

commit beb965bbc5a984fa69fb1e2b45ebe766ae09d1ef
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 14:13:40 2017 +0000

    upstream commit
    
    switch sshconnect.c to modern APIs; ok djm@
    
    Upstream-ID: 27be17f84b950d5e139b7a9b281aa487187945ad

commit 00ed75c92d1f95fe50032835106c368fa22f0f02
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 14:10:53 2017 +0000

    upstream commit
    
    switch auth2-pubkey.c to modern APIs; with & ok djm@
    
    Upstream-ID: 8f08d4316eb1b0c4ffe4a206c05cdd45ed1daf07

commit 54d90ace1d3535b44d92a8611952dc109a74a031
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 08:52:19 2017 +0000

    upstream commit
    
    switch from Key typedef with struct sshkey; ok djm@
    
    Upstream-ID: 3067d33e04efbe5131ce8f70668c47a58e5b7a1f

commit c221219b1fbee47028dcaf66613f4f8d6b7640e9
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 08:49:58 2017 +0000

    upstream commit
    
    remove ssh1 references; ok djm@
    
    Upstream-ID: fc23b7578e7b0a8daaec72946d7f5e58ffff5a3d

commit afbfa68fa18081ef05a9cd294958509a5d3cda8b
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue May 30 08:49:32 2017 +0000

    upstream commit
    
    revise sshkey_load_public(): remove ssh1 related
    comments, remove extra open()/close() on keyfile, prevent leak of 'pub' if
    'keyp' is NULL, replace strlcpy+cat with asprintf; ok djm@
    
    Upstream-ID: 6175e47cab5b4794dcd99c1175549a483ec673ca

commit 813f55336a24fdfc45e7ed655fccc7d792e8f859
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri May 26 20:34:49 2017 +0000

    upstream commit
    
    sshbuf_consume: reset empty buffer; ok djm@
    
    Upstream-ID: 0d4583ba57f69e369d38bbd7843d85cac37fa821

commit 6cf711752cc2a7ffaad1fb4de18cae65715ed8bb
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri May 26 19:35:50 2017 +0000

    upstream commit
    
    remove SSH_CHANNEL_XXX_DRAINING (ssh1 only); ok djm@
    
    Upstream-ID: e2e225b6ac67b84dd024f38819afff2554fafe42

commit 364f0d5edea27767fb0f915ea7fc61aded88d3e8
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri May 26 19:34:12 2017 +0000

    upstream commit
    
    remove channel_input_close_confirmation (ssh1 only); ok
    djm@
    
    Upstream-ID: 8e7c8c38f322d255bb0294a5c0ebef53fdf576f1

commit 8ba0fd40082751dbbc23a830433488bbfb1abdca
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 26 01:40:07 2017 +0000

    upstream commit
    
    fix references to obsolete v00 cert format; spotted by
    Jakub Jelen
    
    Upstream-ID: 7600ce193ab8fd19451acfe24fc2eb39d46b2c4f

commit dcc714c65cfb81eb6903095b4590719e8690f3da
Author: Mike Frysinger <vapier@chromium.org>
Date:   Wed May 24 23:21:19 2017 -0400

    configure: actually set cache vars when cross-compiling
    
    The cross-compiling fallback message says it's assuming the test
    passed, but it didn't actually set the cache var which causes
    later tests to fail.

commit 947a3e829a5b8832a4768fd764283709a4ca7955
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat May 20 02:35:47 2017 +0000

    upstream commit
    
    there's no reason to artificially limit the key path
    here, just check that it fits PATH_MAX; spotted by Matthew Patton
    
    Upstream-ID: 858addaf2009c9cf04d80164a41b2088edb30b58

commit 773224802d7cb250bb8b461546fcce10567b4b2e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 19 21:07:17 2017 +0000

    upstream commit
    
    Now that we no longer support SSHv1, replace the contents
    of this file with a pointer to
    https://tools.ietf.org/html/draft-miller-ssh-agent-00 It's better edited,
    doesn't need to document stuff we no longer implement and does document stuff
    that we do implement (RSA SHA256/512 signature flags)
    
    Upstream-ID: da8cdc46bbcc266efabd565ddddd0d8e556f846e

commit 54cd41a4663fad66406dd3c8fe0e4760ccd8a899
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 17 01:24:17 2017 +0000

    upstream commit
    
    allow LogLevel in sshd_config Match blocks; ok dtucker
    bz#2717
    
    Upstream-ID: 662e303be63148f47db1aa78ab81c5c2e732baa8

commit 277abcda3f1b08d2376686f0ef20320160d4c8ab
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 16 16:56:15 2017 +0000

    upstream commit
    
    remove duplicate check; spotted by Jakub Jelen
    
    Upstream-ID: 30c2996c1767616a8fdc49d4cee088efac69c3b0

commit adb47ce839c977fa197e770c1be8f852508d65aa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 16 16:54:05 2017 +0000

    upstream commit
    
    mention that Ed25519 keys are valid as CA keys; spotted
    by Jakub Jelen
    
    Upstream-ID: d3f6db58b30418cb1c3058211b893a1ffed3dfd4

commit 6bdf70f01e700348bb4d8c064c31a0ab90896df6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 9 14:35:03 2017 +1000

    clean up regress files and add a .gitignore

commit 7bdb2eeb1d3c26acdc409bd94532eefa252e440b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 8 22:57:38 2017 +0000

    upstream commit
    
    remove hmac-ripemd160; ok dtucker
    
    Upstream-ID: 896e737ea0bad6e23327d1c127e02d5e9e9c654d

commit 5f02bb1f99f70bb422be8a5c2b77ef853f1db554
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 8 06:11:06 2017 +0000

    upstream commit
    
    make requesting bad ECDSA bits yield the same error
    (SSH_ERR_KEY_LENGTH) as the same mistake for RSA/DSA
    
    Upstream-ID: bf40d3fee567c271e33f05ef8e4e0fa0b6f0ece6

commit d757a4b633e8874629a1442c7c2e7b1b55d28c19
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 8 06:08:42 2017 +0000

    upstream commit
    
    fix for new SSH_ERR_KEY_LENGTH error value
    
    Upstream-Regress-ID: c38a6e6174d4c3feca3518df150d4fbae0dca8dc

commit 2e58a69508ac49c02d1bb6057300fa6a76db1045
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 8 06:03:39 2017 +0000

    upstream commit
    
    helps if I commit the correct version of the file. fix
    missing return statement.
    
    Upstream-ID: c86394a3beeb1ec6611e659bfa830254f325546c

commit effaf526bfa57c0ac9056ca236becf52385ce8af
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 8 01:52:49 2017 +0000

    upstream commit
    
    remove arcfour, blowfish and CAST here too
    
    Upstream-Regress-ID: c613b3bcbef75df1fe84ca4dc2d3ef253dc5e920

commit 7461a5bc571696273252df28a1f1578968cae506
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 8 00:21:36 2017 +0000

    upstream commit
    
    I was too aggressive with the scalpel in the last commit;
    unbreak sshd, spotted quickly by naddy@
    
    Upstream-ID: fb7e75d2b2c7e6ca57dee00ca645e322dd49adbf

commit bd636f40911094a39c2920bf87d2ec340533c152
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 7 23:15:59 2017 +0000

    upstream commit
    
    Refuse RSA keys <1024 bits in length. Improve reporting
    for keys that do not meet this requirement. ok markus@
    
    Upstream-ID: b385e2a7b13b1484792ee681daaf79e1e203df6c

commit 70c1218fc45757a030285051eb4d209403f54785
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 7 23:13:42 2017 +0000

    upstream commit
    
    Don't offer CBC ciphers by default in the client. ok
    markus@
    
    Upstream-ID: 94c9ce8d0d1a085052e11c7f3307950fdc0901ef

commit acaf34fd823235d549c633c0146ee03ac5956e82
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 7 23:12:57 2017 +0000

    upstream commit
    
    As promised in last release announcement: remove
    support for Blowfish, RC4 and CAST ciphers. ok markus@ deraadt@
    
    Upstream-ID: 21f8facdba3fd8da248df6417000867cec6ba222

commit 3e371bd2124427403971db853fb2e36ce789b6fd
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Fri May 5 10:42:49 2017 +0000

    upstream commit
    
    more simplification and removal of SSHv1-related code;
    ok djm@
    
    Upstream-ID: d2f041aa0b79c0ebd98c68a01e5a0bfab2cf3b55

commit 2e9c324b3a7f15c092d118c2ac9490939f6228fd
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Fri May 5 10:41:58 2017 +0000

    upstream commit
    
    remove superfluous protocol 2 mentions; ok jmc@
    
    Upstream-ID: 0aaf7567c9f2e50fac5906b6a500a39c33c4664d

commit 744bde79c3361e2153cb395a2ecdcee6c713585d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 4 06:10:57 2017 +0000

    upstream commit
    
    since a couple of people have asked, leave a comment
    explaining why we retain SSH v.1 support in the "delete all keys from agent"
    path.
    
    Upstream-ID: 4b42dcfa339813c15fe9248a2c1b7ed41c21bbb4

commit 0c378ff6d98d80bc465a4a6a787670fb9cc701ee
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 4 01:33:21 2017 +0000

    upstream commit
    
    another tentacle: cipher_set_key_string() was only ever
    used for SSHv1
    
    Upstream-ID: 7fd31eb6c48946f7e7cc12af0699fe8eb637e94a

commit 9a82e24b986e3e0dc70849dbb2c19aa6c707b37f
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Wed May 3 21:49:18 2017 +0000

    upstream commit
    
    restore mistakenly deleted description of the
    ConnectionAttempts option ok markus@
    
    Upstream-ID: 943002b1b7c470caea3253ba7b7348c359de0348

commit 768405fddf64ff83aa6ef701ebb3c1f82d98a2f3
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Wed May 3 21:08:09 2017 +0000

    upstream commit
    
    remove miscellaneous SSH1 leftovers; ok markus@
    
    Upstream-ID: af23696022ae4d45a1abc2fb8b490d8d9dd63b7c

commit 1a1b24f8229bf7a21f89df21987433283265527a
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed May 3 10:01:44 2017 +0000

    upstream commit
    
    more protocol 1 bits removed; ok djm
    
    Upstream-ID: b5b977eaf756915acb56aef3604a650e27f7c2b9

commit 2b6f799e9b230cf13a7eefc05ecead7d8569d6b5
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed May 3 06:32:02 2017 +0000

    upstream commit
    
    more protocol 1 stuff to go; ok djm
    
    Upstream-ID: 307a30441d2edda480fd1661d998d36665671e47

commit f10c0d32cde2084d2a0b19bc47d80cb93e85a093
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue May 2 17:04:09 2017 +0000

    upstream commit
    
    rsa1 is no longer valid;
    
    Upstream-ID: 9953d09ed9841c44b7dcf7019fa874783a709d89

commit 42b690b4fd0faef78c4d68225948b6e5c46c5163
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue May 2 14:06:37 2017 +0000

    upstream commit
    
    add PubKeyAcceptedKeyTypes to the -o list: scp(1) has
    it, so i guess this should too;
    
    Upstream-ID: 7fab32e869ca5831d09ab0c40d210b461d527a2c

commit d852603214defd93e054de2877b20cc79c19d0c6
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue May 2 13:44:51 2017 +0000

    upstream commit
    
    remove now obsolete protocol1 options from the -o
    lists;
    
    Upstream-ID: 828e478a440bc5f9947672c392420510a362b3dd

commit 8b60ce8d8111e604c711c4cdd9579ffe0edced74
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue May 2 09:05:58 2017 +0000

    upstream commit
    
    more -O shuffle; ok djm
    
    Upstream-ID: c239991a3a025cdbb030b73e990188dd9bfbeceb

commit 3575f0b12afe6b561681582fd3c34067d1196231
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 2 08:54:19 2017 +0000

    upstream commit
    
    remove -1 / -2 options; pointed out by jmc@
    
    Upstream-ID: 65d2a816000741a95df1c7cfdb5fa8469fcc7daa

commit 4f1ca823bad12e4f9614895eefe0d0073b84a28f
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue May 2 08:06:33 2017 +0000

    upstream commit
    
    remove options -12 from usage();
    
    Upstream-ID: db7ceef25132e63b50ed05289bf447fece1d1270

commit 6b84897f7fd39956b849eac7810319d8a9958568
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue May 2 07:13:31 2017 +0000

    upstream commit
    
    tidy up -O somewhat; ok djm
    
    Upstream-ID: 804405f716bf7ef15c1f36ab48581ca16aeb4d52

commit d1c6b7fdbdfe4a7a37ecd48a97f0796b061c2868
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 1 22:09:48 2017 +0000

    upstream commit
    
    when freeing a bitmap, zero all it bytes; spotted by Ilya
    Kaliman
    
    Upstream-ID: 834ac024f2c82389d6ea6b1c7d6701b3836e28e4

commit 0f163983016c2988a92e039d18a7569f9ea8e071
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 1 14:08:26 2017 +0000

    upstream commit
    
    this one I did forget to "cvs rm"
    
    Upstream-ID: 5781670c0578fe89663c9085ed3ba477cf7e7913

commit 21ed00a8e26fe8a772bcca782175fafc2b0890ed
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 1 09:27:45 2017 +0000

    upstream commit
    
    don't know why cvs didn't exterminate these the first
    time around, I use rm -f and everuthing...
    
    pointed out by sobrado@
    
    Upstream-ID: a6c44a0c2885330d322ee01fcfd7f6f209b1e15d

commit d29ba6f45086703fdcb894532848ada3427dfde6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 1 13:53:07 2017 +1000

    Define INT32_MAX and INT64_MAX if needed.

commit 329037e389f02ec95c8e16bf93ffede94d3d44ce
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 1 13:19:41 2017 +1000

    Wrap stdint.h in HAVE_STDINT_H

commit f382362e8dfb6b277f16779ab1936399d7f2af78
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 1 02:27:11 2017 +0000

    upstream commit
    
    remove unused variable
    
    Upstream-ID: 66011f00819d0e71b14700449a98414033284516

commit dd369320d2435b630a5974ab270d686dcd92d024
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:34:55 2017 +0000

    upstream commit
    
    eliminate explicit specification of protocol in tests and
    loops over protocol. We only support SSHv2 now.
    
    Upstream-Regress-ID: 0082838a9b8a382b7ee9cbf0c1b9db727784fadd

commit 557f921aad004be15805e09fd9572969eb3d9321
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:33:48 2017 +0000

    upstream commit
    
    remove SSHv1 support from unit tests
    
    Upstream-Regress-ID: 395ca2aa48f1f7d23eefff6cb849ea733ca8bbfe

commit e77e1562716fb3da413e4c2397811017b762f5e3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 1 00:03:18 2017 +0000

    upstream commit
    
    fixup setting ciphercontext->plaintext (lost in SSHv1 purge),
    though it isn't really used for much anymore.
    
    Upstream-ID: 859b8bce84ff4865b32097db5430349d04b9b747

commit f7849e6c83a4e0f602dea6c834a24091c622d68e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 1 09:55:56 2017 +1000

    remove configure --with-ssh1

commit f4a6a88ddb6dba6d2f7bfb9e2c9879fcc9633043
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:29:10 2017 +0000

    upstream commit
    
    flense SSHv1 support from ssh-agent, considerably
    simplifying it
    
    ok markus
    
    Upstream-ID: 71d772cdcefcb29f76e01252e8361e6fc2dfc365

commit 930e8d2827853bc2e196c20c3e000263cc87fb75
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:28:41 2017 +0000

    upstream commit
    
    obliterate ssh1.h and some dead code that used it
    
    ok markus@
    
    Upstream-ID: 1ca9159a9fb95618f9d51e069ac8e1131a087343

commit a3710d5d529a34b8f56aa62db798c70e85d576a0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:28:12 2017 +0000

    upstream commit
    
    exterminate the -1 flag from scp
    
    ok markus@
    
    Upstream-ID: 26d247f7065da15056b209cef5f594ff591b89db

commit aebd0abfaa8a41e75d50f9f7934267b0a2d9acb4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:26:54 2017 +0000

    upstream commit
    
    purge the last traces of SSHv1 from the TTY modes
    handling code
    
    ok markus
    
    Upstream-ID: 963a19f1e06577377c38a3b7ce468f121b966195

commit dfa641f758d4b8b2608ab1b00abaf88df0a8e36a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:26:16 2017 +0000

    upstream commit
    
    remove the (in)famous SSHv1 CRC compensation attack
    detector.
    
    Despite your cameo in The Matrix movies, you will not be missed.
    
    ok markus
    
    Upstream-ID: 44261fce51a56d93cdb2af7b6e184be629f667e0

commit e5d3bd36ef67d82092861f39b5bf422cb12b31a6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:25:03 2017 +0000

    upstream commit
    
    undo some local debugging stuff that I committed by
    accident
    
    Upstream-ID: fe5b31f69a60d47171836911f144acff77810217

commit 3d6d09f2e90f4ad650ebda6520bf2da446f37f14
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:23:54 2017 +0000

    upstream commit
    
    remove SSHv1 support from packet and buffer APIs
    
    ok markus@
    
    Upstream-ID: bfc290053d40b806ecac46317d300677d80e1dc9

commit 05164358577c82de18ed7373196bc7dbd8a3f79c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:21:54 2017 +0000

    upstream commit
    
    remove SSHv1-related buffers from client code
    
    Upstream-ID: dca5d01108f891861ceaf7ba1c0f2eb274e0c7dd

commit 873d3e7d9a4707d0934fb4c4299354418f91b541
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:18:44 2017 +0000

    upstream commit
    
    remove KEY_RSA1
    
    ok markus@
    
    Upstream-ID: 7408517b077c892a86b581e19f82a163069bf133

commit 788ac799a6efa40517f2ac0d895a610394298ffc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:18:22 2017 +0000

    upstream commit
    
    remove SSHv1 configuration options and man pages bits
    
    ok markus@
    
    Upstream-ID: 84638c23546c056727b7a7d653c72574e0f19424

commit e6882463a8ae0594aacb6d6575a6318a41973d84
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:17:37 2017 +0000

    upstream commit
    
    remove SSH1 make flag and associated files ok markus@
    
    Upstream-ID: ba9feacc5787337c413db7cf26ea3d53f854cfef

commit cdccebdf85204bf7542b7fcc1aa2ea3f36661833
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:15:04 2017 +0000

    upstream commit
    
    remove SSHv1 ciphers; ok markus@
    
    Upstream-ID: e5ebc5e540d7f23a8c1266db1839794d4d177890

commit 97f4d3083b036ce3e68d6346a6140a22123d5864
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:13:25 2017 +0000

    upstream commit
    
    remove compat20/compat13/compat15 variables
    
    ok markus@
    
    Upstream-ID: 43802c035ceb3fef6c50c400e4ecabf12354691c

commit 99f95ba82673d33215dce17bfa1512b57f54ec09
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:11:45 2017 +0000

    upstream commit
    
    remove options.protocol and client Protocol
    configuration knob
    
    ok markus@
    
    Upstream-ID: 5a967f5d06e2d004b0235457b6de3a9a314e9366

commit 56912dea6ef63dae4eb1194e5d88973a7c6c5740
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Apr 30 23:10:43 2017 +0000

    upstream commit
    
    unifdef WITH_SSH1 ok markus@
    
    Upstream-ID: 9716e62a883ef8826c57f4d33b4a81a9cc7755c7

commit d4084cd230f7319056559b00db8b99296dad49d5
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Apr 29 06:06:01 2017 +0000

    upstream commit
    
    tweak previous;
    
    Upstream-ID: a3abc6857455299aa42a046d232b7984568bceb9

commit 249516e428e8461b46340a5df5d5ed1fbad2ccce
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Apr 29 04:12:25 2017 +0000

    upstream commit
    
    allow ssh-keygen to include arbitrary string or flag
    certificate extensions and critical options. ok markus@ dtucker@
    
    Upstream-ID: 2cf28dd6c5489eb9fc136e0b667ac3ea10241646

commit 47a287bb6ac936c26b4f3ae63279c02902ded3b9
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Apr 28 06:15:03 2017 +0000

    upstream commit
    
    sort;
    
    Upstream-ID: 7e6b56e52b039cf44d0418e9de9aca20a2d2d15a

commit 36465a76a79ad5040800711b41cf5f32249d5120
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 28 14:44:28 2017 +1000

    Typo.
    
    Upstream-Regress-ID: 1e6b51ddf767cbad0a4e63eb08026c127e654308

commit 9d18cb7bdeb00b20205fd13d412aae8c0e0457ed
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 28 14:41:17 2017 +1000

    Add 2 regress commits I applied by hand.
    
    Upstream-Regress-ID: 30c20180c87cbc99fa1020489fe7fd8245b6420c
    Upstream-Regress-ID: 1e6b51ddf767cbad0a4e63eb08026c127e654308

commit 9504ea6b27f9f0ece64e88582ebb9235e664a100
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 28 14:33:43 2017 +1000

    Merge integrity.sh rev 1.22.
    
    Merge missing bits from Colin Watson's patch in bz#2658 which make integrity
    tests more robust against timeouts.  ok djm@

commit 06ec837a34542627e2183a412d6a9d2236f22140
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 28 14:30:03 2017 +1000

    Id sync for integrity.sh rev 1.21 which pulls in some shell portability fixes

commit e0194b471efe7d3daedc9cc66686cb1ab69d3be8
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Mon Apr 17 11:02:31 2017 +0000

    upstream commit
    
    Change COMPILER_VERSION tests which limited additional
    warnings to gcc4 to instead skip them on gcc3 as clang can handle
    -Wpointer-sign and -Wold-style-definition.
    
    Upstream-Regress-ID: e48d7dc13e48d9334b8195ef884dfbc51316012f

commit 6830be90e71f46bcd182a9202b151eaf2b299434
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 28 03:24:53 2017 +0000

    upstream commit
    
    include key fingerprint in "Offering public key" debug
    message
    
    Upstream-ID: 964749f820c2ed4cf6a866268b1a05e907315c52

commit 066437187e16dcafcbc19f9402ef0e6575899b1d
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Fri Apr 28 03:21:12 2017 +0000

    upstream commit
    
    Avoid relying on implementation-specific behavior when
    detecting whether the timestamp or file size overflowed.  If time_t and off_t
    are not either 32-bit or 64-bit scp will exit with an error. OK djm@
    
    Upstream-ID: f31caae73ddab6df496b7bbbf7da431e267ad135

commit 68d3a2a059183ebd83b15e54984ffaced04d2742
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 28 03:20:27 2017 +0000

    upstream commit
    
    Add SyslogFacility option to ssh(1) matching the
    equivalent option in sshd(8).  bz#2705, patch from erahn at arista.com, ok
    djm@
    
    Upstream-ID: d5115c2c0193ceb056ed857813b2a7222abda9ed

commit e13aad66e73a14b062d13aee4e98f1e21a3f6a14
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Thu Apr 27 13:40:05 2017 +0000

    upstream commit
    
    remove a static array unused since rev 1.306 spotted by
    clang ok djm@
    
    Upstream-ID: 249b3eed2446f6074ba2219ccc46919dd235a7b8

commit 91bd2181866659f00714903e78e1c3edd4c45f3d
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Thu Apr 27 11:53:12 2017 +0000

    upstream commit
    
    Avoid potential signed int overflow when parsing the file
    size. Use strtoul() instead of parsing manually.  OK djm@
    
    Upstream-ID: 1f82640861c7d905bbb05e7d935d46b0419ced02

commit 17a54a03f5a1d35e33cc24e22cd7a9d0f6865dc4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Apr 25 08:32:27 2017 +1000

    Fix typo in "socketcall".
    
    Pointed out by jjelen at redhat.com.

commit 8b0eee148f7cf8b248c30d1bae57300f2cc5aafd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Apr 24 19:40:31 2017 +1000

    Deny socketcall in seccomp filter on ppc64le.
    
    OpenSSL is using socket() calls (in FIPS mode) when handling ECDSA keys
    in privsep child. The socket() syscall is already denied in the seccomp
    filter, but in ppc64le kernel, it is implemented using socketcall()
    syscall, which is not denied yet (only SYS_SHUTDOWN is allowed) and
    therefore fails hard.
    
    Patch from jjelen at redhat.com.

commit f8500b2be599053daa05248a86a743232ec6a536
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Mon Apr 17 14:31:23 2017 +0000

    upstream commit
    
    Recognize nl_langinfo(CODESET) return values "646" and ""
    as aliases for "US-ASCII", useful for different versions of NetBSD and
    Solaris. Found by dtucker@ and by Tom G. Christensen <tgc at jupiterrise dot
    com>. OK dtucker@ deraadt@
    
    Upstream-ID: 38c2133817cbcae75c88c63599ac54228f0fa384

commit 7480dfedf8c5c93baaabef444b3def9331e86ad5
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Mon Apr 17 11:02:31 2017 +0000

    upstream commit
    
    Change COMPILER_VERSION tests which limited additional
    warnings to gcc4 to instead skip them on gcc3 as clang can handle
    -Wpointer-sign and -Wold-style-definition.
    
    Upstream-ID: 5cbe348aa76dc1adf55be6c0e388fafaa945439a

commit 4d827f0d75a53d3952288ab882efbddea7ffadfe
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 4 00:24:56 2017 +0000

    upstream commit
    
    disallow creation (of empty files) in read-only mode;
    reported by Michal Zalewski, feedback & ok deraadt@
    
    Upstream-ID: 5d9c8f2fa8511d4ecf95322994ffe73e9283899b

commit ef47843af0a904a21c920e619c5aec97b65dd9ac
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sun Mar 26 00:18:52 2017 +0000

    upstream commit
    
    incorrect renditions of this quote bother me
    
    Upstream-ID: 1662be3ebb7a71d543da088119c31d4d463a9e49

commit d9048861bea842c4eba9c2dbbf97064cc2a5ef02
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Mar 31 11:04:43 2017 +1100

    Check for and use gcc's -pipe.
    
    Speeds up configure and build by a couple of percent.  ok djm@

commit 282cad2240c4fbc104c2f2df86d688192cbbe4bb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 29 16:34:44 2017 +1100

    Import fmt_scaled.c rev 1.16 from OpenBSD.
    
    Fix overly-conservative overflow checks on mulitplications and add checks
    on additions.  This allows scan_scaled to work up to +/-LLONG_MAX (LLONG_MIN
    will still be flagged as a range error).  ok millert@

commit c73a229e4edf98920f395e19fd310684fc6bb951
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 29 16:34:02 2017 +1100

    Import fmt_scaled.c rev 1.15 from OpenBSD.
    
    Collapse underflow and overflow checks into a single block.
    ok djm@ millert@

commit d427b73bf5a564f663d16546dbcbd84ba8b9d4af
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 29 16:32:57 2017 +1100

    Import fmt_scaled.c rev 1.14 from OpenBSD.
    
    Catch integer underflow in scan_scaled reported by Nicolas Iooss.
    ok deraadt@ djm@

commit d13281f2964abc5f2e535e1613c77fc61b0c53e7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 29 12:39:39 2017 +1100

    Don't check privsep user or path when unprivileged
    
    If running with privsep (mandatory now) as a non-privileged user, we
    don't chroot or change to an unprivileged user however we still checked
    the existence of the user and directory.  Don't do those checks if we're
    not going to use them.  Based in part on a patch from Lionel Fourquaux
    via Corinna Vinschen, ok djm@

commit f2742a481fe151e493765a3fbdef200df2ea7037
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 29 10:50:31 2017 +1100

    Remove SHA256 EVP wrapper implementation.
    
    All supported versions of OpenSSL should now have SHA256 so remove our
    EVP wrapper implementaion.  ok djm@

commit 5346f271fc76549caf4a8e65b5fba319be422fe9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 29 10:23:58 2017 +1100

    Remove check for OpenSSL < 0.9.8g.
    
    We no longer support OpenSSL < 1.0.1 so remove check for unreliable ECC
    in OpenSSL < 0.9.8g.

commit 8fed0a5fe7b4e78a6810b133d8e91be9742ee0a1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 29 10:16:15 2017 +1100

    Remove compat code for OpenSSL < 0.9.7.
    
    Resyncs that code with OpenBSD upstream.

commit 608ec1f62ff22fdccc3952e51463d79c43cbd0d3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 29 09:50:54 2017 +1100

    Remove SSHv1 code path.
    
    Server-side support for Protocol 1 has been removed so remove !compat20
    PAM code path.

commit 7af27bf538cbc493d609753f9a6d43168d438f1b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Mar 24 09:44:56 2017 +1100

    Enable ldns when using ldns-config.
    
    Actually enable ldns when attempting to use ldns-config.  bz#2697, patch
    from fredrik at fornwall.net.

commit 58b8cfa2a062b72139d7229ae8de567f55776f24
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 22 12:43:02 2017 +1100

    Missing header on Linux/s390
    
    Patch from Jakub Jelen

commit 096fb65084593f9f3c1fc91b6d9052759a272a00
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 20 22:08:06 2017 +0000

    upstream commit
    
    remove /usr/bin/time calls around tests, makes diffing test
    runs harder. Based on patch from Mike Frysinger
    
    Upstream-Regress-ID: 81c1083b14dcf473b23d2817882f40b346ebc95c

commit 6b853c6f8ba5eecc50f3b57af8e63f8184eb0fa6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 21 08:47:55 2017 +1100

    Fix syntax error on Linux/X32
    
    Patch from Mike Frysinger

commit d38f05dbdd291212bc95ea80648b72b7177e9f4e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 20 13:38:27 2017 +1100

    Add llabs() implementation.

commit 72536316a219b7394996a74691a5d4ec197480f7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 20 12:23:04 2017 +1100

    crank version numbers

commit 3be52bc36bdfd24ded7e0f46999e7db520fb4e3f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 20 01:18:59 2017 +0000

    upstream commit
    
    openssh-7.5
    
    Upstream-ID: b8b9a4a949427c393cd868215e1724ceb3467ee5

commit db84e52fe9cfad57f22e7e23c5fbf00092385129
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 20 12:07:20 2017 +1100

    I'm a doofus.
    
    Unbreak obvious syntax error.

commit 89f04852db27643717c9c3a2b0dde97ae50099ee
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 20 11:53:34 2017 +1100

    on Cygwin, check paths from server for backslashes
    
    Pointed out by Jann Horn of Google Project Zero

commit 7ef1f9bafc2cc8d97ff2fbd4f280002b6e8ea5d9
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 20 11:48:34 2017 +1100

    Yet another synonym for ASCII: "646"
    
    Used by NetBSD; this unbreaks mprintf() and friends there for the C
    locale (caught by dtucker@ and his menagerie of test systems).

commit 9165abfea3f68a0c684a6ed2e575e59bc31a3a6b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 20 09:58:34 2017 +1100

    create test mux socket in /tmp
    
    Creating the socket in $OBJ could blow past the (quite limited)
    path limit for Unix domain sockets. As a bandaid for bz#2660,
    reported by Colin Watson; ok dtucker@

commit 2adbe1e63bc313d03e8e84e652cc623af8ebb163
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Mar 15 07:07:39 2017 +0000

    upstream commit
    
    disallow KEXINIT before NEWKEYS; ok djm; report by
    vegard.nossum at oracle.com
    
    Upstream-ID: 3668852d1f145050e62f1da08917de34cb0c5234

commit 2fbf91684d76d38b9cf06550b69c9e41bca5a71c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 16 14:05:46 2017 +1100

    Include includes.h for compat bits.

commit b55f634e96b9c5b0cd991e23a9ca181bec4bdbad
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 16 13:45:17 2017 +1100

    Wrap stdint.h in #ifdef HAVE_STDINT_H

commit 55a1117d7342a0bf8b793250cf314bab6b482b99
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 16 11:22:42 2017 +1100

    Adapt Cygwin config script to privsep knob removal
    
    Patch from Corinna Vinschen.

commit 1a321bfdb91defe3c4d9cca5651724ae167e5436
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed Mar 15 03:52:30 2017 +0000

    upstream commit
    
    accidents happen to the best of us; ok djm
    
    Upstream-ID: b7a9dbd71011ffde95e06f6945fe7197dedd1604

commit 25f837646be8c2017c914d34be71ca435dfc0e07
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 15 02:25:09 2017 +0000

    upstream commit
    
    fix regression in 7.4: deletion of PKCS#11-hosted keys
    would fail unless they were specified by full physical pathname. Report and
    fix from Jakub Jelen via bz#2682; ok dtucker@
    
    Upstream-ID: 5b5bc20ca11cacb5d5eb29c3f93fd18425552268

commit a8c5eeacf032a7d3408957e45dd7603cc1baf55f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 15 02:19:09 2017 +0000

    upstream commit
    
    Fix segfault when sshd attempts to load RSA1 keys (can
    only happen when protocol v.1 support is enabled for the client). Reported by
    Jakub Jelen in bz#2686; ok dtucker
    
    Upstream-ID: 8fdaec2ba4b5f65db1d094f6714ce64b25d871d7

commit 66705948c0639a7061a0d0753266da7685badfec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 14 07:19:07 2017 +0000

    upstream commit
    
    Mark the sshd_config UsePrivilegeSeparation option as
    deprecated, effectively making privsep mandatory in sandboxing mode. ok
    markus@ deraadt@
    
    (note: this doesn't remove the !privsep code paths, though that will
    happen eventually).
    
    Upstream-ID: b4c52666256c4dd865f8ce9431af5d6ce2d74a0a

commit f86586b03fe6cd8f595289bde200a94bc2c191af
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 14 18:26:29 2017 +1100

    Make seccomp-bpf sandbox work on Linux/X32
    
    Allow clock_gettime syscall with X32 bit masked off. Apparently
    this is required for at least some kernel versions. bz#2142
    Patch mostly by Colin Watson. ok dtucker@

commit 2429cf78dd2a9741ce27ba25ac41c535274a0af6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 14 18:01:52 2017 +1100

    require OpenSSL >=1.0.1

commit e3ea335abeab731c68f2b2141bee85a4b0bf680f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 14 17:48:43 2017 +1100

    Remove macro trickery; no binary change
    
    This stops the SC_ALLOW(), SC_ALLOW_ARG() and SC_DENY() macros
    prepending __NR_ to the syscall number parameter and just makes
    them explicit in the macro invocations.
    
    No binary change in stripped object file before/after.

commit 5f1596e11d55539678c41f68aed358628d33d86f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 14 13:15:18 2017 +1100

    support ioctls for ICA crypto card on Linux/s390
    
    Based on patch from Eduardo Barretto; ok dtucker@

commit b1b22dd0df2668b322dda174e501dccba2cf5c44
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 14 14:19:36 2017 +1100

    Plumb conversion test into makefile.

commit f57783f1ddfb4cdfbd612c6beb5ec01cb5b9a6b9
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 14 01:20:29 2017 +0000

    upstream commit
    
    Add unit test for convtime().
    
    Upstream-Regress-ID: 8717bc0ca4c21120f6dd3a1d3b7a363f707c31e1

commit 8884b7247d094cd11ff9e39c325ba928c5bdbc6c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 14 01:10:07 2017 +0000

    upstream commit
    
    Add ASSERT_LONG_* helpers.
    
    Upstream-Regress-ID: fe15beaea8f5063c7f21b0660c722648e3d76431

commit c6774d21185220c0ba11e8fd204bf0ad1a432071
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 14 00:55:37 2017 +0000

    upstream commit
    
    Fix convtime() overflow test on boundary condition,
    spotted by & ok djm.
    
    Upstream-ID: 51f14c507ea87a3022e63f574100613ab2ba5708

commit f5746b40cfe6d767c8e128fe50c43274b31cd594
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Mar 14 00:25:03 2017 +0000

    upstream commit
    
    Check for integer overflow when parsing times in
    convtime().  Reported by nicolas.iooss at m4x.org, ok djm@
    
    Upstream-ID: 35e6a4e98f6fa24df50bfb8ba1307cf70e966f13

commit f5907982f42a8d88a430b8a46752cbb7859ba979
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 14 13:38:15 2017 +1100

    Add a "unit" target to run only unit tests.

commit 9e96b41682aed793fadbea5ccd472f862179fb02
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 14 12:24:47 2017 +1100

    Fix weakness in seccomp-bpf sandbox arg inspection
    
    Syscall arguments are passed via an array of 64-bit values in struct
    seccomp_data, but we were only inspecting the bottom 32 bits and not
    even those correctly for BE systems.
    
    Fortunately, the only case argument inspection was used was in the
    socketcall filtering so using this for sandbox escape seems
    impossible.
    
    ok dtucker

commit 8ff3fc3f2f7c13e8968717bc2b895ee32c441275
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Mar 11 23:44:16 2017 +0000

    upstream commit
    
    regress tests for loading certificates without public keys;
    bz#2617 based on patch from Adam Eijdenberg; ok markus@ dtucker@
    
    Upstream-Regress-ID: 0145d19328ed995b73fe2d9da33596b17429d0d0

commit 1e24552716194db8f2f620587b876158a9ef56ad
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Mar 11 23:40:26 2017 +0000

    upstream commit
    
    allow ssh to use certificates accompanied by a private
    key file but no corresponding plain *.pub public key. bz#2617 based on patch
    from Adam Eijdenberg; ok dtucker@ markus@
    
    Upstream-ID: 295668dca2c39505281577217583ddd2bd4b00b9

commit 0fb1a617a07b8df5de188dd5a0c8bf293d4bfc0e
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Sat Mar 11 13:07:35 2017 +0000

    upstream commit
    
    Don't count the initial block twice when computing how
    many bytes to discard for the work around for the attacks against CBC-mode.
    ok djm@; report from Jean Paul, Kenny, Martin and Torben @ RHUL
    
    Upstream-ID: f445f509a4e0a7ba3b9c0dae7311cb42458dc1e2

commit ef653dd5bd5777132d9f9ee356225f9ee3379504
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 10 07:18:32 2017 +0000

    upstream commit
    
    krl.c
    
    Upstream-ID: fc5e695d5d107d730182e2da7b23f00b489e0ee1

commit d94c1dfef2ea30ca67b1204ada7c3b537c54f4d0
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 12 10:48:14 2017 +1100

    sync fmt_scaled.c with OpenBSD
    
    revision 1.13
    date: 2017/03/11 23:37:23;  author: djm;  state: Exp;  lines: +14 -1;  commitid: jnFKyHkB3CEiEZ2R;
    fix signed integer overflow in scan_scaled. Found by Nicolas Iooss
    using AFL against ssh_config. ok deraadt@ millert@
    ----------------------------
    revision 1.12
    date: 2013/11/29 19:00:51;  author: deraadt;  state: Exp;  lines: +6 -5;
    fairly simple unsigned char casts for ctype
    ok krw
    ----------------------------
    revision 1.11
    date: 2012/11/12 14:07:20;  author: halex;  state: Exp;  lines: +4 -2;
    make scan_scaled set errno to EINVAL rather than ERANGE if it encounters
    an invalid multiplier, like the man page says it should
    
    "looks sensible" deraadt@, ok ian@
    ----------------------------
    revision 1.10
    date: 2009/06/20 15:00:04;  author: martynas;  state: Exp;  lines: +4 -4;
    use llabs instead of the home-grown version;  and some comment changes
    ok ian@, millert@
    ----------------------------

commit 894221a63fa061e52e414ca58d47edc5fe645968
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 10 05:01:13 2017 +0000

    upstream commit
    
    When updating hostkeys, accept RSA keys if
    HostkeyAlgorithms contains any RSA keytype. Previously, ssh could ignore RSA
    keys when any of the ssh-rsa-sha2-* methods was enabled in HostkeyAlgorithms
    nit ssh-rsa (SHA1 signatures) was not. bz#2650 reported by Luis Ressel; ok
    dtucker@
    
    Upstream-ID: c5e8cfee15c42f4a05d126158a0766ea06da79d2

commit dd3e2298663f4cc1a06bc69582d00dcfee27d73c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 10 04:24:55 2017 +0000

    upstream commit
    
    make hostname matching really insensitive to case;
    bz#2685, reported by Petr Cerny; ok dtucker@
    
    Upstream-ID: e467622ff154269e36ba8b6c9e3d105e1c4a9253

commit 77a9be9446697fe8b5499fe651f4a82a71a4b51f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 10 03:52:48 2017 +0000

    upstream commit
    
    reword a comment to make it fit 80 columns
    
    Upstream-ID: 4ef509a66b96c7314bbcc87027c2af71fa9d0ba4

commit 61b8ef6a66efaec07e023342cb94a10bdc2254dc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 10 04:27:32 2017 +0000

    upstream commit
    
    better match sshd config parser behaviour: fatal() if
    line is overlong, increase line buffer to match sshd's; bz#2651 reported by
    Don Fong; ok dtucker@
    
    Upstream-ID: b175ae7e0ba403833f1ee566edf10f67443ccd18

commit db2597207e69912f2592cd86a1de8e948a9d7ffb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 10 04:26:06 2017 +0000

    upstream commit
    
    ensure hostname is lower-case before hashing it;
    bz#2591 reported by Griff Miller II; ok dtucker@
    
    Upstream-ID: c3b8b93804f376bd00d859b8bcd9fc0d86b4db17

commit df9936936c695f85c1038bd706d62edf752aca4b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 10 04:24:55 2017 +0000

    upstream commit
    
    make hostname matching really insensitive to case;
    bz#2685, reported by Petr Cerny; ok dtucker@
    
    Upstream-ID: e632b7a9bf0d0558d5ff56dab98b7cca6c3db549

commit 67eed24bfa7645d88fa0b883745fccb22a0e527e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 10 04:11:00 2017 +0000

    upstream commit
    
    Remove old null check from config dumper.  Patch from
    jjelen at redhat.com vi bz#2687, ok djm@
    
    Upstream-ID: 824ab71467b78c4bab0dd1b3a38e8bc5f63dd528

commit 183ba55aaaecca0206184b854ad6155df237adbe
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 10 04:07:20 2017 +0000

    upstream commit
    
    fix regression in 7.4 server-sig-algs, where we were
    accidentally excluding SHA2 RSA signature methods. bz#2680, patch from Nuno
    Goncalves; ok dtucker@
    
    Upstream-ID: 81ac8bfb30960447740b9b8f6a214dcf322f12e8

commit 66be4fe8c4435af5bbc82998501a142a831f1181
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 10 03:53:11 2017 +0000

    upstream commit
    
    Check for NULL return value from key_new.  Patch from
    jjelen at redhat.com via bz#2687, ok djm@
    
    Upstream-ID: 059e33cd43cba88dc8caf0b1936fd4dd88fd5b8e

commit ec2892b5c7fea199914cb3a6afb3af38f84990bf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 10 03:52:48 2017 +0000

    upstream commit
    
    reword a comment to make it fit 80 columns
    
    Upstream-ID: b4b48b4487c0821d16e812c40c9b09f03b28e349

commit 7fadbb6da3f4122de689165651eb39985e1cba85
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 10 03:48:57 2017 +0000

    upstream commit
    
    Check for NULL argument to sshkey_read.  Patch from
    jjelen at redhat.com via bz#2687, ok djm@
    
    Upstream-ID: c2d00c2ea50c4861d271d0a586f925cc64a87e0e

commit 5a06b9e019e2b0b0f65a223422935b66f3749de3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 10 03:45:40 2017 +0000

    upstream commit
    
    Plug some mem leaks mostly on error paths.  From jjelen
    at redhat.com via bz#2687, ok djm@
    
    Upstream-ID: 3fb030149598957a51b7c8beb32bf92cf30c96f2

commit f6edbe9febff8121f26835996b1229b5064d31b7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 10 03:24:48 2017 +0000

    upstream commit
    
    Plug mem leak on GLOB_NOMATCH case.  From jjelen at
    redhat.com via bz#2687, ok djm@
    
    Upstream-ID: 8016a7ae97719d3aa55fb723fc2ad3200058340d

commit 566b3a46e89a2fda2db46f04f2639e92da64a120
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 10 03:22:40 2017 +0000

    upstream commit
    
    Plug descriptor leaks of auth_sock.  From jjelen at
    redhat.com via bz#2687, ok djm@
    
    Upstream-ID: 248acb99a5ed2fdca37d1aa33c0fcee7be286d88

commit 8a2834454c73dfc1eb96453c0e97690595f3f4c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 10 03:18:24 2017 +0000

    upstream commit
    
    correctly hash hosts with a port number. Reported by Josh
    Powers in bz#2692; ok dtucker@
    
    Upstream-ID: 468e357ff143e00acc05bdd2803a696b3d4b6442

commit 9747b9c742de409633d4753bf1a752cbd211e2d3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 10 03:15:58 2017 +0000

    upstream commit
    
    don't truncate off \r\n from long stderr lines; bz#2688,
    reported by Brian Dyson; ok dtucker@
    
    Upstream-ID: cdfdc4ba90639af807397ce996153c88af046ca4

commit 4a4b75adac862029a1064577eb5af299b1580cdd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 10 02:59:51 2017 +0000

    upstream commit
    
    Validate digest arg in ssh_digest_final; from jjelen at
    redhat.com via bz#2687, ok djm@
    
    Upstream-ID: dbe5494dfddfe523fab341a3dab5a79e7338f878

commit bee0167be2340d8de4bdc1ab1064ec957c85a447
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Mar 10 13:40:18 2017 +1100

    Check for NULL from malloc.
    
    Part of bz#2687, from jjelen at redhat.com.

commit da39b09d43b137a5a3d071b51589e3efb3701238
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Mar 10 13:22:32 2017 +1100

    If OSX is using launchd, remove screen no.
    
    Check for socket with and without screen number.  From Apple and Jakob
    Schlyter via bz#2341, with contributions from Ron Frederick, ok djm@

commit 8fb15311a011517eb2394bb95a467c209b8b336c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 8 12:07:47 2017 +0000

    upstream commit
    
    quote [host]:port in generated ProxyJump commandline; the
    [ / ] characters can confuse some shells (e.g. zsh). Reported by Lauri
    Tirkkonen via bugs@
    
    Upstream-ID: 65cdd161460e1351c3d778e974c1c2a4fa4bc182

commit 18501151cf272a15b5f2c5e777f2e0933633c513
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 6 02:03:20 2017 +0000

    upstream commit
    
    Check l->hosts before dereferencing; fixes potential null
    pointer deref. ok djm@
    
    Upstream-ID: 81c0327c6ec361da794b5c680601195cc23d1301

commit d072370793f1a20f01ad827ba8fcd3b8f2c46165
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Mar 6 00:44:51 2017 +0000

    upstream commit
    
    linenum is unsigned long so use %lu in log formats.  ok
    deraadt@
    
    Upstream-ID: 9dc582d9bb887ebe0164e030d619fc20b1a4ea08

commit 12d3767ba4c84c32150cbe6ff6494498780f12c9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 3 06:13:11 2017 +0000

    upstream commit
    
    fix ssh-keygen -H accidentally corrupting known_hosts that
    contained already-hashed entries. HKF_MATCH_HOST_HASHED is only set by
    hostkeys_foreach() when hostname matching is in use, so we need to look for
    the hash marker explicitly.
    
    Upstream-ID: da82ad653b93e8a753580d3cf5cd448bc2520528

commit d7abb771bd5a941b26144ba400a34563a1afa589
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 28 06:10:08 2017 +0000

    upstream commit
    
    small memleak: free fd_set on connection timeout (though
    we are heading to exit anyway). From Tom Rix in bz#2683
    
    Upstream-ID: 10e3dadbb8199845b66581473711642d9e6741c4

commit 78142e3ab3887e53a968d6e199bcb18daaf2436e
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Feb 27 14:30:33 2017 +0000

    upstream commit
    
    errant dot; from klemens nanni
    
    Upstream-ID: 83d93366a5acf47047298c5d3ebc5e7426f37921

commit 8071a6924c12bb51406a9a64a4b2892675112c87
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 24 03:16:34 2017 +0000

    upstream commit
    
    might as well set the listener socket CLOEXEC
    
    Upstream-ID: 9c538433d6a0ca79f5f21decc5620e46fb68ab57

commit d5499190559ebe374bcdfa8805408646ceffad64
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Feb 19 00:11:29 2017 +0000

    upstream commit
    
    add test cases for C locale; ok schwarze@
    
    Upstream-Regress-ID: 783d75de35fbc923d46e2a5e6cee30f8f381ba87

commit 011c8ffbb0275281a0cf330054cf21be10c43e37
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Feb 19 00:10:57 2017 +0000

    upstream commit
    
    Add a common nl_langinfo(CODESET) alias for US-ASCII
    "ANSI_X3.4-1968" that is used by Linux. Fixes mprintf output truncation for
    non-UTF-8 locales on Linux spotted by dtucker@; ok deraadt@ schwarze@
    
    Upstream-ID: c6808956ebffd64066f9075d839f74ff0dd60719

commit 0c4430a19b73058a569573492f55e4c9eeaae67b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Feb 7 23:03:11 2017 +0000

    upstream commit
    
    Remove deprecated SSH1 options RSAAuthentication and
    RhostsRSAAuthentication from regression test sshd_config.
    
    Upstream-Regress-ID: 8066b753d9dce7cf02ff87af5c727ff680d99491

commit 3baa4cdd197c95d972ec3d07f1c0d08f2d7d9199
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 17 02:32:05 2017 +0000

    upstream commit
    
    Do not show rsa1 key type in usage when compiled without
    SSH1 support.
    
    Upstream-ID: 068b5c41357a02f319957746fa4e84ea73960f57

commit ecc35893715f969e98fee118481f404772de4132
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 17 02:31:14 2017 +0000

    upstream commit
    
    ifdef out "rsa1" from the list of supported keytypes when
    compiled without SSH1 support.  Found by kdunlop at guralp.com, ok djm@
    
    Upstream-ID: cea93a26433d235bb1d64b1d990f19a9c160a70f

commit 10577c6d96a55b877a960b2d0b75edef1b9945af
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 17 02:04:15 2017 +0000

    upstream commit
    
    For ProxyJump/-J, surround host name with brackets to
    allow literal IPv6 addresses. From Dick Visser; ok dtucker@
    
    Upstream-ID: 3a5d3b0171250daf6a5235e91bce09c1d5746bf1

commit b2afdaf1b52231aa23d2153f4a8c5a60a694dda4
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Wed Feb 15 23:38:31 2017 +0000

    upstream commit
    
    Fix memory leaks in match_filter_list() error paths.
    
    ok dtucker@ markus@
    
    Upstream-ID: c7f96ac0877f6dc9188bbc908100a8d246cc7f0e

commit 6d5a41b38b55258213ecfaae9df7a758caa752a1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 15 01:46:47 2017 +0000

    upstream commit
    
    fix division by zero crash in "df" output when server
    returns zero total filesystem blocks/inodes. Spotted by Guido Vranken; ok
    dtucker@
    
    Upstream-ID: 6fb6c2ae6b289aa07b6232dbc0be54682ef5419f

commit bd5d7d239525d595ecea92765334af33a45d9d63
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 12 15:45:15 2017 +1100

    ifdef out EVP_R_PRIVATE_KEY_DECODE_ERROR
    
    EVP_R_PRIVATE_KEY_DECODE_ERROR was added in OpenSSL 1.0.0 so ifdef out
    for the benefit of OpenSSL versions prior to that.

commit 155d540d00ff55f063421ec182ec8ff2b7ab6cbe
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 10 04:34:50 2017 +0000

    upstream commit
    
    bring back r1.34 that was backed out for problems loading
    public keys:
    
    translate OpenSSL error codes to something more
    meaninful; bz#2522 reported by Jakub Jelen, ok dtucker@
    
    with additional fix from Jakub Jelen to solve the backout.
    bz#2525 bz#2523 re-ok dtucker@
    
    Upstream-ID: a9d5bc0306f4473d9b4f4484f880e95f3c1cc031

commit a287c5ad1e0bf9811c7b9221979b969255076019
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 10 03:36:40 2017 +0000

    upstream commit
    
    Sanitise escape sequences in key comments sent to printf
    but preserve valid UTF-8 when the locale supports it; bz#2520 ok dtucker@
    
    Upstream-ID: e8eed28712ba7b22d49be534237eed019875bd1e

commit e40269be388972848aafcca7060111c70aab5b87
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Wed Feb 8 20:32:43 2017 +0000

    upstream commit
    
    Avoid printf %s NULL.  From semarie@, OK djm@
    
    Upstream-ID: 06beef7344da0208efa9275d504d60d2a5b9266c

commit 5b90709ab8704dafdb31e5651073b259d98352bc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 6 09:22:51 2017 +0000

    upstream commit
    
    Restore \r\n newline sequence for server ident string. The CR
    got lost in the flensing of SSHv1. Pointed out by Stef Bon
    
    Upstream-ID: 5333fd43ce5396bf5999496096fac5536e678fac

commit 97c31c46ee2e6b46dfffdfc4f90bbbf188064cbc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 3 23:01:42 2017 +0000

    upstream commit
    
    unit test for match_filter_list() function; still want a
    better name for this...
    
    Upstream-Regress-ID: 840ad6118552c35111f0a897af9c8d93ab8de92a

commit f1a193464a7b77646f0d0cedc929068e4a413ab4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 3 23:05:57 2017 +0000

    upstream commit
    
    use ssh_packet_set_log_preamble() to include connection
    username in packet log messages, e.g.
    
    Connection closed by invalid user foo 10.1.1.1 port 44056 [preauth]
    
    ok markus@ bz#113
    
    Upstream-ID: 3591b88bdb5416d6066fb3d49d8fff2375bf1a15

commit 07edd7e9537ab32aa52abb5fb2a915c350fcf441
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 3 23:03:33 2017 +0000

    upstream commit
    
    add ssh_packet_set_log_preamble() to allow inclusion of a
    preamble string in disconnect messages; ok markus@
    
    Upstream-ID: 34cb41182cd76d414c214ccb01c01707849afead

commit 68bc8cfa7642d3ccbf2cd64281c16b8b9205be59
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 3 23:01:19 2017 +0000

    upstream commit
    
    support =- for removing methods from algorithms lists,
    e.g. Ciphers=-*cbc; suggested by Cristian Ionescu-Idbohrn in bz#2671 "I like
    it" markus@
    
    Upstream-ID: c78c38f9f81a963b33d0eade559f6048add24a6d

commit c924b2ef941028a1f31e6e94f54dfeeeef462a4e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 3 05:05:56 2017 +0000

    upstream commit
    
    allow form-feed characters at EOL; bz#2431 ok dtucker@
    
    Upstream-ID: 1f453afaba6da2ae69d6afdf1ae79a917552f1a2

commit 523db8540b720c4d21ab0ff6f928476c70c38aab
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 3 16:01:22 2017 +1100

    prefer to use ldns-config to find libldns
    
    Should fix bz#2603 - "Build with ldns and without kerberos support
    fails if ldns compiled with kerberos support" by including correct
    cflags/libs
    
    ok dtucker@

commit c998bf0afa1a01257a53793eba57941182e9e0b7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Feb 3 02:56:00 2017 +0000

    upstream commit
    
    Make ssh_packet_set_rekey_limits take u32 for the number of
    seconds until rekeying (negative values are rejected at config parse time).
    This allows the removal of some casts and a signed vs unsigned comparison
    warning.
    
    rekey_time is cast to int64 for the comparison which is a no-op
    on OpenBSD, but should also do the right thing in -portable on
    anything still using 32bit time_t (until the system time actually
    wraps, anyway).
    
    some early guidance deraadt@, ok djm@
    
    Upstream-ID: c9f18613afb994a07e7622eb326f49de3d123b6c

commit 3ec5fa4ba97d4c4853620daea26a33b9f1fe3422
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Thu Feb 2 10:54:25 2017 +0000

    upstream commit
    
    In vasnmprintf() return an error if malloc fails and
    don't set a function argument to the address of free'd memory.
    
    ok djm@
    
    Upstream-ID: 1efffffff2f51d53c9141f245b90ac23d33b9779

commit 858252fb1d451ebb0969cf9749116c8f0ee42753
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Feb 1 02:59:09 2017 +0000

    upstream commit
    
    Return true reason for port forwarding failures where
    feasible rather than always "administratively prohibited".  bz#2674, ok djm@
    
    Upstream-ID: d901d9887951774e604ca970e1827afaaef9e419

commit 6ba9f893838489add6ec4213c7a997b425e4a9e0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jan 30 23:27:39 2017 +0000

    upstream commit
    
    Small correction to the known_hosts section on when it is
    updated. Patch from lkppo at free.fr some time ago, pointed out by smallm at
    sdf.org
    
    Upstream-ID: 1834d7af179dea1a12ad2137f84566664af225d5

commit c61d5ec3c11e7ff9779b6127421d9f166cf10915
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 3 14:10:34 2017 +1100

    Remove _XOPEN_SOURCE from wide char detection.
    
    Having _XOPEN_SOURCE unconditionally causes problems on some platforms
    and configurations, notably Solaris 64-bit binaries.  It was there for
    the benefit of Linux put the required bits in the *-*linux* section.
    
    Patch from yvoinov at gmail.com.

commit f25ee13b3e81fd80efeb871dc150fe49d7fc8afd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 30 05:22:14 2017 +0000

    upstream commit
    
    fully unbreak: some $SSH invocations did not have -F
    specified and could pick up the ~/.ssh/config of the user running the tests
    
    Upstream-Regress-ID: f362d1892c0d3e66212d5d3fc02d915c58ef6b89

commit 6956e21fb26652887475fe77ea40d2efcf25908b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 30 04:54:07 2017 +0000

    upstream commit
    
    partially unbreak: was not specifying hostname on some
    $SSH invocations
    
    Upstream-Regress-ID: bc8a5e98e57bad0a92ef4f34ed91c1d18294e2cc

commit 52763dd3fe0a4678dafdf7aeb32286e514130afc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 30 01:03:00 2017 +0000

    upstream commit
    
    revise keys/principals command hang fix (bz#2655) to
    consume entire output, avoiding sending SIGPIPE to subprocesses early; ok
    dtucker@
    
    Upstream-ID: 7cb04b31a61f8c78c4e48ceededcd2fd5c4ee1bc

commit 381a2615a154a82c4c53b787f4a564ef894fe9ac
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 30 00:38:50 2017 +0000

    upstream commit
    
    small cleanup post SSHv1 removal:
    
    remove SSHv1-isms in commented examples
    
    reorder token table to group deprecated and compile-time conditional tokens
    better
    
    fix config dumping code for some compile-time conditional options that
    weren't being correctly skipped (SSHv1 and PKCS#11)
    
    Upstream-ID: f2e96b3cb3158d857c5a91ad2e15925df3060105

commit 4833d01591b7eb049489d9558b65f5553387ed43
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 30 00:34:01 2017 +0000

    upstream commit
    
    some explicit NULL tests when dumping configured
    forwardings; from Karsten Weiss
    
    Upstream-ID: 40957b8dea69672b0e50df6b4a91a94e3e37f72d

commit 326e2fae9f2e3e067b5651365eba86b35ee5a6b2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 30 00:32:28 2017 +0000

    upstream commit
    
    misplaced braces in test; from Karsten Weiss
    
    Upstream-ID: f7b794074d3aae8e35b69a91d211c599c94afaae

commit 3e032a95e46bfaea9f9e857678ac8fa5f63997fb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 30 00:32:03 2017 +0000

    upstream commit
    
    don't dereference authctxt before testing != NULL, it
    causes compilers to make assumptions; from Karsten Weiss
    
    Upstream-ID: 794243aad1e976ebc717885b7a97a25e00c031b2

commit 01cfaa2b1cfb84f3cdd32d1bf82b120a8d30e057
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 02:51:16 2017 +0000

    upstream commit
    
    use correct ssh-add program; bz#2654, from Colin Watson
    
    Upstream-Regress-ID: 7042a36e1bdaec6562f6e57e9d047efe9c7a6030

commit e5c7ec67cdc42ae2584085e0fc5cc5ee91133cf5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 6 02:26:10 2017 +0000

    upstream commit
    
    Account for timeouts in the integrity tests as failures.
    
    If the first test in a series for a given MAC happens to modify the low
    bytes of a packet length, then ssh will time out and this will be
    interpreted as a test failure.  Patch from cjwatson at debian.org via
    bz#2658.
    
    Upstream-Regress-ID: e7467613b0badedaa300bc6fc7495ec2f44e2fb9

commit dbaf599b61bd6e0f8469363a8c8e7f633b334018
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 6 02:09:25 2017 +0000

    upstream commit
    
    Make forwarding test less racy by using unix domain
    sockets instead of TCP ports where possible.  Patch from cjwatson at
    debian.org via bz#2659.
    
    Upstream-Regress-ID: 4756375aac5916ef9d25452a1c1d5fa9e90299a9

commit 9390b0031ebd6eb5488d3bc4d4333c528dffc0a6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Jan 29 21:35:23 2017 +0000

    upstream commit
    
    Fix typo in ~C error message for bad port forward
    cancellation. bz#2672, from Brad Marshall via Colin Watson and Ubuntu's
    bugtracker.
    
    Upstream-ID: 0d4a7e5ead6cc59c9a44b4c1e5435ab3aada09af

commit 4ba15462ca38883b8a61a1eccc093c79462d5414
Author: guenther@openbsd.org <guenther@openbsd.org>
Date:   Sat Jan 21 11:32:04 2017 +0000

    upstream commit
    
    The POSIX APIs that that sockaddrs all ignore the s*_len
    field in the incoming socket, so userspace doesn't need to set it unless it
    has its own reasons for tracking the size along with the sockaddr.
    
    ok phessler@ deraadt@ florian@
    
    Upstream-ID: ca6e49e2f22f2b9e81d6d924b90ecd7e422e7437

commit a1187bd3ef3e4940af849ca953a1b849dae78445
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jan 6 16:28:12 2017 +0000

    upstream commit
    
    keep the tokens list sorted;
    
    Upstream-ID: b96239dae4fb3aa94146bb381afabcc7740a1638

commit b64077f9767634715402014f509e58decf1e140d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 09:27:52 2017 +0000

    upstream commit
    
    fix previous
    
    Upstream-ID: c107d6a69bc22325d79fbf78a2a62e04bcac6895

commit 5e820e9ea2e949aeb93071fe31c80b0c42f2b2de
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 03:53:58 2017 +0000

    upstream commit
    
    show a useful error message when included config files
    can't be opened; bz#2653, ok dtucker@
    
    Upstream-ID: f598b73b5dfe497344cec9efc9386b4e5a3cb95b

commit 13bd2e2d622d01dc85d22b94520a5b243d006049
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 03:45:41 2017 +0000

    upstream commit
    
    sshd_config is documented to set
    GSSAPIStrictAcceptorCheck=yes by default, so actually make it do this.
    bz#2637 ok dtucker
    
    Upstream-ID: 99ef8ac51f17f0f7aec166cb2e34228d4d72a665

commit f89b928534c9e77f608806a217d39a2960cc7fd0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 6 03:41:58 2017 +0000

    upstream commit
    
    Avoid confusing error message when attempting to use
    ssh-keyscan built without SSH protocol v.1 to scan for v.1 keys; bz#2583
    
    Upstream-ID: 5d214abd3a21337d67c6dcc5aa6f313298d0d165

commit 0999533014784579aa6f01c2d3a06e3e8804b680
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 6 02:34:54 2017 +0000

    upstream commit
    
    Re-add '%k' token for AuthorizedKeysCommand which was
    lost during the re-org in rev 1.235.  bz#2656, from jboning at gmail.com.
    
    Upstream-ID: 2884e203c02764d7b3fe7472710d9c24bdc73e38

commit 51045869fa084cdd016fdd721ea760417c0a3bf3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 4 05:37:40 2017 +0000

    upstream commit
    
    unbreak Unix domain socket forwarding for root; ok
    markus@
    
    Upstream-ID: 6649c76eb7a3fa15409373295ca71badf56920a2

commit 58fca12ba967ea5c768653535604e1522d177e44
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 16 09:08:32 2017 +1100

    Remove LOGIN_PROGRAM.
    
    UseLogin is gone, remove leftover.  bz#2665, from cjwatson at debian.org

commit b108ce92aae0ca0376dce9513d953be60e449ae1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 4 02:21:43 2017 +0000

    upstream commit
    
    relax PKCS#11 whitelist a bit to allow libexec as well as
    lib directories.
    
    Upstream-ID: cf5617958e2e2d39f8285fd3bc63b557da484702

commit c7995f296b9222df2846f56ecf61e5ae13d7a53d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 3 05:46:51 2017 +0000

    upstream commit
    
    check number of entries in SSH2_FXP_NAME response; avoids
    unreachable overflow later. Reported by Jann Horn
    
    Upstream-ID: b6b2b434a6d6035b1644ca44f24cd8104057420f

commit ddd3d34e5c7979ca6f4a3a98a7d219a4ed3d98c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 30 22:08:02 2016 +0000

    upstream commit
    
    fix deadlock when keys/principals command produces a lot of
    output and a key is matched early; bz#2655, patch from jboning AT gmail.com
    
    Upstream-ID: e19456429bf99087ea994432c16d00a642060afe

commit 30eee7d1b2fec33c14870cc11910610be5d2aa6f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 20 12:16:11 2016 +1100

    Re-add missing "Prerequisites" header and fix typo
    
    Patch from HARUYAMA Seigo <haruyama at unixuser org>.

commit c8c60f3663165edd6a52632c6ddbfabfce1ca865
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 19 22:35:23 2016 +0000

    upstream commit
    
    use standard /bin/sh equality test; from Mike Frysinger
    
    Upstream-Regress-ID: 7b6f0b63525f399844c8ac211003acb8e4b0bec2

commit 4a354fc231174901f2629437c2a6e924a2dd6772
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 19 15:59:26 2016 +1100

    crank version numbers for release

commit 5f8d0bb8413d4d909cc7aa3c616fb0538224c3c9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 19 04:55:51 2016 +0000

    upstream commit
    
    openssh-7.4
    
    Upstream-ID: 1ee404adba6bbe10ae9277cbae3a94abe2867b79

commit 3a8213ea0ed843523e34e55ab9c852332bab4c7b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 19 04:55:18 2016 +0000

    upstream commit
    
    remove testcase that depends on exact output and
    behaviour of snprintf(..., "%s", NULL)
    
    Upstream-Regress-ID: cab4288531766bd9593cb556613b91a2eeefb56f

commit eae735a82d759054f6ec7b4e887fb7a5692c66d7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Dec 19 03:32:57 2016 +0000

    upstream commit
    
    Use LOGNAME to get current user and fall back to whoami if
    not set. Mainly to benefit -portable since some platforms don't have whoami.
    
    Upstream-Regress-ID: e3a16b7836a3ae24dc8f8a4e43fdf8127a60bdfa

commit 0d2f88428487518eea60602bd593989013831dcf
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 16 03:51:19 2016 +0000

    upstream commit
    
    Add regression test for AllowUsers and DenyUsers.  Patch from
    Zev Weiss <zev at bewilderbeest.net>
    
    Upstream-Regress-ID: 8f1aac24d52728398871dac14ad26ea38b533fb9

commit 3bc8180a008929f6fe98af4a56fb37d04444b417
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 16 15:02:24 2016 +1100

    Add missing monitor.h include.
    
    Fixes warning pointed out by Zev Weiss <zev at bewilderbeest.net>

commit 410681f9015d76cc7b137dd90dac897f673244a0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 16 02:48:55 2016 +0000

    upstream commit
    
    revert to rev1.2; the new bits in this test depend on changes
    to ssh that aren't yet committed
    
    Upstream-Regress-ID: 828ffc2c7afcf65d50ff2cf3dfc47a073ad39123

commit 2f2ffa4fbe4b671bbffa0611f15ba44cff64d58e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 16 01:06:27 2016 +0000

    upstream commit
    
    Move the "stop sshd" code into its own helper function.
    Patch from Zev Weiss <zev at bewilderbeest.net>, ok djm@
    
    Upstream-Regress-ID: a113dea77df5bd97fb4633ea31f3d72dbe356329

commit e15e7152331e3976b35475fd4e9c72897ad0f074
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 16 01:01:07 2016 +0000

    upstream commit
    
    regression test for certificates along with private key
    with no public half. bz#2617, mostly from Adam Eijdenberg
    
    Upstream-Regress-ID: 2e74dc2c726f4dc839609b3ce045466b69f01115

commit 9a70ec085faf6e55db311cd1a329f1a35ad2a500
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Dec 15 23:50:37 2016 +0000

    upstream commit
    
    Use $SUDO to read pidfile in case root's umask is
    restricted.  From portable.
    
    Upstream-Regress-ID: f6b1c7ffbc5a0dfb7d430adb2883344899174a98

commit fe06b68f824f8f55670442fb31f2c03526dd326c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Dec 15 21:29:05 2016 +0000

    upstream commit
    
    Add missing braces in DenyUsers code.  Patch from zev at
    bewilderbeest.net, ok deraadt@
    
    Upstream-ID: d747ace338dcf943b077925f90f85f789714b54e

commit dcc7d74242a574fd5c4afbb4224795b1644321e7
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Dec 15 21:20:41 2016 +0000

    upstream commit
    
    Fix text in error message.  Patch from zev at
    bewilderbeest.net.
    
    Upstream-ID: deb0486e175e7282f98f9a15035d76c55c84f7f6

commit b737e4d7433577403a31cff6614f6a1b0b5e22f4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Dec 14 00:36:34 2016 +0000

    upstream commit
    
    disable Unix-domain socket forwarding when privsep is
    disabled
    
    Upstream-ID: ab61516ae0faadad407857808517efa900a0d6d0

commit 08a1e7014d65c5b59416a0e138c1f73f417496eb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 9 03:04:29 2016 +0000

    upstream commit
    
    log connections dropped in excess of MaxStartups at
    verbose LogLevel; bz#2613 based on diff from Tomas Kuthan; ok dtucker@
    
    Upstream-ID: 703ae690dbf9b56620a6018f8a3b2389ce76d92b

commit 10e290ec00964b2bf70faab15a10a5574bb80527
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 13 13:51:32 2016 +1100

    Get default of TEST_SSH_UTF8 from environment.

commit b9b8ba3f9ed92c6220b58d70d1e6d8aa3eea1104
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 13 12:56:40 2016 +1100

    Remove commented-out includes.
    
    These commented-out includes have "Still needed?" comments.  Since
    they've been commented out for ~13 years I assert that they're not.

commit 25275f1c9d5f01a0877d39444e8f90521a598ea0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 13 12:54:23 2016 +1100

    Add prototype for strcasestr in compat library.

commit afec07732aa2985142f3e0b9a01eb6391f523dec
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 13 10:23:03 2016 +1100

    Add strcasestr to compat library.
    
    Fixes build on (at least) Solaris 10.

commit dda78a03af32e7994f132d923c2046e98b7c56c8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 12 13:57:10 2016 +1100

    Force Turkish locales back to C/POSIX; bz#2643
    
    Turkish locales are unique in their handling of the letters 'i' and
    'I' (yes, they are different letters) and OpenSSH isn't remotely
    prepared to deal with that. For now, the best we can do is to force
    OpenSSH to use the C/POSIX locale and try to preserve the UTF-8
    encoding if possible.
    
    ok dtucker@

commit c35995048f41239fc8895aadc3374c5f75180554
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 9 12:52:02 2016 +1100

    exit is in stdlib.h not unistd.h (that's _exit).

commit d399a8b914aace62418c0cfa20341aa37a192f98
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 9 12:33:25 2016 +1100

    Include <unistd.h> for exit in utf8 locale test.

commit 47b8c99ab3221188ad3926108dd9d36da3b528ec
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Dec 8 15:48:34 2016 +1100

    Check for utf8 local support before testing it.
    
    Check for utf8 local support and if not found, do not attempt to run the
    utf8 tests.  Suggested by djm@

commit 4089fc1885b3a2822204effbb02b74e3da58240d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Dec 8 12:57:24 2016 +1100

    Use AC_PATH_TOOL for krb5-config.
    
    This will use the host-prefixed version when cross compiling; patch from
    david.michael at coreos.com.

commit b4867e0712c89b93be905220c82f0a15e6865d1e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 6 07:48:01 2016 +0000

    upstream commit
    
    make IdentityFile successfully load and use certificates that
    have no corresponding bare public key. E.g. just a private id_rsa and
    certificate id_rsa-cert.pub (and no id_rsa.pub).
    
    bz#2617 ok dtucker@
    
    Upstream-ID: c1e9699b8c0e3b63cc4189e6972e3522b6292604

commit c9792783a98881eb7ed295680013ca97a958f8ac
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 25 14:04:21 2016 +1100

    Add a gnome-ssh-askpass3 target for GTK+3 version
    
    Based on patch from Colin Watson via bz#2640

commit 7be85ae02b9de0993ce0a1d1e978e11329f6e763
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 25 14:03:53 2016 +1100

    Make gnome-ssh-askpass2.c GTK+3-friendly
    
    Patch from Colin Watson via bz#2640

commit b9844a45c7f0162fd1b5465683879793d4cc4aaa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 4 23:54:02 2016 +0000

    upstream commit
    
    Fix public key authentication when multiple
    authentication is in use. Instead of deleting and re-preparing the entire
    keys list, just reset the 'used' flags; the keys list is already in a good
    order (with already- tried keys at the back)
    
    Analysis and patch from Vincent Brillault on bz#2642; ok dtucker@
    
    Upstream-ID: 7123f12dc2f3bcaae715853035a97923d7300176

commit f2398eb774075c687b13af5bc22009eb08889abe
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Dec 4 22:27:25 2016 +0000

    upstream commit
    
    Unlink PidFile on SIGHUP and always recreate it when the
    new sshd starts. Regression tests (and possibly other things) depend on the
    pidfile being recreated after SIGHUP, and unlinking it means it won't contain
    a stale pid if sshd fails to restart.  ok djm@ markus@
    
    Upstream-ID: 132dd6dda0c77dd49d2f15b2573b5794f6160870

commit 85aa2efeba51a96bf6834f9accf2935d96150296
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 30 03:01:33 2016 +0000

    upstream commit
    
    test new behaviour of cert force-command restriction vs.
    authorized_key/ principals
    
    Upstream-Regress-ID: 399efa7469d40c404c0b0a295064ce75d495387c

commit 5d333131cd8519d022389cfd3236280818dae1bc
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Nov 30 06:54:26 2016 +0000

    upstream commit
    
    tweak previous; while here fix up FILES and AUTHORS;
    
    Upstream-ID: 93f6e54086145a75df8d8ec7d8689bdadbbac8fa

commit 786d5994da79151180cb14a6cf157ebbba61c0cc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 30 03:07:37 2016 +0000

    upstream commit
    
    add a whitelist of paths from which ssh-agent will load
    (via ssh-pkcs11-helper) a PKCS#11 module; ok markus@
    
    Upstream-ID: fe79769469d9cd6d26fe0dc15751b83ef2a06e8f

commit 7844f357cdd90530eec81340847783f1f1da010b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 30 03:00:05 2016 +0000

    upstream commit
    
    Add a sshd_config DisableForwaring option that disables
    X11, agent, TCP, tunnel and Unix domain socket forwarding, as well as
    anything else we might implement in the future.
    
    This, like the 'restrict' authorized_keys flag, is intended to be a
    simple and future-proof way of restricting an account. Suggested as
    a complement to 'restrict' by Jann Horn; ok markus@
    
    Upstream-ID: 203803f66e533a474086b38a59ceb4cf2410fcf7

commit fd6dcef2030d23c43f986d26979f84619c10589d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 30 02:57:40 2016 +0000

    upstream commit
    
    When a forced-command appears in both a certificate and
    an authorized keys/principals command= restriction, refuse to accept the
    certificate unless they are identical.
    
    The previous (documented) behaviour of having the certificate forced-
    command override the other could be a bit confused and more error-prone.
    
    Pointed out by Jann Horn of Project Zero; ok dtucker@
    
    Upstream-ID: 79d811b6eb6bbe1221bf146dde6928f92d2cd05f

commit 7fc4766ac78abae81ee75b22b7550720bfa28a33
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Nov 30 00:28:31 2016 +0000

    upstream commit
    
    On startup, check to see if sshd is already daemonized
    and if so, skip the call to daemon() and do not rewrite the PidFile.  This
    means that when sshd re-execs itself on SIGHUP the process ID will no longer
    change.  Should address bz#2641.  ok djm@ markus@.
    
    Upstream-ID: 5ea0355580056fb3b25c1fd6364307d9638a37b9

commit c9f880c195c65f1dddcbc4ce9d6bfea7747debcc
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 30 13:51:49 2016 +1100

    factor out common PRNG reseed before privdrop
    
    Add a call to RAND_poll() to ensure than more than pid+time gets
    stirred into child processes states. Prompted by analysis from Jann
    Horn at Project Zero. ok dtucker@

commit 79e4829ec81dead1b30999e1626eca589319a47f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Nov 25 03:02:01 2016 +0000

    upstream commit
    
    Allow PuTTY interop tests to run unattended.  bz#2639,
    patch from cjwatson at debian.org.
    
    Upstream-Regress-ID: 4345253558ac23b2082aebabccd48377433b6fe0

commit 504c3a9a1bf090f6b27260fc3e8ea7d984d163dc
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Nov 25 02:56:49 2016 +0000

    upstream commit
    
    Reverse args to sshd-log-wrapper.  Matches change in
    portable, where it allows sshd do be optionally run under Valgrind.
    
    Upstream-Regress-ID: b438d1c6726dc5caa2a45153e6103a0393faa906

commit bd13017736ec2f8f9ca498fe109fb0035f322733
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Nov 25 02:49:18 2016 +0000

    upstream commit
    
    Fix typo in trace message; from portable.
    
    Upstream-Regress-ID: 4c4a2ba0d37faf5fd230a91b4c7edb5699fbd73a

commit 7da751d8b007c7f3e814fd5737c2351440d78b4c
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Tue Nov 1 13:43:27 2016 +0000

    upstream commit
    
    Clean up MALLOC_OPTIONS.  For the unittests, move
    MALLOC_OPTIONS and TEST_ENV to unittets/Makefile.inc.
    
    ok otto
    
    Upstream-Regress-ID: 890d497e0a38eeddfebb11cc429098d76cf29f12

commit 36f58e68221bced35e06d1cca8d97c48807a8b71
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Mon Oct 31 23:45:08 2016 +0000

    upstream commit
    
    Remove the obsolete A and P flags from MALLOC_OPTIONS.
    
    ok dtucker
    
    Upstream-Regress-ID: 6cc25024c8174a87e5734a0dc830194be216dd59

commit b0899ee26a6630883c0f2350098b6a35e647f512
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Nov 29 03:54:50 2016 +0000

    upstream commit
    
    Factor out code to disconnect from controlling terminal
    into its own function.  ok djm@
    
    Upstream-ID: 39fd9e8ebd7222615a837312face5cc7ae962885

commit 54d022026aae4f53fa74cc636e4a032d9689b64d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 25 23:24:45 2016 +0000

    upstream commit
    
    use sshbuf_allocate() to pre-allocate the buffer used for
    loading keys. This avoids implicit realloc inside the buffer code, which
    might theoretically leave fragments of the key on the heap. This doesn't
    appear to happen in practice for normal sized keys, but was observed for
    novelty oversize ones.
    
    Pointed out by Jann Horn of Project Zero; ok markus@
    
    Upstream-ID: d620e1d46a29fdea56aeadeda120879eddc60ab1

commit a9c746088787549bb5b1ae3add7d06a1b6d93d5e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 25 23:22:04 2016 +0000

    upstream commit
    
    split allocation out of sshbuf_reserve() into a separate
    sshbuf_allocate() function; ok markus@
    
    Upstream-ID: 11b8a2795afeeb1418d508a2c8095b3355577ec2

commit f0ddedee460486fa0e32fefb2950548009e5026e
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Nov 23 23:14:15 2016 +0000

    upstream commit
    
    allow ClientAlive{Interval,CountMax} in Match; ok dtucker,
    djm
    
    Upstream-ID: 8beb4c1eadd588f1080b58932281983864979f55

commit 1a6f9d2e2493d445cd9ee496e6e3c2a2f283f66a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 8 22:04:34 2016 +0000

    upstream commit
    
    unbreak DenyUsers; reported by henning@
    
    Upstream-ID: 1c67d4148f5e953c35acdb62e7c08ae8e33f7cb2

commit 010359b32659f455fddd2bd85fd7cc4d7a3b994a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 6 05:46:37 2016 +0000

    upstream commit
    
    Validate address ranges for AllowUser/DenyUsers at
    configuration load time and refuse to accept bad ones. It was previously
    possible to specify invalid CIDR address ranges (e.g. djm@127.1.2.3/55) and
    these would always match.
    
    Thanks to Laurence Parry for a detailed bug report. ok markus (for
    a previous diff version)
    
    Upstream-ID: 9dfcdd9672b06e65233ea4434c38226680d40bfb

commit efb494e81d1317209256b38b49f4280897c61e69
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 28 03:33:52 2016 +0000

    upstream commit
    
    Improve pkcs11_add_provider() logging: demote some
    excessively verbose error()s to debug()s, include PKCS#11 provider name and
    slot in log messages where possible. bz#2610, based on patch from Jakub Jelen
    
    Upstream-ID: 3223ef693cfcbff9079edfc7e89f55bf63e1973d

commit 5ee3fb5affd7646f141749483205ade5fc54adaf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 1 08:12:33 2016 +1100

    Use ptrace(PT_DENY_ATTACH, ..) on OS X.

commit 315d2a4e674d0b7115574645cb51f968420ebb34
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 28 14:34:07 2016 +1100

    Unbreak AES-CTR ciphers on old (~0.9.8) OpenSSL
    
    ok dtucker@

commit a9ff3950b8e80ff971b4d44bbce96df27aed28af
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 28 14:26:58 2016 +1100

    Move OPENSSL_NO_RIPEMD160 to compat.
    
    Move OPENSSL_NO_RIPEMD160 to compat and add ifdefs to mac.c around the
    ripemd160 MACs.

commit bce58885160e5db2adda3054c3b81fe770f7285a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 28 13:52:31 2016 +1100

    Check if RIPEMD160 is disabled in OpenSSL.

commit d924640d4c355d1b5eca1f4cc60146a9975dbbff
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 28 13:38:19 2016 +1100

    Skip ssh1 specfic ciphers.
    
    cipher-3des1.c and cipher-bf1.c are specific to sshv1 so don't even try
    to compile them when Protocol 1 is not enabled.

commit 79d078e7a49caef746516d9710ec369ba45feab6
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Tue Oct 25 04:08:13 2016 +0000

    upstream commit
    
    Fix logic in add_local_forward() that inverted a test
    when code was refactored out into bind_permitted().  This broke ssh port
    forwarding for non-priv ports as a non root user.
    
    ok dtucker@ 'looks good' deraadt@
    
    Upstream-ID: ddb8156ca03cc99997de284ce7777536ff9570c9

commit a903e315dee483e555c8a3a02c2946937f9b4e5d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Oct 24 01:09:17 2016 +0000

    upstream commit
    
    Remove dead breaks, found via opencoverage.net.  ok
    deraadt@
    
    Upstream-ID: ad9cc655829d67fad219762810770787ba913069

commit b4e96b4c9bea4182846e4942ba2048e6d708ee54
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 26 08:43:25 2016 +1100

    Use !=NULL instead of >0 for getdefaultproj.
    
    getdefaultproj() returns a pointer so test it for NULL inequality
    instead of >0.  Fixes compiler warning and is more correct.  Patch from
    David Binderman.

commit 1c4ef0b808d3d38232aeeb1cebb7e9a43def42c5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Oct 23 22:04:05 2016 +0000

    upstream commit
    
    Factor out "can bind to low ports" check into its own function.  This will
    make it easier for Portable to support platforms with permissions models
    other than uid==0 (eg bz#2625).  ok djm@, "doesn't offend me too much"
    deraadt@.
    
    Upstream-ID: 86213df4183e92b8f189a6d2dac858c994bfface

commit 0b9ee623d57e5de7e83e66fd61a7ba9a5be98894
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Oct 19 23:21:56 2016 +0000

    upstream commit
    
    When tearing down ControlMaster connecctions, don't
    pollute stderr when LogLevel=quiet.  Patch from Tim Kuijsten via tech@.
    
    Upstream-ID: d9b3a68b2a7c2f2fc7f74678e29a4618d55ceced

commit 09e6a7d8354224933febc08ddcbc2010f542284e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 24 09:06:18 2016 +1100

    Wrap stdint.h include in ifdef.

commit 08d9e9516e587b25127545c029e5464b2e7f2919
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 21 09:46:46 2016 +1100

    Fix formatting.

commit 461f50e7ab8751d3a55e9158c44c13031db7ba1d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 21 06:55:58 2016 +1100

    Update links to https.
    
    www.openssh.com now supports https and ftp.openbsd.org no longer
    supports ftp.  Make all links to these https.

commit dd4e7212a6141f37742de97795e79db51e4427ad
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 21 06:48:46 2016 +1100

    Update host key generation examples.
    
    Remove ssh1 host key generation, add ssh-keygen -A

commit 6d49ae82634c67e9a4d4af882bee20b40bb8c639
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 21 05:22:55 2016 +1100

    Update links.
    
    Make links to openssh.com HTTPS now that it's supported, point release
    notes link to the HTML release notes page, and update a couple of other
    links and bits of text.

commit fe0d1ca6ace06376625084b004ee533f2c2ea9d6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 20 03:42:09 2016 +1100

    Remote channels .orig and .rej files.
    
    These files were incorrectly added during an OpenBSD sync.

commit 246aa842a4ad368d8ce030495e657ef3a0e1f95c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Oct 18 17:32:54 2016 +0000

    upstream commit
    
    Remove channel_input_port_forward_request(); the only caller
    was the recently-removed SSH1 server code so it's now dead code.  ok markus@
    
    Upstream-ID: 05453983230a1f439562535fec2818f63f297af9

commit 2c6697c443d2c9c908260eed73eb9143223e3ec9
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Tue Oct 18 12:41:22 2016 +0000

    upstream commit
    
    Install a signal handler for tty-generated signals and
    wait for the ssh child to suspend before suspending sftp.  This lets ssh
    restore the terminal mode as needed when it is suspended at the password
    prompt.  OK dtucker@
    
    Upstream-ID: a31c1f42aa3e2985dcc91e46e6a17bd22e372d69

commit fd2a8f1033fa2316fff719fd5176968277560158
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Oct 15 19:56:25 2016 +0000

    upstream commit
    
    various formatting fixes, specifically removing Dq;
    
    Upstream-ID: 81e85df2b8e474f5f93d66e61d9a4419ce87347c

commit 8f866d8a57b9a2dc5dd04504e27f593b551618e3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 19 03:26:09 2016 +1100

    Import readpassphrase.c rev 1.26.
    
    Author: miller@openbsd.org:
    Avoid generate SIGTTOU when restoring the terminal mode.  If we get
    SIGTTOU it means the process is not in the foreground process group
    which, in most cases, means that the shell has taken control of the tty.
    Requiring the user the fg the process in this case doesn't make sense
    and can result in both SIGTSTP and SIGTTOU being sent which can lead to
    the process being suspended again immediately after being brought into
    the foreground.

commit f901440cc844062c9bab0183d133f7ccc58ac3a5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 19 03:23:16 2016 +1100

    Import readpassphrase.c rev 1.25.
    
    Wrap <readpassphrase.h> so internal calls go direct and
    readpassphrase is weak.
    
    (DEF_WEAK is a no-op in portable.)

commit 032147b69527e5448a511049b2d43dbcae582624
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 15 05:51:12 2016 +1100

    Move DEF_WEAK into defines.h.
    
    As well pull in more recent changes from OpenBSD these will start to
    arrive so put it where the definition is shared.

commit e0259a82ddd950cfb109ddee86fcebbc09c6bd04
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 15 04:34:46 2016 +1100

    Remove do_pam_set_tty which is dead code.
    
    The callers of do_pam_set_tty were removed in 2008, so this is now dead
    code.  bz#2604, pointed out by jjelen at redhat.com.

commit ca04de83f210959ad2ed870a30ba1732c3ae00e3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 13 18:53:43 2016 +1100

    unbreak principals-command test
    
    Undo inconsistetly updated variable name.

commit 1723ec92eb485ce06b4cbf49712d21975d873909
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 11 21:49:54 2016 +0000

    upstream commit
    
    fix the KEX fuzzer - the previous method of obtaining the
    packet contents was broken. This now uses the new per-packet input hook, so
    it sees exact post-decrypt packets and doesn't have to pass packet integrity
    checks. ok markus@
    
    Upstream-Regress-ID: 402fb6ffabd97de590e8e57b25788949dce8d2fd

commit 09f997893f109799cddbfce6d7e67f787045cbb2
Author: natano@openbsd.org <natano@openbsd.org>
Date:   Thu Oct 6 09:31:38 2016 +0000

    upstream commit
    
    Move USER out of the way to unbreak the BUILDUSER
    mechanism. ok tb
    
    Upstream-Regress-ID: 74ab9687417dd071d62316eaadd20ddad1d5af3c

commit 3049a012c482a7016f674db168f23fd524edce27
Author: bluhm@openbsd.org <bluhm@openbsd.org>
Date:   Fri Sep 30 11:55:20 2016 +0000

    upstream commit
    
    In ssh tests set REGRESS_FAIL_EARLY with ?= so that the
    environment can change it. OK djm@
    
    Upstream-Regress-ID: 77bcb50e47b68c7209c7f0a5a020d73761e5143b

commit 39af7b444db28c1cb01b7ea468a4f574a44f375b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 11 21:47:45 2016 +0000

    upstream commit
    
    Add a per-packet input hook that is called with the
    decrypted packet contents. This will be used for fuzzing; ok markus@
    
    Upstream-ID: a3221cee6b1725dd4ae1dd2c13841b4784cb75dc

commit ec165c392ca54317dbe3064a8c200de6531e89ad
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Oct 10 19:28:48 2016 +0000

    upstream commit
    
    Unregister the KEXINIT handler after message has been
    received. Otherwise an unauthenticated peer can repeat the KEXINIT and cause
    allocation of up to 128MB -- until the connection is closed. Reported by
    shilei-c at 360.cn
    
    Upstream-ID: 43649ae12a27ef94290db16d1a98294588b75c05

commit 29d40319392e6e19deeca9d45468aa1119846e50
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 13 04:07:20 2016 +1100

    Import rev 1.24 from OpenBSD.
    
    revision 1.24
    date: 2013/11/24 23:51:29;  author: deraadt;  state: Exp;  lines: +4 -4;
    most obvious unsigned char casts for ctype
    ok jca krw ingo

commit 12069e56221de207ed666c2449dedb431a2a7ca2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 13 04:04:44 2016 +1100

    Import rev 1.23 from OpenBSD.  Fixes bz#2619.
    
    revision 1.23
    date: 2010/05/14 13:30:34;  author: millert;  state: Exp;  lines: +41 -39;
    Defer installing signal handlers until echo is disabled so that we
    get suspended normally when not the foreground process.  Fix potential
    infinite loop when restoring terminal settings if process is in the
    background when restore occurs.  OK miod@

commit 7508d83eff89af069760b4cc587305588a64e415
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 13 03:53:51 2016 +1100

    If we don't have TCSASOFT, define it to zero.
    
    This makes it a no-op when we use it below, which allows us to re-sync
    those lines with the upstream and make future updates easier.

commit aae4dbd4c058d3b1fe1eb5c4e6ddf35827271377
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Oct 7 14:41:52 2016 +0000

    upstream commit
    
    tidy up the formatting in this file. more specifically,
    replace .Dq, which looks appalling, with .Cm, where appropriate;
    
    Upstream-ID: ff8e90aa0343d9bb56f40a535e148607973cc738

commit a571dbcc7b7b25371174569b13df5159bc4c6c7a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 4 21:34:40 2016 +0000

    upstream commit
    
    add a comment about implicitly-expected checks to
    sshkey_ec_validate_public()
    
    Upstream-ID: 74a7f71c28f7c13a50f89fc78e7863b9cd61713f

commit 2f78a2a698f4222f8e05cad57ac6e0c3d1faff00
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 30 20:24:46 2016 +0000

    upstream commit
    
    fix some -Wpointer-sign warnings in the new mux proxy; ok
    markus@
    
    Upstream-ID: b1ba7b3769fbc6b7f526792a215b0197f5e55dfd

commit ca71c36645fc26fcd739a8cfdc702cec85607761
Author: bluhm@openbsd.org <bluhm@openbsd.org>
Date:   Wed Sep 28 20:09:52 2016 +0000

    upstream commit
    
    Add a makefile rule to create the ssh library when
    regress needs it.  This allows to run the ssh regression tests without doing
    a "make build" before. Discussed with dtucker@ and djm@; OK djm@
    
    Upstream-Regress-ID: ce489bd53afcd471225a125b4b94565d4717c025

commit ce44c970f913d2a047903dba8670554ac42fc479
Author: bluhm@openbsd.org <bluhm@openbsd.org>
Date:   Mon Sep 26 21:34:38 2016 +0000

    upstream commit
    
    Allow to run ssh regression tests as root.  If the user
    is already root, the test should not expect that SUDO is set.  If ssh needs
    another user, use sudo or doas to switch from root if necessary. OK dtucker@
    
    Upstream-Regress-ID: b464e55185ac4303529e3e6927db41683aaeace2

commit 8d0578478586e283e751ca51e7b0690631da139a
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Sep 30 09:19:13 2016 +0000

    upstream commit
    
    ssh proxy mux mode (-O proxy; idea from Simon Tatham): - mux
    client speaks the ssh-packet protocol directly over unix-domain socket. - mux
    server acts as a proxy, translates channel IDs and relays to the server. - no
    filedescriptor passing necessary. - combined with unix-domain forwarding it's
    even possible to run mux client   and server on different machines. feedback
    & ok djm@
    
    Upstream-ID: 666a2fb79f58e5c50e246265fb2b9251e505c25b

commit b7689155f3f5c4999846c07a852b1c7a43b09cec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 28 21:44:52 2016 +0000

    upstream commit
    
    put back some pre-auth zlib bits that I shouldn't have
    removed - they are still used by the client. Spotted by naddy@
    
    Upstream-ID: 80919468056031037d56a1f5b261c164a6f90dc2

commit 4577adead6a7d600c8e764619d99477a08192c8f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 28 20:32:42 2016 +0000

    upstream commit
    
    restore pre-auth compression support in the client -- the
    previous commit was intended to remove it from the server only.
    
    remove a few server-side pre-auth compression bits that escaped
    
    adjust wording of Compression directive in sshd_config(5)
    
    pointed out by naddy@ ok markus@
    
    Upstream-ID: d23696ed72a228dacd4839dd9f2dec424ba2016b

commit 80d1c963b4dc84ffd11d09617b39c4bffda08956
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Sep 28 17:59:22 2016 +0000

    upstream commit
    
    use a separate TOKENS section, as we've done for
    sshd_config(5); help/ok djm
    
    Upstream-ID: 640e32b5e4838e4363738cdec955084b3579481d

commit 1cfd5c06efb121e58e8b6671548fda77ef4b4455
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 29 03:19:23 2016 +1000

    Remove portability support for mmap
    
    We no longer need to wrap/replace mmap for portability now that
    pre-auth compression has been removed from OpenSSH.

commit 0082fba4efdd492f765ed4c53f0d0fbd3bdbdf7f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 28 16:33:06 2016 +0000

    upstream commit
    
    Remove support for pre-authentication compression. Doing
    compression early in the protocol probably seemed reasonable in the 1990s,
    but today it's clearly a bad idea in terms of both cryptography (cf. multiple
    compression oracle attacks in TLS) and attack surface.
    
    Moreover, to support it across privilege-separation zlib needed
    the assistance of a complex shared-memory manager that made the
    required attack surface considerably larger.
    
    Prompted by Guido Vranken pointing out a compiler-elided security
    check in the shared memory manager found by Stack
    (http://css.csail.mit.edu/stack/); ok deraadt@ markus@
    
    NB. pre-auth authentication has been disabled by default in sshd
    for >10 years.
    
    Upstream-ID: 32af9771788d45a0779693b41d06ec199d849caf

commit 27c3a9c2aede2184856b5de1e6eca414bb751c38
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 26 21:16:11 2016 +0000

    upstream commit
    
    Avoid a theoretical signed integer overflow should
    BN_num_bytes() ever violate its manpage and return a negative value. Improve
    order of tests to avoid confusing increasingly pedantic compilers.
    
    Reported by Guido Vranken from stack (css.csail.mit.edu/stack)
    unstable optimisation analyser output.  ok deraadt@
    
    Upstream-ID: f8508c830c86d8f36c113985e52bf8eedae23505

commit 8663e51c80c6aa3d750c6d3bcff6ee05091922be
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 28 07:40:33 2016 +1000

    fix mdoc2man.awk formatting for top-level lists
    
    Reported by Glenn Golden
    Diagnosis and fix from Ingo Schwarze

commit b97739dc21570209ed9d4e7beee0c669ed23b097
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 22 21:15:41 2016 +0000

    upstream commit
    
    missing bit from previous commit
    
    Upstream-ID: 438d5ed6338b28b46e822eb13eee448aca31df37

commit de6a175a99d22444e10d19ad3fffef39bc3ee3bb
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Sep 22 19:19:01 2016 +0000

    upstream commit
    
    organise the token stuff into a separate section; ok
    markus for an earlier version of the diff ok/tweaks djm
    
    Upstream-ID: 81a6daa506a4a5af985fce7cf9e59699156527c8

commit 16277fc45ffc95e4ffc3d45971ff8320b974de2b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 22 17:55:13 2016 +0000

    upstream commit
    
    mention curve25519-sha256 KEX
    
    Upstream-ID: 33ae1f433ce4795ffa6203761fbdf86e0d7ffbaf

commit 0493766d5676c7ca358824ea8d3c90f6047953df
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 22 17:52:53 2016 +0000

    upstream commit
    
    support plain curve25519-sha256 KEX algorithm now that it
    is approaching standardisation (same algorithm is currently supported as
    curve25519-sha256@libssh.org)
    
    Upstream-ID: 5e2b6db2e72667048cf426da43c0ee3fc777baa2

commit f31c654b30a6f02ce0b8ea8ab81791b675489628
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Sep 22 02:29:57 2016 +0000

    upstream commit
    
    If ssh receives a PACKET_DISCONNECT during userauth it
    will cause ssh_dispatch_run(DISPATCH_BLOCK, ...) to return without the
    session being authenticated.  Check for this and exit if necessary.  ok djm@
    
    Upstream-ID: b3afe126c0839d2eae6cddd41ff2ba317eda0903

commit 1622649b7a829fc8dc313042a43a974f0f3e8a99
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 21 19:53:12 2016 +0000

    upstream commit
    
    correctly return errors from kex_send_ext_info(). Fix from
    Sami Farin via https://github.com/openssh/openssh-portable/pull/50
    
    Upstream-ID: c85999af28aaecbf92cfa2283381df81e839b42c

commit f83a0cfe16c7a73627b46a9a94e40087d60f32fb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 21 17:44:20 2016 +0000

    upstream commit
    
    cast uint64_t for printf
    
    Upstream-ID: 76d23e89419ccbd2320f92792a6d878211666ac1

commit 5f63ab474f58834feca4f35c498be03b7dd38a16
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 21 17:03:54 2016 +0000

    upstream commit
    
    disable tests for affirmative negated match after backout of
    match change
    
    Upstream-Regress-ID: acebb8e5042f03d66d86a50405c46c4de0badcfd

commit a5ad3a9db5a48f350f257a67b62fafd719ecb7e0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 21 16:55:42 2016 +0000

    upstream commit
    
    Revert two recent changes to negated address matching. The
    new behaviour offers unintuitive surprises. We'll find a better way to deal
    with single negated matches.
    
    match.c 1.31:
    > fix matching for pattern lists that contain a single negated match,
    > e.g. "Host !example"
    >
    > report and patch from Robin Becker. bz#1918 ok dtucker@
    
    addrmatch.c 1.11:
    > fix negated address matching where the address list consists of a
    > single negated match, e.g. "Match addr !192.20.0.1"
    >
    > Report and patch from Jakub Jelen. bz#2397 ok dtucker@
    
    Upstream-ID: ec96c770f0f5b9a54e5e72fda25387545e9c80c6

commit 119b7a2ca0ef2bf3f81897ae10301b8ca8cba844
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 21 01:35:12 2016 +0000

    upstream commit
    
    test all the AuthorizedPrincipalsCommand % expansions
    
    Upstream-Regress-ID: 0a79a84dfaa59f958e46b474c3db780b454d30e3

commit bfa9d969ab6235d4938ce069d4db7e5825c56a19
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 21 01:34:45 2016 +0000

    upstream commit
    
    add a way for principals command to get see key ID and serial
    too
    
    Upstream-ID: 0d30978bdcf7e8eaeee4eea1b030eb2eb1823fcb

commit 920585b826af1c639e4ed78b2eba01fd2337b127
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 16 06:09:31 2016 +0000

    upstream commit
    
    add a note on kexfuzz' limitations
    
    Upstream-Regress-ID: 03804d4a0dbc5163e1a285a4c8cc0a76a4e864ec

commit 0445ff184080b196e12321998b4ce80b0f33f8d1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 16 01:01:41 2016 +0000

    upstream commit
    
    fix for newer modp DH groups
    (diffie-hellman-group14-sha256 etc)
    
    Upstream-Regress-ID: fe942c669959462b507516ae1634fde0725f1c68

commit 28652bca29046f62c7045e933e6b931de1d16737
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Sep 19 19:02:19 2016 +0000

    upstream commit
    
    move inbound NEWKEYS handling to kex layer; otherwise
    early NEWKEYS causes NULL deref; found by Robert Swiecki/honggfuzz; fixed
    with & ok djm@
    
    Upstream-ID: 9a68b882892e9f51dc7bfa9f5a423858af358b2f

commit 492710894acfcc2f173d14d1d45bd2e688df605d
Author: natano@openbsd.org <natano@openbsd.org>
Date:   Mon Sep 19 07:52:42 2016 +0000

    upstream commit
    
    Replace two more arc4random() loops with
    arc4random_buf().
    
    tweaks and ok dtucker
    ok deraadt
    
    Upstream-ID: 738d3229130ccc7eac975c190276ca6fcf0208e4

commit 1036356324fecc13099ac6e986b549f6219327d7
Author: tedu@openbsd.org <tedu@openbsd.org>
Date:   Sat Sep 17 18:00:27 2016 +0000

    upstream commit
    
    replace two arc4random loops with arc4random_buf ok
    deraadt natano
    
    Upstream-ID: e18ede972d1737df54b49f011fa4f3917a403f48

commit 00df97ff68a49a756d4b977cd02283690f5dfa34
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 14 20:11:26 2016 +0000

    upstream commit
    
    take fingerprint of correct key for
    AuthorizedPrincipalsCommand
    
    Upstream-ID: 553581a549cd6a3e73ce9f57559a325cc2cb1f38

commit e7907c1cb938b96dd33d27c2fea72c4e08c6b2f6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 14 05:42:25 2016 +0000

    upstream commit
    
    add %-escapes to AuthorizedPrincipalsCommand to match those
    supported for AuthorizedKeysCommand (key, key type, fingerprint, etc) and a
    few more to provide access to the certificate's CA key; 'looks ok' dtucker@
    
    Upstream-ID: 6b00fd446dbebe67f4e4e146d2e492d650ae04eb

commit 2b939c272a81c4d0c47badeedbcb2ba7c128ccda
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Sep 14 00:45:31 2016 +0000

    upstream commit
    
    Improve test coverage of ssh-keygen -T a bit.
    
    Upstream-Regress-ID: 8851668c721bcc2b400600cfc5a87644cc024e72

commit 44d82fc83be6c5ccd70881c2dac1a73e5050398b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Sep 12 02:25:46 2016 +0000

    upstream commit
    
    Add testcase for ssh-keygen -j, -J and -K options for
    moduli screening. Does not currently test generation as that is extremely
    slow.
    
    Upstream-Regress-ID: 9de6ce801377ed3ce0a63a1413f1cd5fd3c2d062

commit 44e5f756d286bc3a1a5272ea484ee276ba3ac5c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 23 08:17:04 2016 +0000

    upstream commit
    
    add tests for addr_match_list()
    
    Upstream-Regress-ID: fae2d1fef84687ece584738a924c7bf969616c8e

commit 445e218878035b59c704c18406e8aeaff4c8aa25
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 12 23:39:34 2016 +0000

    upstream commit
    
    handle certs in rsa_hash_alg_from_ident(), saving an
    unnecessary special case elsewhere.
    
    Upstream-ID: 901cb081c59d6d2698b57901c427f3f6dc7397d4

commit 130f5df4fa37cace8c079dccb690e5cafbf00751
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 12 23:31:27 2016 +0000

    upstream commit
    
    list all supported signature algorithms in the
    server-sig-algs Reported by mb AT smartftp.com in bz#2547 and (independantly)
    Ron Frederick; ok markus@
    
    Upstream-ID: ddf702d721f54646b11ef2cee6d916666cb685cd

commit 8f750ccfc07acb8aa98be5a5dd935033a6468cfd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 12 14:43:58 2016 +1000

    Remove no-op brackets to resync with upstream.

commit 7050896e7395866278c19c2ff080c26152619d1d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 12 13:57:28 2016 +1000

    Resync ssh-keygen -W error message with upstream.

commit 43cceff82cc20413cce58ba3375e19684e62cec4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 12 13:55:37 2016 +1000

    Move ssh-keygen -W handling code to match upstream

commit af48d541360b1d7737b35740a4b1ca34e1652cd9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 12 13:52:17 2016 +1000

    Move ssh-keygen -T handling code to match upstream.

commit d8c3cfbb018825c6c86547165ddaf11924901c49
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 12 13:30:50 2016 +1000

    Move -M handling code to match upstream.

commit 7b63cf6dbbfa841c003de57d1061acbf2ff22364
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Sep 12 03:29:16 2016 +0000

    upstream commit
    
    Spaces->tabs.
    
    Upstream-ID: f4829dfc3f36318273f6082b379ac562eead70b7

commit 11e5e644536821ceb3bb4dd8487fbf0588522887
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Sep 12 03:25:20 2016 +0000

    upstream commit
    
    Style whitespace fix.  Also happens to remove a no-op
    diff with portable.
    
    Upstream-ID: 45d90f9a62ad56340913a433a9453eb30ceb8bf3

commit 9136ec134c97a8aff2917760c03134f52945ff3c
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Mon Sep 12 01:22:38 2016 +0000

    upstream commit
    
    Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then
    use those definitions rather than pulling <sys/param.h> and unknown namespace
    pollution. ok djm markus dtucker
    
    Upstream-ID: 712cafa816c9f012a61628b66b9fbd5687223fb8

commit f219fc8f03caca7ac82a38ed74bbd6432a1195e7
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Sep 7 18:39:24 2016 +0000

    upstream commit
    
    sort; from matthew martin
    
    Upstream-ID: 73cec7f7ecc82d37a4adffad7745e4684de67ce7

commit 06ce56b05def9460aecc7cdb40e861a346214793
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Sep 6 09:22:56 2016 +0000

    upstream commit
    
    ssh_set_newkeys: print correct block counters on
    rekeying; ok djm@
    
    Upstream-ID: 32bb7a9cb9919ff5bab28d50ecef3a2b2045dd1e

commit e5e8d9114ac6837a038f4952994ca95a97fafe8d
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Sep 6 09:14:05 2016 +0000

    upstream commit
    
    update ext_info_c every time we receive a kexinit msg;
    fixes sending of ext_info if privsep is disabled; report Aris Adamantiadis &
    Mancha; ok djm@
    
    Upstream-ID: 2ceaa1076e19dbd3542254b4fb8e42d608f28856

commit da95318dbedbaa1335323dba370975c2f251afd8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 5 14:02:42 2016 +0000

    upstream commit
    
    remove 3des-cbc from the client's default proposal;
    64-bit block ciphers are not safe in 2016 and we don't want to wait until
    attacks like sweet32 are extended to SSH.
    
    As 3des-cbc was the only mandatory cipher in the SSH RFCs, this may
    cause problems connecting to older devices using the defaults, but
    it's highly likely that such devices already need explicit
    configuration for KEX and hostkeys anyway.
    
    ok deraadt, markus, dtucker
    
    Upstream-ID: a505dfe65c6733af0f751b64cbc4bb7e0761bc2f

commit b33ad6d997d36edfea65e243cd12ccd01f413549
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 5 13:57:31 2016 +0000

    upstream commit
    
    enforce expected request flow for GSSAPI calls; thanks to
    Jakub Jelen for testing; ok markus@
    
    Upstream-ID: d4bc0e70e1be403735d3d9d7e176309b1fd626b9

commit 0bb2980260fb24e5e0b51adac471395781b66261
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 12 11:07:00 2016 +1000

    Restore ssh-keygen's -J and -j option handling.
    
    These were incorrectly removed in the 1d9a2e28 sync commit.

commit 775f8a23f2353f5869003c57a213d14b28e0736e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 31 10:48:07 2016 +1000

    tighten PAM monitor calls
    
    only allow kbd-interactive ones when that authentication method is
    enabled. Prompted by Solar Designer

commit 7fd0ea8a1db4bcfb3d8cd9df149e5d571ebea1f4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 30 07:50:21 2016 +0000

    upstream commit
    
    restrict monitor auth calls to be allowed only when their
    respective authentication methods are enabled in the configuration.
    
    prompted by Solar Designer; ok markus dtucker
    
    Upstream-ID: 6eb3f89332b3546d41d6dbf5a8e6ff920142b553

commit b38b95f5bcc52278feb839afda2987933f68ff96
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 29 11:47:07 2016 +1000

    Tighten monitor state-machine flow for PAM calls
    
    (attack surface reduction)

commit dc664d1bd0fc91b24406a3e9575b81c285b8342b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Aug 28 22:28:12 2016 +0000

    upstream commit
    
    fix uninitialised optlen in getsockopt() call; harmless
    on Unix/BSD but potentially crashy on Cygwin. Reported by James Slepicka ok
    deraadt@
    
    Upstream-ID: 1987ccee508ba5b18f016c85100d7ac3f70ff965

commit 5bcc1e2769f7d6927d41daf0719a9446ceab8dd7
Author: guenther@openbsd.org <guenther@openbsd.org>
Date:   Sat Aug 27 04:05:12 2016 +0000

    upstream commit
    
    Pull in <sys/time.h> for struct timeval
    
    ok deraadt@
    
    Upstream-ID: ae34525485a173bccd61ac8eefeb91c57e3b7df6

commit fa4a4c96b19127dc2fd4e92f20d99c0c7f34b538
Author: guenther@openbsd.org <guenther@openbsd.org>
Date:   Sat Aug 27 04:04:56 2016 +0000

    upstream commit
    
    Pull in <stdlib.h> for NULL
    
    ok deraadt@
    
    Upstream-ID: 7baa6a0f1e049bb3682522b4b95a26c866bfc043

commit ae363d74ccc1451185c0c8bd4631e28c67c7fd36
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 25 23:57:54 2016 +0000

    upstream commit
    
    add a sIgnore opcode that silently ignores options and
    use it to suppress noisy deprecation warnings for the Protocol directive.
    
    req henning, ok markus
    
    Upstream-ID: 9fe040aca3d6ff393f6f7e60045cdd821dc4cbe0

commit a94c60306643ae904add6e8ed219e4be3494255c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Aug 25 23:56:51 2016 +0000

    upstream commit
    
    remove superfluous NOTREACHED comment
    
    Upstream-ID: a7485c1f1be618e8c9e38fd9be46c13b2d03b90c

commit fc041c47144ce28cf71353124a8a5d183cd6a251
Author: otto@openbsd.org <otto@openbsd.org>
Date:   Tue Aug 23 16:21:45 2016 +0000

    upstream commit
    
    fix previous, a condition was modified incorrectly; ok
    markus@ deraadt@
    
    Upstream-ID: c443e339768e7ed396dff3bb55f693e7d3641453

commit 23555eb13a9b0550371a16dcf8beaab7a5806a64
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 23 08:17:42 2016 +0000

    upstream commit
    
    downgrade an error() to a debug2() to match similar cases
    in addr_match_list()
    
    Upstream-ID: 07c3d53e357214153d9d08f234411e0d1a3d6f5c

commit a39627134f6d90e7009eeb14e9582ecbc7a99192
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 23 06:36:23 2016 +0000

    upstream commit
    
    remove Protocol directive from client/server configs that
    causes spammy deprecation warnings
    
    hardcode SSH_PROTOCOLS=2, since that's all we support on the server
    now (the client still may support both, so it could get confused)
    
    Upstream-Regress-ID: c16662c631af51633f9fd06aca552a70535de181

commit 6ee4f1c01ee31e65245881d49d4bccf014956066
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 23 16:33:48 2016 +1000

    hook match and utf8 unittests up to Makefile

commit 114efe2bc0dd2842d997940a833f115e6fc04854
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 19 06:44:13 2016 +0000

    upstream commit
    
    add tests for matching functions
    
    Upstream-Regress-ID: 0869d4f5c5d627c583c6a929d69c17d5dd65882c

commit 857568d2ac81c14bcfd625b27536c1e28c992b3c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 23 14:32:37 2016 +1000

    removing UseLogin bits from configure.ac

commit cc182d01cef8ca35a1d25ea9bf4e2ff72e588208
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 23 03:24:10 2016 +0000

    upstream commit
    
    fix negated address matching where the address list
    consists of a single negated match, e.g. "Match addr !192.20.0.1"
    
    Report and patch from Jakub Jelen. bz#2397 ok dtucker@
    
    Upstream-ID: 01dcac3f3e6ca47518cf293e31c73597a4bb40d8

commit 4067ec8a4c64ccf16250c35ff577b4422767da64
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 23 03:22:49 2016 +0000

    upstream commit
    
    fix matching for pattern lists that contain a single
    negated match, e.g. "Host !example"
    
    report and patch from Robin Becker. bz#1918 ok dtucker@
    
    Upstream-ID: 05a0cb323ea4bc20e98db099b42c067bfb9ea1ea

commit 83b581862a1dbb06fc859959f829dde2654aef3c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 19 03:18:06 2016 +0000

    upstream commit
    
    remove UseLogin option and support for having /bin/login
    manage login sessions; ok deraadt markus dtucker
    
    Upstream-ID: bea7213fbf158efab7e602d9d844fba4837d2712

commit ffe6549c2f7a999cc5264b873a60322e91862581
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Mon Aug 15 12:32:04 2016 +0000

    upstream commit
    
    Catch up with the SSH1 code removal and delete all
    mention of protocol 1 particularities, key files and formats, command line
    options, and configuration keywords from the server documentation and
    examples.  ok jmc@
    
    Upstream-ID: 850328854675b4b6a0d4a90f0b4a9dd9ca4e905f

commit c38ea634893a1975dbbec798fb968c9488013f4a
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Mon Aug 15 12:27:56 2016 +0000

    upstream commit
    
    Remove more SSH1 server code: * Drop sshd's -k option. *
    Retire configuration keywords that only apply to protocol 1, as well as   the
    "protocol" keyword. * Remove some related vestiges of protocol 1 support.
    
    ok markus@
    
    Upstream-ID: 9402f82886de917779db12f8ee3f03d4decc244d

commit 33ba55d9e358c07f069e579bfab80eccaaad52cb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 17 16:26:04 2016 +1000

    Only check for prctl once.

commit 976ba8a8fd66a969bf658280c1e5adf694cc2fc6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 17 15:33:10 2016 +1000

    Fix typo.

commit 9abf84c25ff4448891edcde60533a6e7b2870de1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 17 14:25:43 2016 +1000

    Correct LDFLAGS for clang example.
    
    --with-ldflags isn't used until after the -ftrapv test, so mention
    LDFLAGS instead for now.

commit 1e8013a17ff11e3c6bd0012fb1fc8d5f1330eb21
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 17 14:08:42 2016 +1000

    Remove obsolete CVS $Id from source files.
    
    Since -portable switched to git the CVS $Id tags are no longer being
    updated and are becoming increasingly misleading.  Remove them.

commit adab758242121181700e48b4f6c60d6b660411fe
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 17 13:40:58 2016 +1000

    Remove now-obsolete CVS $Id tags from text files.
    
    Since -portable switched to git, the CVS $Id tags are no longer being
    updated and are becoming increasingly misleading.  Remove them.

commit 560c0068541315002ec4c1c00a560bbd30f2d671
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 17 13:38:30 2016 +1000

    Add a section for compiler specifics.
    
    Add a section for compiler specifics and document the runtime requirements
    for clang's integer sanitization.

commit a8fc0f42e1eda2fa3393d1ea5e61322d5e07a9cd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 17 13:35:43 2016 +1000

    Test multiplying two long long ints.
    
    When using clang with -ftrapv or -sanitize=integer the tests would pass
    but linking would fail with "undefined reference to __mulodi4".
    Explicitly test for this before enabling -trapv.

commit a1cc637e7e11778eb727559634a6ef1c19c619f6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 16 14:47:34 2016 +1000

    add a --with-login-program configure argument
    
    Saves messing around with LOGIN_PROGRAM env var, which come
    packaging environments make hard to do during configure phase.

commit 8bd81e1596ab1bab355146cb65e82fb96ade3b23
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 16 13:30:56 2016 +1000

    add --with-pam-service to specify PAM service name
    
    Saves messing around with CFLAGS to do it.

commit 74433a19bb6f4cef607680fa4d1d7d81ca3826aa
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 16 13:28:23 2016 +1000

    fix false positives when compiled with msan
    
    Our explicit_bzero successfully confused clang -fsanitize-memory
    in to thinking that memset is never called to initialise memory.
    Ensure that it is called in a way that the compiler recognises.

commit 6cb6dcffe1a2204ba9006de20f73255c268fcb6b
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Sat Aug 13 17:47:40 2016 +0000

    upstream commit
    
    remove ssh1 server code; ok djm@
    
    Upstream-ID: c24c0c32c49b91740d5a94ae914fb1898ea5f534

commit 42d47adc5ad1187f22c726cbc52e71d6b1767ca2
Author: jca@openbsd.org <jca@openbsd.org>
Date:   Fri Aug 12 19:19:04 2016 +0000

    upstream commit
    
    Use 2001:db8::/32, the official IPv6 subnet for
    configuration examples.
    
    This makes the IPv6 example consistent with IPv4, and removes a dubious
    mention of a 6bone subnet.
    
    ok sthen@ millert@
    
    Upstream-ID: b027f3d0e0073419a132fd1bf002e8089b233634

commit b61f53c0c3b43c28e013d3b3696d64d1c0204821
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Aug 11 01:42:11 2016 +0000

    upstream commit
    
    Update moduli file.
    
    Upstream-ID: 6da9a37f74aef9f9cc639004345ad893cad582d8

commit f217d9bd42d306f69f56335231036b44502d8191
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 11 11:42:48 2016 +1000

    Import updated moduli.

commit 67dca60fbb4923b7a11c1645b90a5ca57c03d8be
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Aug 8 22:40:57 2016 +0000

    upstream commit
    
    Improve error message for overlong ControlPath.  ok markus@
    djm@
    
    Upstream-ID: aed374e2e88dd3eb41390003e5303d0089861eb5

commit 4706c1d8c15cd5565b59512853c2da9bd4ca26c9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 3 05:41:57 2016 +0000

    upstream commit
    
    small refactor of cipher.c: make ciphercontext opaque to
    callers feedback and ok markus@
    
    Upstream-ID: 094849f8be68c3bdad2c0f3dee551ecf7be87f6f

commit e600348a7afd6325cc5cd783cb424065cbc20434
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Aug 3 04:23:55 2016 +0000

    upstream commit
    
    Fix bug introduced in rev 1.467 which causes
    "buffer_get_bignum_ret: incomplete message" errors when built with WITH_SSH1
    and run such that no Protocol 1 ephemeral host key is generated (eg "Protocol
    2", no SSH1 host key supplied).  Reported by rainer.laatsch at t-online.de,
    ok deraadt@
    
    Upstream-ID: aa6b132da5c325523aed7989cc5a320497c919dc

commit d7e7348e72f9b203189e3fffb75605afecba4fda
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 27 23:18:12 2016 +0000

    upstream commit
    
    better bounds check on iovcnt (we only ever use fixed,
    positive values)
    
    Upstream-ID: 9baa6eb5cd6e30c9dc7398e5fe853721a3a5bdee

commit 5faa52d295f764562ed6dd75c4a4ce9134ae71e3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 2 15:22:40 2016 +1000

    Use tabs consistently inside "case $host".

commit 20e5e8ba9c5d868d897896190542213a60fffbd2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 2 12:16:34 2016 +1000

    Explicitly test for broken strnvis.
    
    NetBSD added an strnvis and unfortunately made it incompatible with the
    existing one in OpenBSD and Linux's libbsd (the former having existed
    for over ten years). Despite this incompatibility being reported during
    development (see http://gnats.netbsd.org/44977) they still shipped it.
    Even more unfortunately FreeBSD and later MacOS picked up this incompatible
    implementation.  Try to detect this mess, and assume the only safe option
    if we're cross compiling.
    
    OpenBSD 2.9 (2001): strnvis(char *dst, const char *src, size_t dlen, int flag);
    NetBSD 6.0 (2012):  strnvis(char *dst, size_t dlen, const char *src, int flag);
    
    ok djm@

commit b0b48beab1b74100b61ecbadb9140c9ab4c2ea8c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 2 11:06:23 2016 +1000

    update recommended autoconf version

commit 23902e31dfd18c6d7bb41ccd73de3b5358a377da
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 2 10:48:04 2016 +1000

    update config.guess and config.sub to current
    
    upstream commit 562f3512b3911ba0c77a7f68214881d1f241f46e

commit dd1031b78b83083615b68d7163c44f4408635be2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 2 10:01:52 2016 +1000

    Replace spaces with tabs.
    
    Mechanically replace spaces with tabs in compat files not synced with
    OpenBSD.

commit c20dccb5614c5714f4155dda01bcdebf97cfae7e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 2 09:44:25 2016 +1000

    Strip trailing whitespace.
    
    Mechanically strip trailing whitespace on files not synced with OpenBSD
    (or in the case of bsd-snprint.c, rsync).

commit 30f9bd1c0963c23bfba8468dfd26aa17609ba42f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 2 09:06:27 2016 +1000

    Repair $OpenBSD markers.

commit 9715d4ad4b53877ec23dc8681dd7a405de9419a6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 2 09:02:42 2016 +1000

    Repair $OpenBSD marker.

commit cf3e0be7f5828a5e5f6c296a607d20be2f07d60c
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Aug 1 14:31:52 2016 -0700

    modified:   configure.ac opensshd.init.in
    Skip generating missing RSA1 key on startup unless ssh1 support is enabled.
    Spotted by Jean-Pierre Radley

commit 99522ba7ec6963a05c04a156bf20e3ba3605987c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 28 08:54:27 2016 +1000

    define _OPENBSD_SOURCE for reallocarray on NetBSD
    
    Report by and debugged with Hisashi T Fujinaka, dtucker nailed
    the problem (lack of prototype causing return type confusion).

commit 3e1e076550c27c6bbdddf36d8f42bd79fbaaa187
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 27 08:25:42 2016 +1000

    KNF

commit d99ee9c4e5e217e7d05eeec84e9ce641f4675331
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 27 08:25:23 2016 +1000

    Linux auditing also needs packet.h

commit 393bd381a45884b589baa9aed4394f1d250255ca
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 27 08:18:05 2016 +1000

    fix auditing on Linux
    
    get_remote_ipaddr() was replaced with ssh_remote_ipaddr()

commit 80e766fb089de4f3c92b1600eb99e9495e37c992
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 24 21:50:13 2016 +1000

    crank version numbers

commit b1a478792d458f2e938a302e64bab2b520edc1b3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jul 24 11:45:36 2016 +0000

    upstream commit
    
    openssh-7.3
    
    Upstream-ID: af106a7eb665f642648cf1993e162c899f358718

commit 353766e0881f069aeca30275ab706cd60a1a8fdd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 23 16:14:42 2016 +1000

    Move Cygwin IPPORT_RESERVED overrride to defines.h
    
    Patch from vinschen at redhat.com.

commit 368dd977ae07afb93f4ecea23615128c95ab2b32
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jul 23 02:54:08 2016 +0000

    upstream commit
    
    fix pledge violation with ssh -f; reported by Valentin
    Kozamernik ok dtucker@
    
    Upstream-ID: a61db7988db88d9dac3c4dd70e18876a8edf84aa

commit f00211e3c6d24d6ea2b64b4b1209f671f6c1d42e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 22 07:00:46 2016 +0000

    upstream commit
    
    improve wording; suggested by jmc@
    
    Upstream-ID: 55cb0a24c8e0618b3ceec80998dc82c85db2d2f8

commit 83cbca693c3b0719270e6a0f2efe3f9ee93a65b8
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 22 05:46:11 2016 +0000

    upstream commit
    
    Lower loglevel for "Authenticated with partial success"
    message similar to other similar level.  bz#2599, patch from cgallek at
    gmail.com, ok markus@
    
    Upstream-ID: 3faab814e947dc7b2e292edede23e94c608cb4dd

commit 10358abd087ab228b7ce2048efc4f3854a9ab9a6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 22 14:06:36 2016 +1000

    retry waitpid on EINTR failure
    
    patch from Jakub Jelen on bz#2581; ok dtucker@

commit da88a70a89c800e74ea8e5661ffa127a3cc79a92
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 22 03:47:36 2016 +0000

    upstream commit
    
    constify a few functions' arguments; patch from Jakub
    Jelen bz#2581
    
    Upstream-ID: f2043f51454ea37830ff6ad60c8b32b4220f448d

commit c36d91bd4ebf767f310f7cea88d61d1c15f53ddf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 22 03:39:13 2016 +0000

    upstream commit
    
    move debug("%p", key) to before key is free'd; probable
    undefined behaviour on strict compilers; reported by Jakub Jelen bz#2581
    
    Upstream-ID: 767f323e1f5819508a0e35e388ec241bac2f953a

commit 286f5a77c3bfec1e8892ca268087ac885ac871bf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 22 03:35:11 2016 +0000

    upstream commit
    
    reverse the order in which -J/JumpHost proxies are visited to
    be more intuitive and document
    
    reported by and manpage bits naddy@
    
    Upstream-ID: 3a68fd6a841fd6cf8cedf6552a9607ba99df179a

commit fcd135c9df440bcd2d5870405ad3311743d78d97
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jul 21 01:39:35 2016 +0000

    upstream commit
    
    Skip passwords longer than 1k in length so clients can't
    easily DoS sshd by sending very long passwords, causing it to spend CPU
    hashing them. feedback djm@, ok markus@.
    
    Brought to our attention by tomas.kuthan at oracle.com, shilei-c at
    360.cn and coredump at autistici.org
    
    Upstream-ID: d0af7d4a2190b63ba1d38eec502bc4be0be9e333

commit 324583e8fb3935690be58790425793df619c6d4d
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Wed Jul 20 10:45:27 2016 +0000

    upstream commit
    
    Do not clobber the global jump_host variables when
    parsing an inactive configuration.  ok djm@
    
    Upstream-ID: 5362210944d91417d5976346d41ac0b244350d31

commit 32d921c323b989d28405e78d0a8923d12913d737
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Jul 19 12:59:16 2016 +0000

    upstream commit
    
    tweak previous;
    
    Upstream-ID: f3c1a5b3f05dff366f60c028728a2b43f15ff534

commit d7eabc86fa049a12ba2c3fb198bd1d51b37f7025
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Jul 19 11:38:53 2016 +0000

    upstream commit
    
    Allow wildcard for PermitOpen hosts as well as ports.
    bz#2582, patch from openssh at mzpqnxow.com and jjelen at redhat.com.  ok
    markus@
    
    Upstream-ID: af0294e9b9394c4e16e991424ca0a47a7cc605f2

commit b98a2a8348e907b3d71caafd80f0be8fdd075943
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jul 18 11:35:33 2016 +0000

    upstream commit
    
    Reduce timing attack against obsolete CBC modes by always
    computing the MAC over a fixed size of data. Reported by Jean Paul
    Degabriele, Kenny Paterson, Torben Hansen and Martin Albrecht. ok djm@
    
    Upstream-ID: f20a13279b00ba0afbacbcc1f04e62e9d41c2912

commit dbf788b4d9d9490a5fff08a7b09888272bb10fcc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 21 14:17:31 2016 +1000

    Search users for one with a valid salt.
    
    If the root account is locked (eg password "!!" or "*LK*") keep looking
    until we find a user with a valid salt to use for crypting passwords of
    invalid users.  ok djm@

commit e8b58f48fbb1b524fb4f0d4865fa0005d6a4b782
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 18 17:22:49 2016 +1000

    Explicitly specify source files for regress tools.
    
    Since adding $(REGRESSLIBS), $? is wrong because it includes only the
    changed source files.  $< seems like it'd be right however it doesn't
    seem to work on some non-GNU makes, so do what works everywhere.

commit eac1bbd06872c273f16ac0f9976b0aef026b701b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 18 17:12:22 2016 +1000

    Conditionally include err.h.

commit 0a454147568746c503f669e1ba861f76a2e7a585
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 18 16:26:26 2016 +1000

    Remove local implementation of err, errx.
    
    We now have a shared implementation in libopenbsd-compat.

commit eb999a4590846ba4d56ddc90bd07c23abfbab7b1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 18 06:08:01 2016 +0000

    upstream commit
    
    Add some unsigned overflow checks for extra_pad. None of
    these are reachable with the amount of padding that we use internally.
    bz#2566, pointed out by Torben Hansen. ok markus@
    
    Upstream-ID: 4d4be8450ab2fc1b852d5884339f8e8c31c3fd76

commit c71ba790c304545464bb494de974cdf0f4b5cf1e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 18 15:43:25 2016 +1000

    Add dependency on libs for unit tests.
    
    Makes "./configure && make tests" work again.  ok djm@

commit 8199d0311aea3e6fd0284c9025e7a83f4ece79e8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 18 13:47:39 2016 +1000

    Correct location for kexfuzz in clean target.

commit 01558b7b07af43da774d3a11a5c51fa9c310849d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 18 09:33:25 2016 +1000

    Handle PAM_MAXTRIES from modules.
    
    bz#2249: handle the case where PAM returns PAM_MAXTRIES by ceasing to offer
    password and keyboard-interative authentication methods.  Should prevent
    "sshd ignoring max retries" warnings in the log.  ok djm@
    
    It probably won't trigger with keyboard-interactive in the default
    configuration because the retry counter is stored in module-private
    storage which goes away with the sshd PAM process (see bz#688).  On the
    other hand, those cases probably won't log a warning either.

commit 65c6c6b567ab5ab12945a5ad8e0ab3a8c26119cc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jul 17 04:20:16 2016 +0000

    upstream commit
    
    support UTF-8 characters in ssh(1) banners using
    schwarze@'s safe fmprintf printer; bz#2058
    
    feedback schwarze@ ok dtucker@
    
    Upstream-ID: a72ce4e3644c957643c9524eea2959e41b91eea7

commit e4eb7d910976fbfc7ce3e90c95c11b07b483d0d7
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Jul 16 06:57:55 2016 +0000

    upstream commit
    
    - add proxyjump to the options list - formatting fixes -
    update usage()
    
    ok djm
    
    Upstream-ID: 43d318e14ce677a2eec8f21ef5ba2f9f68a59457

commit af1f084857621f14bd9391aba8033d35886c2455
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jul 15 05:01:58 2016 +0000

    upstream commit
    
    Reduce the syslog level of some relatively common protocol
    events from LOG_CRIT by replacing fatal() calls with logdie().  Part of
    bz#2585, ok djm@
    
    Upstream-ID: 9005805227c94edf6ac02a160f0e199638d288e5

commit bd5f2b78b69cf38d6049a0de445a79c8595e4a1f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 15 19:14:48 2016 +1000

    missing openssl/dh.h

commit 4a984fd342effe5f0aad874a0d538c4322d973c0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 15 18:47:07 2016 +1000

    cast to avoid type warning in error message

commit 5abfb15ced985c340359ae7fb65a625ed3692b3e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 15 14:48:30 2016 +1000

    Move VA_COPY macro into compat header.
    
    Some AIX compilers unconditionally undefine va_copy but don't set it back
    to an internal function, causing link errors.  In some compat code we
    already use VA_COPY instead so move the two existing instances into the
    shared header and use for sshbuf-getput-basic.c too.  Should fix building
    with at lease some versions of AIX's compiler.  bz#2589, ok djm@

commit 832b7443b7a8e181c95898bc5d73497b7190decd
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 15 14:45:34 2016 +1000

    disable ciphers not supported by OpenSSL
    
    bz#2466 ok dtucker@

commit 5fbe93fc6fbb2fe211e035703dec759d095e3dd8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 15 13:54:31 2016 +1000

    add a --disable-pkcs11 knob

commit 679ce88ec2a8e2fe6515261c489e8c1449bb9da9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 15 13:44:38 2016 +1000

    fix newline escaping for unsupported_algorithms
    
    The hmac-ripemd160 was incorrect and could lead to broken
    Makefiles on systems that lacked support for it, but I made
    all the others consistent too.

commit ed877ef653847d056bb433975d731b7a1132a979
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 15 00:24:30 2016 +0000

    upstream commit
    
    Add a ProxyJump ssh_config(5) option and corresponding -J
    ssh(1) command-line flag to allow simplified indirection through a SSH
    bastion or "jump host".
    
    These options construct a proxy command that connects to the
    specified jump host(s) (more than one may be specified) and uses
    port-forwarding to establish a connection to the next destination.
    
    This codifies the safest way of indirecting connections through SSH
    servers and makes it easy to use.
    
    ok markus@
    
    Upstream-ID: fa899cb8b26d889da8f142eb9774c1ea36b04397

commit 5c02dd126206a26785379e80f2d3848e4470b711
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 15 12:56:39 2016 +1000

    Map umac_ctx struct name too.
    
    Prevents size mismatch linker warnings on Solaris 11.

commit 283b97ff33ea2c641161950849931bd578de6946
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 15 13:49:44 2016 +1000

    Mitigate timing of disallowed users PAM logins.
    
    When sshd decides to not allow a login (eg PermitRootLogin=no) and
    it's using PAM, it sends a fake password to PAM so that the timing for
    the failure is not noticeably different whether or not the password
    is correct.  This behaviour can be detected by sending a very long
    password string which is slower to hash than the fake password.
    
    Mitigate by constructing an invalid password that is the same length
    as the one from the client and thus takes the same time to hash.
    Diff from djm@

commit 9286875a73b2de7736b5e50692739d314cd8d9dc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 15 13:32:45 2016 +1000

    Determine appropriate salt for invalid users.
    
    When sshd is processing a non-PAM login for a non-existent user it uses
    the string from the fakepw structure as the salt for crypt(3)ing the
    password supplied by the client.  That string has a Blowfish prefix, so on
    systems that don't understand that crypt will fail fast due to an invalid
    salt, and even on those that do it may have significantly different timing
    from the hash methods used for real accounts (eg sha512).  This allows
    user enumeration by, eg, sending large password strings.  This was noted
    by EddieEzra.Harari at verint.com (CVE-2016-6210).
    
    To mitigate, use the same hash algorithm that root uses for hashing
    passwords for users that do not exist on the system.  ok djm@

commit a162dd5e58ca5b224d7500abe35e1ef32b5de071
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 14 21:19:59 2016 +1000

    OpenSSL 1.1.x not currently supported.

commit 7df91b01fc558a33941c5c5f31abbcdc53a729fb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 14 12:25:24 2016 +1000

    Check for VIS_ALL.
    
    If we don't have it, set BROKEN_STRNVIS to activate the compat replacement.

commit ee67716f61f1042d5e67f91c23707cca5dcdd7d0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jul 14 01:24:21 2016 +0000

    upstream commit
    
    Correct equal in test.
    
    Upstream-Regress-ID: 4e32f7a5c57a619c4e8766cb193be2a1327ec37a

commit 372807c2065c8572fdc6478b25cc5ac363743073
Author: tb@openbsd.org <tb@openbsd.org>
Date:   Mon Jul 11 21:38:13 2016 +0000

    upstream commit
    
    Add missing "recvfd" pledge promise: Raf Czlonka reported
    ssh coredumps when Control* keywords were set in ssh_config. This patch also
    fixes similar problems with scp and sftp.
    
    ok deraadt, looks good to millert
    
    Upstream-ID: ca2099eade1ef3e87a79614fefa26a0297ad8a3b

commit e0453f3df64bf485c61c7eb6bd12893eee9fe2cd
Author: tedu@openbsd.org <tedu@openbsd.org>
Date:   Mon Jul 11 03:19:44 2016 +0000

    upstream commit
    
    obsolete note about fascistloggin is obsolete. ok djm
    dtucker
    
    Upstream-ID: dae60df23b2bb0e89f42661ddd96a7b0d1b7215a

commit a2333584170a565adf4f209586772ef8053b10b8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 14 10:59:09 2016 +1000

    Add compat code for missing wcwidth.
    
    If we don't have wcwidth force fallback implementations of nl_langinfo
    and mbtowc.  Based on advice from Ingo Schwarze.

commit 8aaec7050614494014c47510b7e94daf6e644c62
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 14 09:48:48 2016 +1000

    fix missing include for systems with err.h

commit 6310ef27a2567cda66d6cf0c1ad290ee1167f243
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 13 14:42:35 2016 +1000

    Move err.h replacements into compat lib.
    
    Move implementations of err.h replacement functions into their own file
    in the libopenbsd-compat so we can use them in kexfuzz.c too.  ok djm@

commit f3f2cc8386868f51440c45210098f65f9787449a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 11 17:23:38 2016 +1000

    Check for wchar.h and langinfo.h
    
    Wrap includes in the appropriate #ifdefs.

commit b9c50614eba9d90939b2b119b6e1b7e03b462278
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 8 13:59:13 2016 +1000

    whitelist more architectures for seccomp-bpf
    
    bz#2590 - testing and patch from Jakub Jelen

commit 18813a32b6fd964037e0f5e1893cb4468ac6a758
Author: guenther@openbsd.org <guenther@openbsd.org>
Date:   Mon Jul 4 18:01:44 2016 +0000

    upstream commit
    
    DEBUGLIBS has been broken since the gcc4 switch, so delete
    it.  CFLAGS contains -g by default anyway
    
    problem noted by Edgar Pettijohn (edgar (at) pettijohn-web.com)
    ok millert@ kettenis@ deraadt@
    
    Upstream-Regress-ID: 4a0bb72f95c63f2ae9daa8a040ac23914bddb542

commit 6d31193d0baa3da339c196ac49625b7ba1c2ecc7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 8 03:44:42 2016 +0000

    upstream commit
    
    Improve crypto ordering for Encrypt-then-MAC (EtM) mode
    MAC algorithms.
    
    Previously we were computing the MAC, decrypting the packet and then
    checking the MAC. This gave rise to the possibility of creating a
    side-channel oracle in the decryption step, though no such oracle has
    been identified.
    
    This adds a mac_check() function that computes and checks the MAC in
    one pass, and uses it to advance MAC checking for EtM algorithms to
    before payload decryption.
    
    Reported by Jean Paul Degabriele, Kenny Paterson, Torben Hansen and
    Martin Albrecht. feedback and ok markus@
    
    Upstream-ID: 1999bb67cab47dda5b10b80d8155fe83d4a1867b

commit 71f5598f06941f645a451948c4a5125c83828e1c
Author: guenther@openbsd.org <guenther@openbsd.org>
Date:   Mon Jul 4 18:01:44 2016 +0000

    upstream commit
    
    DEBUGLIBS has been broken since the gcc4 switch, so
    delete it.  CFLAGS contains -g by default anyway
    
    problem noted by Edgar Pettijohn (edgar (at) pettijohn-web.com)
    ok millert@ kettenis@ deraadt@
    
    Upstream-ID: 96c5054e3e1f170c6276902d5bc65bb3b87a2603

commit e683fc6f1c8c7295648dbda679df8307786ec1ce
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jun 30 05:17:05 2016 +0000

    upstream commit
    
    Explicitly check for 100% completion to avoid potential
    floating point rounding error, which could cause progressmeter to report 99%
    on completion. While there invert the test so the 100% case is clearer.  with
    & ok djm@
    
    Upstream-ID: a166870c5878e422f3c71ff802e2ccd7032f715d

commit 772e6cec0ed740fc7db618dc30b4134f5a358b43
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Jun 29 17:14:28 2016 +0000

    upstream commit
    
    sort the -o list;
    
    Upstream-ID: 1a97465ede8790b4d47cb618269978e07f41f8ac

commit 46ecd19e554ccca15a7309cd1b6b44bc8e6b84af
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jun 23 05:17:51 2016 +0000

    upstream commit
    
    fix AuthenticationMethods during configuration re-parse;
    reported by Juan Francisco Cantero Hurtado
    
    Upstream-ID: 8ffa1dac25c7577eca8238e825317ab20848f9b4

commit 3147e7595d0f2f842a666c844ac53e6c7a253d7e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jun 19 07:48:02 2016 +0000

    upstream commit
    
    revert 1.34; causes problems loading public keys
    
    reported by semarie@
    
    Upstream-ID: b393794f8935c8b15d98a407fe7721c62d2ed179

commit ad23a75509f4320d43f628c50f0817e3ad12bfa7
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jun 17 06:33:30 2016 +0000

    upstream commit
    
    grammar fix;
    
    Upstream-ID: 5d5b21c80f1e81db367333ce0bb3e5874fb3e463

commit 5e28b1a2a3757548b40018cc2493540a17c82e27
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 17 05:06:23 2016 +0000

    upstream commit
    
    translate OpenSSL error codes to something more
    meaninful; bz#2522 reported by Jakub Jelen, ok dtucker@
    
    Upstream-ID: 4cb0795a366381724314e6515d57790c5930ffe5

commit b64faeb5eda7eff8210c754d00464f9fe9d23de5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 17 05:03:40 2016 +0000

    upstream commit
    
    ban AuthenticationMethods="" and accept
    AuthenticationMethods=any for the default behaviour of not requiring multiple
    authentication
    
    bz#2398 from Jakub Jelen; ok dtucker@
    
    Upstream-ID: fabd7f44d59e4518d241d0d01e226435cc23cf27

commit 9816fc5daee5ca924dd5c4781825afbaab728877
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Jun 16 11:00:17 2016 +0000

    upstream commit
    
    Include stdarg.h for va_copy as per man page.
    
    Upstream-ID: 105d6b2f1af2fbd9d91c893c436ab121434470bd

commit b6cf84b51bc0f5889db48bf29a0c771954ade283
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Jun 16 06:10:45 2016 +0000

    upstream commit
    
    keys stored in openssh format can have comments too; diff
    from yonas yanfa, tweaked a bit;
    
    ok djm
    
    Upstream-ID: 03d48536da6e51510d73ade6fcd44ace731ceb27

commit aa37768f17d01974b6bfa481e5e83841b6c76f86
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 20 15:55:34 2016 +1000

    get_remote_name_or_ip inside LOGIN_NEEDS_UTMPX
    
    Apply the same get_remote_name_or_ip -> session_get_remote_name_or_ip
    change as commit 95767262 to the code inside #ifdef LOGIN_NEEDS_UTMPX.
    Fixes build on AIX.

commit 009891afc8df37bc2101e15d1e0b6433cfb90549
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 17 14:34:09 2016 +1000

    Remove duplicate code from PAM.  ok djm@

commit e690fe85750e93fca1fb7c7c8587d4130a4f7aba
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jun 15 00:40:40 2016 +0000

    upstream commit
    
    Remove "POSSIBLE BREAK-IN ATTEMPT!" from log message
    about forward and reverse DNS not matching.  We haven't supported IP-based
    auth methods for a very long time so it's now misleading.  part of bz#2585,
    ok markus@
    
    Upstream-ID: 5565ef0ee0599b27f0bd1d3bb1f8a323d8274e29

commit 57b4ee04cad0d3e0fec1194753b0c4d31e39a1cd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 15 11:22:38 2016 +1000

    Move platform_disable_tracing into its own file.
    
    Prevents link errors resolving the extern "options" when platform.o
    gets linked into ssh-agent when building --with-pam.

commit 78dc8e3724e30ee3e1983ce013e80277dc6ca070
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 14 13:55:12 2016 +1000

    Track skipped upstream commit IDs.
    
    There are a small number of "upstream" commits that do not correspond to
    a file in -portable.  This file tracks those so that we can reconcile
    OpenBSD and Portable to ensure that no commits are accidentally missed.
    
    If you add something to .skipped-commit-ids please also add an upstream
    ID line in the following format when you commit it.
    
        Upstream-ID: 321065a95a7ccebdd5fd08482a1e19afbf524e35
        Upstream-ID: d4f699a421504df35254cf1c6f1a7c304fb907ca
        Upstream-ID: aafe246655b53b52bc32c8a24002bc262f4230f7
        Upstream-ID: 8fa9cd1dee3c3339ae329cf20fb591db6d605120
        Upstream-ID: f31327a48dd4103333cc53315ec53fe65ed8a17a
        Upstream-ID: edbfde98c40007b7752a4ac106095e060c25c1ef
        Upstream-ID: 052fd565e3ff2d8cec3bc957d1788f50c827f8e2
        Upstream-ID: 7cf73737f357492776223da1c09179fa6ba74660
        Upstream-ID: 180d84674be1344e45a63990d60349988187c1ae
        Upstream-ID: f6ae971186ba68d066cd102e57d5b0b2c211a5ee

commit 9f919d1a3219d476d6a662d18df058e1c4f36a6f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 14 13:51:01 2016 +1000

    Remove now-defunct .cvsignore files. ok djm

commit 68777faf271efb2713960605c748f6c8a4b26d55
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jun 8 02:13:01 2016 +0000

    upstream commit
    
    Back out rev 1.28 "Check min and max sizes sent by the
    client" change. It caused "key_verify failed for server_host_key" in clients
    that send a DH-GEX min value less that DH_GRP_MIN, eg old OpenSSH and PuTTY.
    ok djm@
    
    Upstream-ID: 452979d3ca5c1e9dff063287ea0a5314dd091f65

commit a86ec4d0737ac5879223e7cd9d68c448df46e169
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 14 10:48:27 2016 +1000

    Use Solaris setpflags(__PROC_PROTECT, ...).
    
    Where possible, use Solaris setpflags to disable process tracing on
    ssh-agent and sftp-server.  bz#2584, based on a patch from huieying.lee
    at oracle.com, ok djm.

commit 0f916d39b039fdc0b5baf9b5ab0754c0f11ec573
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 14 10:43:53 2016 +1000

    Shorten prctl code a tiny bit.

commit 0fb7f5985351fbbcd2613d8485482c538e5123be
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 9 16:23:07 2016 +1000

    Move prctl PR_SET_DUMPABLE into platform.c.
    
    This should make it easier to add additional platform support such as
    Solaris (bz#2584).

commit e6508898c3cd838324ecfe1abd0eb8cf802e7106
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 3 04:10:41 2016 +0000

    upstream commit
    
    Add a test for ssh(1)'s config file parsing.
    
    Upstream-Regress-ID: 558b7f4dc45cc3761cc3d3e889b9f3c5bc91e601

commit ab0a536066dfa32def0bd7272c096ebb5eb25b11
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 3 03:47:59 2016 +0000

    upstream commit
    
    Add 'sshd' to the test ID as I'm about to add a similar
     set for ssh.
    
    Upstream-Regress-ID: aea7a9c3bac638530165c801ce836875b228ae7a

commit a5577c1ed3ecdfe4b7b1107c526cae886fc91afb
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Mon May 30 12:14:08 2016 +0000

    upstream commit
    
    stricter malloc.conf(5) options for utf8 tests
    
    Upstream-Regress-ID: 111efe20a0fb692fa1a987f6e823310f9b25abf6

commit 75f0844b4f29d62ec3a5e166d2ee94b02df819fc
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Mon May 30 12:05:56 2016 +0000

    upstream commit
    
    Fix two rare edge cases: 1. If vasprintf() returns < 0,
     do not access a NULL pointer in snmprintf(), and do not free() the pointer
     returned from vasprintf() because on some systems other than OpenBSD, it
     might be a bogus pointer. 2. If vasprintf() returns == 0, return 0 and ""
     rather than -1 and NULL.
    
    Besides, free(dst) is pointless after failure (not a bug).
    
    One half OK martijn@, the other half OK deraadt@;
    committing quickly before people get hurt.
    
    Upstream-Regress-ID: b164f20923812c9bac69856dbc1385eb1522cba4

commit 016881eb33a7948028848c90f4c7ac42e3af0e87
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Thu May 26 19:14:25 2016 +0000

    upstream commit
    
    test the new utf8 module
    
    Upstream-Regress-ID: c923d05a20e84e4ef152cbec947fdc4ce6eabbe3

commit d4219028bdef448e089376f3afe81ef6079da264
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue May 3 15:30:46 2016 +0000

    upstream commit
    
    Set umask to prevent "Bad owner or permissions" errors.
    
    Upstream-Regress-ID: 8fdf2fc4eb595ccd80c443f474d639f851145417

commit 07d5608bb237e9b3fe86a2aeaa429392230faebf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 3 14:41:04 2016 +0000

    upstream commit
    
    support doas
    
    Upstream-Regress-ID: 8d5572b27ea810394eeda432d8b4e9e1064a7c38

commit 01cabf10adc7676cba5f40536a34d3b246edb73f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 3 13:48:33 2016 +0000

    upstream commit
    
    unit tests for sshbuf_dup_string()
    
    Upstream-Regress-ID: 7521ff150dc7f20511d1c2c48fd3318e5850a96d

commit 6915f1698e3d1dd4e22eac20f435e1dfc1d46372
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Jun 3 06:44:12 2016 +0000

    upstream commit
    
    tweak previous;
    
    Upstream-ID: 92979f1a0b63e041a0e5b08c9ed0ba9b683a3698

commit 0cb2f4c2494b115d0f346ed2d8b603ab3ba643f4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 3 04:09:38 2016 +0000

    upstream commit
    
    Allow ExitOnForwardFailure and ClearAllForwardings to be
     overridden when using ssh -W (but still default to yes in that case).
     bz#2577, ok djm@.
    
    Upstream-ID: 4b20c419e93ca11a861c81c284090cfabc8c54d4

commit 8543ff3f5020fe659839b15f05b8c522bde6cee5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jun 3 03:14:41 2016 +0000

    upstream commit
    
    Move the host and port used by ssh -W into the Options
     struct. This will make future changes a bit easier.  ok djm@
    
    Upstream-ID: 151bce5ecab2fbedf0d836250a27968d30389382

commit 6b87311d3acdc460f926b2c40f4c4f3fd345f368
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jun 1 04:19:49 2016 +0000

    upstream commit
    
    Check min and max sizes sent by the client against what
     we support before passing them to the monitor.  ok djm@
    
    Upstream-ID: 750627e8117084215412bff00a25b1586ab17ece

commit 564cd2a8926ccb1dca43a535073540935b5e0373
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue May 31 23:46:14 2016 +0000

    upstream commit
    
    Ensure that the client's proposed DH-GEX max value is at
     least as big as the minimum the server will accept.  ok djm@
    
    Upstream-ID: b4b84fa04aab2de7e79a6fee4a6e1c189c0fe775

commit df820722e40309c9b3f360ea4ed47a584ed74333
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 6 11:36:13 2016 +1000

    Add compat bits to utf8.c.

commit 05c6574652571becfe9d924226c967a3f4b3f879
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 6 11:33:43 2016 +1000

    Fix utf->utf8 typo.

commit 6c1717190b4d5ddd729cd9e24e8ed71ed4f087ce
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Mon May 30 18:34:41 2016 +0000

    upstream commit
    
    Backout rev. 1.43 for now.
    
    The function update_progress_meter() calls refresh_progress_meter()
    which calls snmprintf() which calls malloc(); but update_progress_meter()
    acts as the SIGALRM signal handler.
    
    "malloc(): error: recursive call" reported by sobrado@.
    
    Upstream-ID: aaae57989431e5239c101f8310f74ccc83aeb93e

commit cd9e1eabeb4137182200035ab6fa4522f8d24044
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Mon May 30 12:57:21 2016 +0000

    upstream commit
    
    Even when only writing an unescaped character, the dst
     buffer may need to grow, or it would be overrun; issue found by tb@ with
     malloc.conf(5) 'C'.
    
    While here, reserve an additional byte for the terminating NUL
    up front such that we don't have to realloc() later just for that.
    
    OK tb@
    
    Upstream-ID: 30ebcc0c097c4571b16f0a78b44969f170db0cff

commit ac284a355f8065eaef2a16f446f3c44cdd17371d
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Mon May 30 12:05:56 2016 +0000

    upstream commit
    
    Fix two rare edge cases: 1. If vasprintf() returns < 0,
     do not access a NULL pointer in snmprintf(), and do not free() the pointer
     returned from vasprintf() because on some systems other than OpenBSD, it
     might be a bogus pointer. 2. If vasprintf() returns == 0, return 0 and ""
     rather than -1 and NULL.
    
    Besides, free(dst) is pointless after failure (not a bug).
    
    One half OK martijn@, the other half OK deraadt@;
    committing quickly before people get hurt.
    
    Upstream-ID: b7bcd2e82fc168a8eff94e41f5db336ed986fed0

commit 0e059cdf5fd86297546c63fa8607c24059118832
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Wed May 25 23:48:45 2016 +0000

    upstream commit
    
    To prevent screwing up terminal settings when printing to
     the terminal, for ASCII and UTF-8, escape bytes not forming characters and
     bytes forming non-printable characters with vis(3) VIS_OCTAL. For other
     character sets, abort printing of the current string in these cases.  In
     particular, * let scp(1) respect the local user's LC_CTYPE locale(1); *
     sanitize data received from the remote host; * sanitize filenames, usernames,
     and similar data even locally; * take character display widths into account
     for the progressmeter.
    
    This is believed to be sufficient to keep the local terminal safe
    on OpenBSD, but bad things can still happen on other systems with
    state-dependent locales because many places in the code print
    unencoded ASCII characters into the output stream.
    
    Using feedback from djm@ and martijn@,
    various aspects discussed with many others.
    
    deraadt@ says it should go in now, i probably already hesitated too long
    
    Upstream-ID: e66afbc94ee396ddcaffd433b9a3b80f387647e0

commit 8c02e3639acefe1e447e293dbe23a0917abd3734
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue May 24 04:43:45 2016 +0000

    upstream commit
    
    KNF compression proposal and simplify the client side a
     little.  ok djm@
    
    Upstream-ID: aa814b694efe9e5af8a26e4c80a05526ae6d6605

commit 7ec4946fb686813eb5f8c57397e465f5485159f4
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue May 24 02:31:57 2016 +0000

    upstream commit
    
    Back out 'plug memleak'.
    
    Upstream-ID: 4faacdde136c24a961e24538de373660f869dbc0

commit 82f24c3ddc52053aeb7beb3332fa94c92014b0c5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 23 23:30:50 2016 +0000

    upstream commit
    
    prefer agent-hosted keys to keys from PKCS#11; ok markus
    
    Upstream-ID: 7417f7653d58d6306d9f8c08d0263d050e2fd8f4

commit a0cb7778fbc9b43458f7072eb68dd858766384d1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon May 23 00:17:27 2016 +0000

    upstream commit
    
    Plug mem leak in filter_proposal.  ok djm@
    
    Upstream-ID: bf968da7cfcea2a41902832e7d548356a4e2af34

commit ae9c0d4d5c581b3040d1f16b5c5f4b1cd1616743
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 3 16:03:44 2016 +1000

    Update vis.h and vis.c from OpenBSD.
    
    This will be needed for the upcoming utf8 changes.

commit e1d93705f8f48f519433d6ca9fc3d0abe92a1b77
Author: Tim Rice <tim@multitalents.net>
Date:   Tue May 31 11:13:22 2016 -0700

    modified:   configure.ac
    whitspace clean up. No code changes.

commit 604a037d84e41e31f0aec9075df0b8740c130200
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 31 16:45:28 2016 +1000

    whitespace at EOL

commit 18424200160ff5c923113e0a37ebe21ab7bcd17c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 30 19:35:28 2016 +1000

    Add missing ssh-host-config --name option
    
    Patch from vinschen@redhat.com.

commit 39c0cecaa188a37a2e134795caa68e03f3ced592
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 20 10:01:58 2016 +1000

    Fix comment about sshpam_const and AIX.
    
    From mschwager via github.

commit f64062b1f74ad5ee20a8a49aab2732efd0f7ce30
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 09:56:53 2016 +1000

    Deny lstat syscalls in seccomp sandbox
    
    Avoids sandbox violations for some krb/gssapi libraries.

commit 531c135409b8d8810795b1f3692a4ebfd5c9cae0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 19 07:45:32 2016 +0000

    upstream commit
    
    fix type of ed25519 values
    
    Upstream-ID: b32d0cb372bbe918ca2de56906901eae225a59b0

commit 75e21688f523799c9e0cc6601d76a9c5ca79f787
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed May 4 14:32:26 2016 +0000

    upstream commit
    
    add IdentityAgent; noticed & ok jmc@
    
    Upstream-ID: 4ba9034b00a4cf1beae627f0728da897802df88a

commit 1a75d14daf4b60db903e6103cf50e74e0cd0a76b
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed May 4 14:29:58 2016 +0000

    upstream commit
    
    allow setting IdentityAgent to SSH_AUTH_SOCK; ok djm@
    
    Upstream-ID: 20c508480d8db3eef18942c0fc39b1fcf25652ac

commit 0516454151ae722fc8256c3c56115c6baf24c5b0
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed May 4 14:22:33 2016 +0000

    upstream commit
    
    move SSH_MSG_NONE, so we don't have to include ssh1.h;
     ok deraadt@
    
    Upstream-ID: c2f97502efc761a41b18c17ddf460e138ca7994e

commit 332ff3d770631e7513fea38cf0d3689f673f0e3f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 10 09:51:06 2016 +1000

    initialise salen in binresvport_sa
    
    avoids failures with UsePrivilegedPort=yes
    
    patch from Juan Gallego

commit c5c1d5d2f04ce00d2ddd6647e61b32f28be39804
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed May 4 14:04:40 2016 +0000

    upstream commit
    
    missing const in prototypes (ssh1)
    
    Upstream-ID: 789c6ad4928b5fa557369b88c3a6a34926082c05

commit 9faae50e2e82ba42eb0cb2726bf6830fe7948f28
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed May 4 14:00:09 2016 +0000

    upstream commit
    
    Fix inverted logic for updating StreamLocalBindMask which
     would cause the server to set an invalid mask. ok djm@
    
    Upstream-ID: 8a4404c8307a5ef9e07ee2169fc6d8106b527587

commit b02ad1ce9105bfa7394ac7590c0729dd52e26a81
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed May 4 12:21:53 2016 +0000

    upstream commit
    
    IdentityAgent for specifying specific agent sockets; ok
     djm@
    
    Upstream-ID: 3e6a15eb89ea0fd406f108826b7dc7dec4fbfac1

commit 910e59bba09ac309d78ce61e356da35292212935
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 4 12:16:39 2016 +0000

    upstream commit
    
    fix junk characters after quotes
    
    Upstream-ID: cc4d0cd32cb6b55a2ef98975d2f7ae857d0dc578

commit 9283884e647b8be50ccd2997537af0065672107d
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue May 3 18:38:12 2016 +0000

    upstream commit
    
    correct article;
    
    Upstream-ID: 1fbd5b7ab16d2d9834ec79c3cedd4738fa42a168

commit cfefbcea1057c2623e76c579174a4107a0b6e6cd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 3 15:57:39 2016 +0000

    upstream commit
    
    fix overriding of StreamLocalBindMask and
     StreamLocalBindUnlink in Match blocks; found the hard way Rogan Dawes
    
    Upstream-ID: 940bc69ec0249ab428d24ccd0722ce35cb932ee2

commit 771c2f51ffc0c9a2877b7892fada0c77bd1f6549
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 3 15:25:06 2016 +0000

    upstream commit
    
    don't forget to include StreamLocalBindUnlink in the
     config dump output
    
    Upstream-ID: 14a6d970b3b45c8e94272e3c661e9a0b2a0ee7cb

commit cdcd941994dc430f50d0a4e6a712d32b66e6199e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 3 14:54:08 2016 +0000

    upstream commit
    
    make nethack^wrandomart fingerprint flag more readily
     searchable pointed out by Matt Johnston
    
    Upstream-ID: cb40d0235dc153c478c1aad3bc60b195422a54fb

commit 05855bf2ce7d5cd0a6db18bc0b4214ed5ef7516d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 3 13:10:24 2016 +0000

    upstream commit
    
    clarify ordering of subkeys; pointed out by ietf-ssh AT
     stbuehler.de
    
    Upstream-ID: 05ebe9f949449a555ebce8e0aad7c8c9acaf8463

commit cca3b4395807bfb7aaeb83d2838f5c062ce30566
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue May 3 12:15:49 2016 +0000

    upstream commit
    
    Use a subshell for constructing key types to work around
     different sed behaviours for -portable.
    
    Upstream-Regress-ID: 0f6eb673162df229eda9a134a0f10da16151552d

commit fa58208c6502dcce3e0daac0ca991ee657daf1f5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 3 10:27:59 2016 +0000

    upstream commit
    
    correct some typos and remove a long-stale XXX note.
    
    add specification for ed25519 certificates
    
    mention no host certificate options/extensions are currently defined
    
    pointed out by Simon Tatham
    
    Upstream-ID: 7b535ab7dba3340b7d8210ede6791fdaefdf839a

commit b466f956c32cbaff4200bfcd5db6739fe4bc7d04
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue May 3 10:24:27 2016 +0000

    upstream commit
    
    add ed25519 keys that are supported but missing from this
     documents; from Peter Moody
    
    Upstream-ID: 8caac2d8e8cfd2fca6dc304877346e0a064b014b

commit 7f3d76319a69dab2efe3a520a8fef5b97e923636
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue May 3 09:03:49 2016 +0000

    upstream commit
    
    Implement IUTF8 as per draft-sgtatham-secsh-iutf8-00.  Patch
     from Simon Tatham, ok markus@
    
    Upstream-ID: 58268ebdf37d9d467f78216c681705a5e10c58e8

commit 31bc01c05d9f51bee3ebe33dc57c4fafb059fb62
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 2 14:10:58 2016 +0000

    upstream commit
    
    unbreak config parsing on reexec from previous commit
    
    Upstream-ID: bc69932638a291770955bd05ca55a32660a613ab

commit 67f1459efd2e85bf03d032539283fa8107218936
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 2 09:52:00 2016 +0000

    upstream commit
    
    unit and regress tests for SHA256/512; ok markus
    
    Upstream-Regress-ID: a0cd1a92dc824067076a5fcef83c18df9b0bf2c6

commit 0e8eeec8e75f6d0eaf33317376f773160018a9c7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 2 10:26:04 2016 +0000

    upstream commit
    
    add support for additional fixed DH groups from
     draft-ietf-curdle-ssh-kex-sha2-03
    
    diffie-hellman-group14-sha256 (2K group)
    diffie-hellman-group16-sha512 (4K group)
    diffie-hellman-group18-sha512 (8K group)
    
    based on patch from Mark D. Baushke and Darren Tucker
    ok markus@
    
    Upstream-ID: ac00406ada4f0dfec41585ca0839f039545bc46f

commit 57464e3934ba53ad8590ee3ccd840f693407fc1e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 2 09:36:42 2016 +0000

    upstream commit
    
    support SHA256 and SHA512 RSA signatures in certificates;
     ok markus@
    
    Upstream-ID: b45be2f2ce8cacd794dc5730edaabc90e5eb434a

commit 1a31d02b2411c4718de58ce796dbb7b5e14db93e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 2 08:49:03 2016 +0000

    upstream commit
    
    fix signed/unsigned errors reported by clang-3.7; add
     sshbuf_dup_string() to replace a common idiom of strdup(sshbuf_ptr()) with
     better safety checking; feedback and ok markus@
    
    Upstream-ID: 71f926d9bb3f1efed51319a6daf37e93d57c8820

commit d2d6bf864e52af8491a60dd507f85b74361f5da3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 29 08:07:53 2016 +0000

    upstream commit
    
    close ControlPersist background process stderr when not
     in debug mode or when logging to a file or syslog. bz#1988 ok dtucker
    
    Upstream-ID: 4fb726f0fdcb155ad419913cea10dc4afd409d24

commit 9ee692fa1146e887e008a2b9a3d3ea81770c9fc8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 28 14:30:21 2016 +0000

    upstream commit
    
    fix comment
    
    Upstream-ID: 313a385bd7b69a82f8e28ecbaf5789c774457b15

commit ee1e0a16ff2ba41a4d203c7670b54644b6c57fa6
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Apr 27 13:53:48 2016 +0000

    upstream commit
    
    cidr permitted for {allow,deny}users; from lars nooden ok djm
    
    Upstream-ID: 13e7327fe85f6c63f3f7f069e0fdc8c351515d11

commit b6e0140a5aa883c27b98415bd8aa9f65fc04ee22
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 21 06:08:02 2016 +0000

    upstream commit
    
    make argument == NULL tests more consistent
    
    Upstream-ID: dc4816678704aa5cbda3a702e0fa2033ff04581d

commit 6aaabc2b610e44bae473457ad9556ffb43d90ee3
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sun Apr 17 14:34:46 2016 +0000

    upstream commit
    
    tweak previous;
    
    Upstream-ID: 46c1bab91c164078edbccd5f7d06b9058edd814f

commit 0f839e5969efa3bda615991be8a9d9311554c573
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 15 02:57:10 2016 +0000

    upstream commit
    
    missing bit of Include regress
    
    Upstream-Regress-ID: 1063595f7f40f8489a1b7a27230b9e8acccea34f

commit 12e4ac46aed681da55c2bba3cd11dfcab23591be
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 15 02:55:53 2016 +0000

    upstream commit
    
    remove redundant CLEANFILES section
    
    Upstream-Regress-ID: 29ef1b267fa56daa60a1463396635e7d53afb587

commit b1d05aa653ae560c44baf8e8a9756e33f98ea75c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 15 00:48:01 2016 +0000

    upstream commit
    
    sync CLEANFILES with portable, sort
    
    Upstream-Regress-ID: cb782f4f1ab3e079efbc335c6b64942f790766ed

commit 35f22dad263cce5c61d933ae439998cb965b8748
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 15 00:31:10 2016 +0000

    upstream commit
    
    regression test for ssh_config Include directive
    
    Upstream-Regress-ID: 46a38c8101f635461c506d1aac2d96af80f97f1e

commit 6b8a1a87005818d4700ce8b42faef746e82c1f51
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 14 23:57:17 2016 +0000

    upstream commit
    
    unbreak test for recent ssh de-duplicated forwarding
     change
    
    Upstream-Regress-ID: 6b2b115d99acd7cff13986e6739ea214cf2a3da3

commit 076787702418985a2cc6808212dc28ce7afc01f0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Apr 14 23:21:42 2016 +0000

    upstream commit
    
    add test knob and warning for StrictModes
    
    Upstream-Regress-ID: 8cd10952ce7898655ee58945904f2a0a3bdf7682

commit dc7990be865450574c7940c9880567f5d2555b37
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 15 00:30:19 2016 +0000

    upstream commit
    
    Include directive for ssh_config(5); feedback & ok markus@
    
    Upstream-ID: ae3b76e2e343322b9f74acde6f1e1c5f027d5fff

commit 85bdcd7c92fe7ff133bbc4e10a65c91810f88755
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 13 10:39:57 2016 +1000

    ignore PAM environment vars when UseLogin=yes
    
    If PAM is configured to read user-specified environment variables
    and UseLogin=yes in sshd_config, then a hostile local user may
    attack /bin/login via LD_PRELOAD or similar environment variables
    set via PAM.
    
    CVE-2015-8325, found by Shayan Sadigh, via Colin Watson

commit dce19bf6e4a2a3d0b13a81224de63fc316461ab9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Apr 9 12:39:30 2016 +0000

    upstream commit
    
    make private key loading functions consistently handle NULL
     key pointer arguments; ok markus@
    
    Upstream-ID: 92038726ef4a338169c35dacc9c5a07fcc7fa761

commit 5f41f030e2feb5295657285aa8c6602c7810bc4b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 8 21:14:13 2016 +1000

    Remove NO_IPPORT_RESERVED_CONCEPT
    
    Replace by defining IPPORT_RESERVED to zero on Cygwin, which should have
    the same effect without causing problems syncing patches with OpenBSD.
    Resync the two affected functions with OpenBSD.  ok djm, sanity checked
    by Corinna.

commit 34a01b2cf737d946ddb140618e28c3048ab7a229
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 8 08:19:17 2016 +0000

    upstream commit
    
    whitespace at EOL
    
    Upstream-ID: 5beffd4e001515da12851b974e2323ae4aa313b6

commit 90ee563fa6b54c59896c6c332c5188f866c5e75f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 8 06:35:54 2016 +0000

    upstream commit
    
    We accidentally send an empty string and a zero uint32 with
     every direct-streamlocal@openssh.com channel open, in contravention of our
     own spec.
    
    Fixing this is too hard wrt existing versions that expect these
    fields to be present and fatal() if they aren't, so document them
    as "reserved" fields in the PROTOCOL spec as though we always
    intended this and let us never speak of it again.
    
    bz#2529, reported by Ron Frederick
    
    Upstream-ID: 34cd326a4d236ca6e39084c4ff796bd97ab833e7

commit 0ccbd5eca0f0dd78e71a4b69c66f03a66908d558
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 6 06:42:17 2016 +0000

    upstream commit
    
    don't record duplicate LocalForward and RemoteForward
     entries; fixes failure with ExitOnForwardFailure+hostname canonicalisation
     where the same forwards are added on the second pass through the
     configuration file. bz#2562; ok dtucker@
    
    Upstream-ID: 40a51d68b6300f1cc61deecdb7d4847b8b7b0de1

commit 574def0eb493cd6efeffd4ff2e9257abcffee0c8
Author: krw@openbsd.org <krw@openbsd.org>
Date:   Sat Apr 2 14:37:42 2016 +0000

    upstream commit
    
    Another use for fcntl() and thus of the superfluous 3rd
     parameter is when sanitising standard fd's before calling daemon().
    
    Use a tweaked version of the ssh(1) function in all three places
    found using fcntl() this way.
    
    ok jca@ beck@
    
    Upstream-ID: f16811ffa19a1c5f4ef383c5f0fecb843c84e218

commit b3413534aa9d71a941005df2760d1eec2c2b0854
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Apr 4 11:09:21 2016 +1000

    Tidy up openssl header test.

commit 815bcac0b94bb448de5acdd6ba925b8725240b4f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Apr 4 11:07:59 2016 +1000

    Fix configure-time warnings for openssl test.

commit 95687f5831ae680f7959446d8ae4b52452ee05dd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 1 02:34:10 2016 +0000

    upstream commit
    
    whitespace at EOL
    
    Upstream-ID: 40ae2203d07cb14e0a89e1a0d4c6120ee8fd8c3a

commit fdfbf4580de09d84a974211715e14f88a5704b8e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Mar 31 05:24:06 2016 +0000

    upstream commit
    
    Remove fallback from moduli to "primes" file that was
     deprecated in 2001 and fix log messages referring to primes file.  Based on
     patch from xnox at ubuntu.com via bz#2559.  "kill it" deraadt@
    
    Upstream-ID: 0d4f8c70e2fa7431a83b95f8ca81033147ba8713

commit 0235a5fa67fcac51adb564cba69011a535f86f6b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Mar 17 17:19:43 2016 +0000

    upstream commit
    
    UseDNS affects ssh hostname processing in authorized_keys,
     not known_hosts; bz#2554 reported by jjelen AT redhat.com
    
    Upstream-ID: c1c1bb895dde46095fc6d81d8653703928437591

commit 8c4739338f5e379d05b19d6e544540114965f07e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 15 09:24:43 2016 +1100

    Don't call Solaris setproject() with UsePAM=yes.
    
    When Solaris Projects are enabled along with PAM setting the project
    is PAM's responsiblity.  bz#2425, based on patch from
    brent.paulson at gmail.com.

commit cff26f373c58457a32cb263e212cfff53fca987b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 15 04:30:21 2016 +1100

    remove slogin from *.spec

commit c38905ba391434834da86abfc988a2b8b9b62477
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 14 16:20:54 2016 +0000

    upstream commit
    
    unbreak authentication using lone certificate keys in
     ssh-agent: when attempting pubkey auth with a certificate, if no separate
     private key is found among the keys then try with the certificate key itself.
    
    bz#2550 reported by Peter Moody
    
    Upstream-ID: f939cd76d68e6a9a3d1711b5a943d6ed1e623966

commit 4b4bfb01cd40b9ddb948e6026ddd287cc303d871
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Mar 10 11:47:57 2016 +0000

    upstream commit
    
    sanitise characters destined for xauth reported by
     github.com/tintinweb feedback and ok deraadt and markus
    
    Upstream-ID: 18ad8d0d74cbd2ea3306a16595a306ee356aa261

commit 732b463d37221722b1206f43aa59563766a6a968
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 14 16:04:23 2016 +1100

    Pass supported malloc options to connect-privsep.
    
    This allows us to activate only the supported options during the malloc
    option portion of the connect-privsep test.

commit d29c5b9b3e9f27394ca97a364ed4bb4a55a59744
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 14 09:30:58 2016 +1100

    Remove leftover roaming.h file.
    
    Pointed out by des at des.no.

commit 8ff20ec95f4377021ed5e9b2331320f5c5a34cea
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 14 09:24:03 2016 +1100

    Quote variables that may contain whitespace.
    
    The variable $L_TMP_ID_FILE needs to be surrounded by quotes in order to
    survive paths containing whitespace.  bz#2551, from Corinna Vinschen via
    Philip Hands.

commit 627824480c01f0b24541842c7206ab9009644d02
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Mar 11 14:47:41 2016 +1100

    Include priv.h for priv_set_t.
    
    From alex at cooperi.net.

commit e960051f9a264f682c4d2fefbeecffcfc66b0ddf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 9 13:14:18 2016 +1100

    Wrap stdint.h inside #ifdef HAVE_STDINT_H.

commit 2c48bd344d2c4b5e08dae9aea5ff44fc19a5e363
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 9 12:46:50 2016 +1100

    Add compat to monotime_double().
    
    Apply all of the portability changes in monotime() to monotime() double.
    Fixes build on at least older FreeBSD systems.

commit 7b40ef6c2eef40c339f6ea8920cb8a44838e10c9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 8 14:12:58 2016 -0800

    make a regress-binaries target
    
    Easier to build all the regression/unit test binaries in one pass
    than going through all of ${REGRESS_BINARIES}

commit c425494d6b6181beb54a1b3763ef9e944fd3c214
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 8 14:03:54 2016 -0800

    unbreak kexfuzz for -Werror without __bounded__

commit 3ed9218c336607846563daea5d5ab4f701f4e042
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 8 14:01:29 2016 -0800

    unbreak PAM after canohost refactor

commit 885fb2a44ff694f01e4f6470f803629e11f62961
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 8 11:58:43 2016 +1100

    auth_get_canonical_hostname in portable code.
    
    "refactor canohost.c" replaced get_canonical_hostname, this makes the
    same change to some portable-specific code.

commit 95767262caa6692eff1e1565be1f5cb297949a89
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 7 19:02:43 2016 +0000

    upstream commit
    
    refactor canohost.c: move functions that cache results closer
     to the places that use them (authn and session code). After this, no state is
     cached in canohost.c
    
    feedback and ok markus@
    
    Upstream-ID: 5f2e4df88d4803fc8ec59ec53629105e23ce625e

commit af0bb38ffd1f2c4f9f43b0029be2efe922815255
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 4 15:11:55 2016 +1100

    hook unittests/misc/kexfuzz into build

commit 331b8e07ee5bcbdca12c11cc8f51a7e8de09b248
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Mar 4 02:48:06 2016 +0000

    upstream commit
    
    Filter debug messages out of log before picking the last
     two lines. Should prevent problems if any more debug output is added late in
     the connection.
    
    Upstream-Regress-ID: 345d0a9589c381e7d640a4ead06cfaadf4db1363

commit 0892edaa3ce623381d3a7635544cbc69b31cf9cb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 4 02:30:36 2016 +0000

    upstream commit
    
    add KEX fuzzer harness; ok deraadt@
    
    Upstream-Regress-ID: 3df5242d30551b12b828aa9ba4a4cec0846be8d1

commit ae2562c47d41b68dbb00240fd6dd60bed205367a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Mar 3 00:46:53 2016 +0000

    upstream commit
    
    Look back 3 lines for possible error messages.  Changes
     to the code mean that "Bad packet length" errors are 3 lines back instead of
     the previous two, which meant we didn't skip some offsets that we intended
     to.
    
    Upstream-Regress-ID: 24f36912740a634d509a3144ebc8eb7c09b9c684

commit 988e429d903acfb298bfddfd75e7994327adfed0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 4 03:35:44 2016 +0000

    upstream commit
    
    fix ClientAliveInterval when a time-based RekeyLimit is
     set; previously keepalive packets were not being sent. bz#2252 report and
     analysis by Christian Wittenhorst and Garrett Lee feedback and ok dtucker@
    
    Upstream-ID: d48f9deadd35fdacdd5106b41bb07630ddd4aa81

commit 8ef04d7a94bcdb8b0085fdd2a79a844b7d40792d
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Mar 2 22:43:52 2016 +0000

    upstream commit
    
    Improve accuracy of reported transfer speeds by waiting
     for the ack from the other end.  Pointed out by mmcc@, ok deraadt@ markus@
    
    Upstream-ID: 99f1cf15c9a8f161086b814d414d862795ae153d

commit b8d4eafe29684fe4f5bb587f7eab948e6ed62723
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Mar 2 22:42:40 2016 +0000

    upstream commit
    
    Improve precision of progressmeter for sftp and scp by
     storing sub-second timestamps.  Pointed out by mmcc@, ok deraadt@ markus@
    
    Upstream-ID: 38fd83a3d83dbf81c8ff7b5d1302382fe54970ab

commit 18f64b969c70ed00e74b9d8e50359dbe698ce4c0
Author: jca@openbsd.org <jca@openbsd.org>
Date:   Mon Feb 29 20:22:36 2016 +0000

    upstream commit
    
    Print ssize_t with %zd; ok deraadt@ mmcc@
    
    Upstream-ID: 0590313bbb013ff6692298c98f7e0be349d124bd

commit 6e7f68ce38130c794ec1fb8d2a6091fbe982628d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Feb 28 22:27:00 2016 +0000

    upstream commit
    
    rearrange DH public value tests to be a little more clear
    
    rearrange DH private value generation to explain rationale more
    clearly and include an extra sanity check.
    
    ok deraadt
    
    Upstream-ID: 9ad8a07e1a12684e1b329f9bd88941b249d4b2ad

commit 2ed17aa34008bdfc8db674315adc425a0712be11
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 1 15:24:20 2016 +1100

    Import updated moduli file from OpenBSD.
    
    Note that 1.5k bit groups have been removed.

commit 72b061d4ba0f909501c595d709ea76e06b01e5c9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 26 14:40:04 2016 +1100

    Add a note about using xlc on AIX.

commit fd4e4f2416baa2e6565ea49d52aade296bad3e28
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 24 10:44:25 2016 +1100

    Skip PrintLastLog in config dump mode.
    
    When DISABLE_LASTLOG is set, do not try to include PrintLastLog in the
    config dump since it'll be reported as UNKNOWN.

commit 99135c764fa250801da5ec3b8d06cbd0111caae8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 23 20:17:23 2016 +1100

    update spec/README versions ahead of release

commit b86a334aaaa4d1e643eb1fd71f718573d6d948b5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 23 20:16:53 2016 +1100

    put back portable patchlevel to p1

commit 555dd35ff176847e3c6bd068ba2e8db4022eb24f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 23 09:14:34 2016 +0000

    upstream commit
    
    openssh-7.2
    
    Upstream-ID: 9db776b26014147fc907ece8460ef2bcb0f11e78

commit 1acc058d0a7913838c830ed998a1a1fb5b7864bf
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 23 16:12:13 2016 +1100

    Disable tests where fs perms are incorrect
    
    Some tests have strict requirements on the filesystem permissions
    for certain files and directories. This adds a regress/check-perm
    tool that copies the relevant logic from sshd to exactly test
    the paths in question. This lets us skip tests when the local
    filesystem doesn't conform to our expectations rather than
    continuing and failing the test run.
    
    ok dtucker@

commit 39f303b1f36d934d8410b05625f25c7bcb75db4d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 23 12:56:59 2016 +1100

    fix sandbox on OSX Lion
    
    sshd was failing with:
    
    ssh_sandbox_child: sandbox_init: dlopen(/usr/lib/libsandbox.1.dylib, 261):cw
      image not found [preauth]
    
    caused by chroot before sandboxing. Avoid by explicitly linking libsandbox
    to sshd. Spotted by Darren.

commit 0d1451a32c7436e6d3d482351e776bc5e7824ce4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 23 01:34:14 2016 +0000

    upstream commit
    
    fix spurious error message when incorrect passphrase
     entered for keys; reported by espie@ ok deraadt@
    
    Upstream-ID: 58b2e46e63ed6912ed1ee780bd3bd8560f9a5899

commit 09d87d79741beb85768b5e788d7dfdf4bc3543dc
Author: sobrado@openbsd.org <sobrado@openbsd.org>
Date:   Sat Feb 20 23:06:23 2016 +0000

    upstream commit
    
    set ssh(1) protocol version to 2 only.
    
    ok djm@
    
    Upstream-ID: e168daf9d27d7e392e3c9923826bd8e87b2b3a10

commit 9262e07826ba5eebf8423f7ac9e47ec488c47869
Author: sobrado@openbsd.org <sobrado@openbsd.org>
Date:   Sat Feb 20 23:02:39 2016 +0000

    upstream commit
    
    add missing ~/.ssh/id_ecdsa and ~/.ssh/id_ed25519 to
     IdentityFile.
    
    ok djm@
    
    Upstream-ID: 6ce99466312e4ae7708017c3665e3edb976f70cf

commit c12f0fdce8f985fca8d71829fd64c5b89dc777f5
Author: sobrado@openbsd.org <sobrado@openbsd.org>
Date:   Sat Feb 20 23:01:46 2016 +0000

    upstream commit
    
    AddressFamily defaults to any.
    
    ok djm@
    
    Upstream-ID: 0d94aa06a4b889bf57a7f631c45ba36d24c13e0c

commit 907091acb188b1057d50c2158f74c3ecf1c2302b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 19 09:05:39 2016 +1100

    Make Solaris privs code build on older systems.
    
    Not all systems with Solaris privs have priv_basicset so factor that
    out and provide backward compatibility code.  Similarly, not all have
    PRIV_NET_ACCESS so wrap that in #ifdef.  Based on code from
    alex at cooperi.net and djm@ with help from carson at taltos.org and
    wieland at purdue.edu.

commit 292a8dee14e5e67dcd1b49ba5c7b9023e8420d59
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 17 22:20:14 2016 +0000

    upstream commit
    
    rekey refactor broke SSH1; spotted by Tom G. Christensen
    
    Upstream-ID: 43f0d57928cc077c949af0bfa71ef574dcb58243

commit 3a13cb543df9919aec2fc6b75f3dd3802facaeca
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 17 08:57:34 2016 +0000

    upstream commit
    
    rsa-sha2-512,rsa-sha2-256 cannot be selected explicitly
     in *KeyTypes options yet. Remove them from the lists of algorithms for now.
     committing on behalf of markus@ ok djm@
    
    Upstream-ID: c6e8820eb8e610ac21551832c0c89684a9a51bb7

commit a685ae8d1c24fb7c712c55a4f3280ee76f5f1e4b
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Wed Feb 17 07:38:19 2016 +0000

    upstream commit
    
    since these pages now clearly tell folks to avoid v1,
     normalise the docs from a v2 perspective (i.e. stop pointing out which bits
     are v2 only);
    
    ok/tweaks djm ok markus
    
    Upstream-ID: eb474f8c36fb6a532dc05c282f7965e38dcfa129

commit c5c3f3279a0e4044b8de71b70d3570d692d0f29d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 17 05:29:04 2016 +0000

    upstream commit
    
    make sandboxed privilege separation the default, not just
     for new installs; "absolutely" deraadt@
    
    Upstream-ID: 5221ef3b927d2df044e9aa3f5db74ae91743f69b

commit eb3f7337a651aa01d5dec019025e6cdc124ed081
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Feb 16 07:47:54 2016 +0000

    upstream commit
    
    no need to state that protocol 2 is the default twice;
    
    Upstream-ID: b1e4c36b0c2e12e338e5b66e2978f2ac953b95eb

commit e7901efa9b24e5b0c7e74f2c5520d47eead4d005
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 16 05:11:04 2016 +0000

    upstream commit
    
    Replace list of ciphers and MACs adjacent to -1/-2 flag
     descriptions in ssh(1) with a strong recommendation not to use protocol 1.
     Add a similar warning to the Protocol option descriptions in ssh_config(5)
     and sshd_config(5);
    
    prompted by and ok mmcc@
    
    Upstream-ID: 961f99e5437d50e636feca023978950a232ead5e

commit 5a0fcb77287342e2fc2ba1cee79b6af108973dc2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 16 03:37:48 2016 +0000

    upstream commit
    
    add a "Close session" log entry (at loglevel=verbose) to
     correspond to the existing "Starting session" one. Also include the session
     id number to make multiplexed sessions more apparent.
    
    feedback and ok dtucker@
    
    Upstream-ID: e72d2ac080e02774376325136e532cb24c2e617c

commit 624fd395b559820705171f460dd33d67743d13d6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 17 02:24:17 2016 +0000

    upstream commit
    
    include bad $SSH_CONNECTION in failure output
    
    Upstream-Regress-ID: b22d72edfde78c403aaec2b9c9753ef633cc0529

commit 60d860e54b4f199e5e89963b1c086981309753cb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 17 13:37:09 2016 +1100

    Rollback addition of va_start.
    
    va_start was added in 0f754e29dd3760fc0b172c1220f18b753fb0957e, however
    it has the wrong number of args and it's not usable in non-variadic
    functions anyway so it breaks things (for example Solaris 2.6 as
    reported by Tom G. Christensen).i  ok djm@

commit 2fee909c3cee2472a98b26eb82696297b81e0d38
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 17 09:48:15 2016 +1100

    Look for gethostbyname in libresolv and libnsl.
    
    Should fix build problem on Solaris 2.6 reported by Tom G. Christensen.

commit 5ac712d81a84396aab441a272ec429af5b738302
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 16 10:45:02 2016 +1100

    make existing ssh_malloc_init only for __OpenBSD__

commit 24c9bded569d9f2449ded73f92fb6d12db7a9eec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 15 23:32:37 2016 +0000

    upstream commit
    
    memleak of algorithm name in mm_answer_sign; reported by
     Jakub Jelen
    
    Upstream-ID: ccd742cd25952240ebd23d7d4d6b605862584d08

commit ffb1e7e896139a42ceb78676f637658f44612411
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Feb 15 09:47:49 2016 +0000

    upstream commit
    
    Add a function to enable security-related malloc_options.
      With and ok deraadt@, something similar has been in the snaps for a while.
    
    Upstream-ID: 43a95523b832b7f3b943d2908662191110c380ed

commit ef39e8c0497ff0564990a4f9e8b7338b3ba3507c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 16 10:34:39 2016 +1100

    sync ssh-copy-id with upstream 783ef08b0a75

commit d2d772f55b19bb0e8d03c2fe1b9bb176d9779efd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 12 00:20:30 2016 +0000

    upstream commit
    
    avoid fatal() for PKCS11 tokens that present empty key IDs
     bz#1773, ok markus@
    
    Upstream-ID: 044a764fee526f2c4a9d530bd10695422d01fc54

commit e4c918a6c721410792b287c9fd21356a1bed5805
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 11 02:56:32 2016 +0000

    upstream commit
    
    sync crypto algorithm lists in ssh_config(5) and
     sshd_config(5) with current reality. bz#2527
    
    Upstream-ID: d7fd1b6c1ed848d866236bcb1d7049d2bb9b2ff6

commit e30cabfa4ab456a30b3224f7f545f1bdfc4a2517
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 11 02:21:34 2016 +0000

    upstream commit
    
    fix regression in openssh-6.8 sftp client: existing
     destination directories would incorrectly terminate recursive uploads;
     bz#2528
    
    Upstream-ID: 3306be469f41f26758e3d447987ac6d662623e18

commit 714e367226ded4dc3897078be48b961637350b05
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 9 05:30:04 2016 +0000

    upstream commit
    
    turn off more old crypto in the client: hmac-md5, ripemd,
     truncated HMACs, RC4, blowfish. ok markus@ dtucker@
    
    Upstream-ID: 96aa11c2c082be45267a690c12f1d2aae6acd46e

commit 5a622844ff7f78dcb75e223399f9ef0977e8d0a3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 8 23:40:12 2016 +0000

    upstream commit
    
    don't attempt to percent_expand() already-canonicalised
     addresses, avoiding unnecessary failures when attempting to connect to scoped
     IPv6 addresses (that naturally contain '%' characters)
    
    Upstream-ID: f24569cffa1a7cbde5f08dc739a72f4d78aa5c6a

commit 19bcf2ea2d17413f2d9730dd2a19575ff86b9b6a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 8 10:57:07 2016 +0000

    upstream commit
    
    refactor activation of rekeying
    
    This makes automatic rekeying internal to the packet code (previously
    the server and client loops needed to assist). In doing to it makes
    application of rekey limits more accurate by accounting for packets
    about to be sent as well as packets queued during rekeying events
    themselves.
    
    Based on a patch from dtucker@ which was in turn based on a patch
    Aleksander Adamowski in bz#2521; ok markus@
    
    Upstream-ID: a441227fd64f9739850ca97b4cf794202860fcd8

commit 603ba41179e4b53951c7b90ee95b6ef3faa3f15d
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Fri Feb 5 13:28:19 2016 +0000

    upstream commit
    
    Only check errno if read() has returned an error.  EOF is
     not an error. This fixes a problem where the mux master would sporadically
     fail to notice that the client had exited. ok mikeb@ djm@
    
    Upstream-ID: 3c2dadc21fac6ef64665688aac8a75fffd57ae53

commit 56d7dac790693ce420d225119283bc355cff9185
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Fri Feb 5 04:31:21 2016 +0000

    upstream commit
    
    avoid an uninitialised value when NumberOfPasswordPrompts
     is 0 ok markus@ djm@
    
    Upstream-ID: 11b068d83c2865343aeb46acf1e9eec00f829b6b

commit deae7d52d59c5019c528f977360d87fdda15d20b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 5 03:07:06 2016 +0000

    upstream commit
    
    mention internal DH-GEX fallback groups; bz#2302
    
    Upstream-ID: e7b395fcca3122cd825515f45a2e41c9a157e09e

commit cac3b6665f884d46192c0dc98a64112e8b11a766
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 5 02:37:56 2016 +0000

    upstream commit
    
    better description for MaxSessions; bz#2531
    
    Upstream-ID: e2c0d74ee185cd1a3e9d4ca1f1b939b745b354da

commit 5ef4b0fdcc7a239577a754829b50022b91ab4712
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 27 17:45:56 2016 +1100

    avoid FreeBSD RCS Id in comment
    
    Change old $FreeBSD version string in comment so it doesn't
    become an RCS ident downstream; requested by des AT des.no

commit 696d12683c90d20a0a9c5f4275fc916b7011fb04
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 4 23:43:48 2016 +0000

    upstream commit
    
    printf argument casts to avoid warnings on strict
     compilers
    
    Upstream-ID: 7b9f6712cef01865ad29070262d366cf13587c9c

commit 5658ef2501e785fbbdf5de2dc33b1ff7a4dca73a
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Mon Feb 1 21:18:17 2016 +0000

    upstream commit
    
    Avoid ugly "DISPLAY "(null)" invalid; disabling X11
     forwarding" message when DISPLAY is not set.  This could also result in a
     crash on systems with a printf that doesn't handle NULL.  OK djm@
    
    Upstream-ID: 20ee0cfbda678a247264c20ed75362042b90b412

commit 537f88ec7bcf40bd444ac5584c707c5588c55c43
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 29 05:18:15 2016 +0000

    upstream commit
    
    Add regression test for RekeyLimit parsing of >32bit values
     (4G and 8G).
    
    Upstream-Regress-ID: 548390350c62747b6234f522a99c319eee401328

commit 4c6cb8330460f94e6c7ae28a364236d4188156a3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 29 23:04:46 2016 +0000

    upstream commit
    
    Remove leftover roaming dead code.  ok djm markus.
    
    Upstream-ID: 13d1f9c8b65a5109756bcfd3b74df949d53615be

commit 28136471809806d6246ef41e4341467a39fe2f91
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 29 05:46:01 2016 +0000

    upstream commit
    
    include packet type of non-data packets in debug3 output;
     ok markus dtucker
    
    Upstream-ID: 034eaf639acc96459b9c5ce782db9fcd8bd02d41

commit 6fd6e28daccafaa35f02741036abe64534c361a1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 29 03:31:03 2016 +0000

    upstream commit
    
    Revert "account for packets buffered but not yet
     processed" change as it breaks for very small RekeyLimit values due to
     continuous rekeying.  ok djm@
    
    Upstream-ID: 7e03f636cb45ab60db18850236ccf19079182a19

commit 921ff00b0ac429666fb361d2d6cb1c8fff0006cb
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 29 02:54:45 2016 +0000

    upstream commit
    
    Allow RekeyLimits in excess of 4G up to 2**63 bits
     (limited by the return type of scan_scaled).  Part of bz#2521, ok djm.
    
    Upstream-ID: 13bea82be566b9704821b1ea05bf7804335c7979

commit c0060a65296f01d4634f274eee184c0e93ba0f23
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Jan 29 02:42:46 2016 +0000

    upstream commit
    
    Account for packets buffered but not yet processed when
     computing whether or not it is time to perform rekeying.  bz#2521, based
     loosely on a patch from olo at fb.com, ok djm@
    
    Upstream-ID: 67e268b547f990ed220f3cb70a5624d9bda12b8c

commit 44cf930e670488c85c9efeb373fa5f4b455692ac
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 27 06:44:58 2016 +0000

    upstream commit
    
    change old $FreeBSD version string in comment so it doesn't
     become an RCS ident downstream; requested by des AT des.no
    
    Upstream-ID: 8ca558c01f184e596b45e4fc8885534b2c864722

commit ebacd377769ac07d1bf3c75169644336056b7060
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 27 00:53:12 2016 +0000

    upstream commit
    
    make the debug messages a bit more useful here
    
    Upstream-ID: 478ccd4e897e0af8486b294aa63aa3f90ab78d64

commit 458abc2934e82034c5c281336d8dc0f910aecad3
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Sat Jan 23 05:31:35 2016 +0000

    upstream commit
    
    Zero a stack buffer with explicit_bzero() instead of
     memset() when returning from client_loop() for consistency with
     buffer_free()/sshbuf_free().
    
    ok dtucker@ deraadt@ djm@
    
    Upstream-ID: bc9975b2095339811c3b954694d7d15ea5c58f66

commit 65a3c0dacbc7dbb75ddb6a70ebe22d8de084d0b0
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jan 20 09:22:39 2016 +0000

    upstream commit
    
    Include sys/time.h for gettimeofday.  From sortie at
     maxsi.org.
    
    Upstream-ID: 6ed0c33b836d9de0a664cd091e86523ecaa2fb3b

commit fc77ccdc2ce6d5d06628b8da5048a6a5f6ffca5a
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Jan 14 22:56:56 2016 +0000

    upstream commit
    
    fd leaks; report Qualys Security Advisory team; ok
     deraadt@
    
    Upstream-ID: 4ec0f12b9d8fa202293c9effa115464185aa071d

commit a306863831c57ec5fad918687cc5d289ee8e2635
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Jan 14 16:17:39 2016 +0000

    upstream commit
    
    remove roaming support; ok djm@
    
    Upstream-ID: 2cab8f4b197bc95776fb1c8dc2859dad0c64dc56

commit 6ef49e83e30688504552ac10875feabd5521565f
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Thu Jan 14 14:34:34 2016 +0000

    upstream commit
    
    Disable experimental client-side roaming support.  Server
     side was disabled/gutted for years already, but this aspect was surprisingly
     forgotten. Thanks for report from Qualys
    
    Upstream-ID: 2328004b58f431a554d4c1bf67f5407eae3389df

commit 8d7b523b96d3be180572d9d338cedaafc0570f60
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 14 11:08:19 2016 +1100

    bump version numbers

commit 8c3d512a1fac8b9c83b4d0c9c3f2376290bd84ca
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 14 11:04:04 2016 +1100

    openssh-7.1p2

commit e6c85f8889c5c9eb04796fdb76d2807636b9eef5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 15 01:30:36 2016 +1100

    forcibly disable roaming support in the client

commit ed4ce82dbfa8a3a3c8ea6fa0db113c71e234416c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 13 23:04:47 2016 +0000

    upstream commit
    
    eliminate fallback from untrusted X11 forwarding to trusted
     forwarding when the X server disables the SECURITY extension; Reported by
     Thomas Hoger; ok deraadt@
    
    Upstream-ID: f76195bd2064615a63ef9674a0e4096b0713f938

commit 9a728cc918fad67c8a9a71201088b1e150340ba4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 12 23:42:54 2016 +0000

    upstream commit
    
    use explicit_bzero() more liberally in the buffer code; ok
     deraadt
    
    Upstream-ID: 0ece37069fd66bc6e4f55eb1321f93df372b65bf

commit 4626cbaf78767fc8e9c86dd04785386c59ae0839
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 8 14:24:56 2016 +1100

    Support Illumos/Solaris fine-grained privileges
    
    Includes a pre-auth privsep sandbox and several pledge()
    emulations. bz#2511, patch by Alex Wilson.
    
    ok dtucker@

commit 422d1b3ee977ff4c724b597fb2e437d38fc8de9d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 31 00:33:52 2015 +0000

    upstream commit
    
    fix three bugs in KRL code related to (unused) signature
     support: verification length was being incorrectly calculated, multiple
     signatures were being incorrectly processed and a NULL dereference that
     occurred when signatures were verified. Reported by Carl Jackson
    
    Upstream-ID: e705e97ad3ccce84291eaa651708dd1b9692576b

commit 6074c84bf95d00f29cc7d5d3cd3798737851aa1a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Dec 30 23:46:14 2015 +0000

    upstream commit
    
    unused prototype
    
    Upstream-ID: f3eef4389d53ed6c0d5c77dcdcca3060c745da97

commit 6213f0e180e54122bb1ba928e11c784e2b4e5380
Author: guenther@openbsd.org <guenther@openbsd.org>
Date:   Sat Dec 26 20:51:35 2015 +0000

    upstream commit
    
    Use pread/pwrite instead separate lseek+read/write for
     lastlog. Cast to off_t before multiplication to avoid truncation on ILP32
    
    ok kettenis@ mmcc@
    
    Upstream-ID: fc40092568cd195719ddf1a00aa0742340d616cf

commit d7d2bc95045a43dd56ea696cc1d030ac9d77e81f
Author: semarie@openbsd.org <semarie@openbsd.org>
Date:   Sat Dec 26 07:46:03 2015 +0000

    upstream commit
    
    adjust pledge promises for ControlMaster: when using
     "ask" or "autoask", the process will use ssh-askpass for asking confirmation.
    
    problem found by halex@
    
    ok halex@
    
    Upstream-ID: 38a58b30ae3eef85051c74d3c247216ec0735f80

commit 271df8185d9689b3fb0523f58514481b858f6843
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 13 22:42:23 2015 +0000

    upstream commit
    
    unbreak connections with peers that set
     first_kex_follows; fix from Matt Johnston va bz#2515
    
    Upstream-ID: decc88ec4fc7515594fdb42b04aa03189a44184b

commit 43849a47c5f8687699eafbcb5604f6b9c395179f
Author: doug@openbsd.org <doug@openbsd.org>
Date:   Fri Dec 11 17:41:37 2015 +0000

    upstream commit
    
    Add "id" to ssh-agent pledge for subprocess support.
    
    Found the hard way by Jan Johansson when using ssh-agent with X.  Also,
    rearranged proc/exec and retval to match other pledge calls in the tree.
    
    ok djm@
    
    Upstream-ID: 914255f6850e5e7fa830a2de6c38605333b584db

commit 52d7078421844b2f88329f5be3de370b0a938636
Author: mmcc@openbsd.org <mmcc@openbsd.org>
Date:   Fri Dec 11 04:21:11 2015 +0000

    upstream commit
    
    Remove NULL-checks before sshbuf_free().
    
    ok djm@
    
    Upstream-ID: 5ebed00ed5f9f03b119a345085e8774565466917

commit a4b9e0f4e4a6980a0eb8072f76ea611cab5b77e7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 11 03:24:25 2015 +0000

    upstream commit
    
    include remote port number in a few more messages; makes
     tying log messages together into a session a bit easier; bz#2503 ok dtucker@
    
    Upstream-ID: 9300dc354015f7a7368d94a8ff4a4266a69d237e

commit 6091c362e89079397e68744ae30df121b0a72c07
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 11 03:20:09 2015 +0000

    upstream commit
    
    don't try to load SSHv1 private key when compiled without
     SSHv1 support. From Iain Morgan bz#2505
    
    Upstream-ID: 8b8e7b02a448cf5e5635979df2d83028f58868a7

commit cce6a36bb95e81fa8bfb46daf22eabcf13afc352
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 11 03:19:09 2015 +0000

    upstream commit
    
    use SSH_MAX_PUBKEY_BYTES consistently as buffer size when
     reading key files. Increase it to match the size of the buffers already being
     used.
    
    Upstream-ID: 1b60586b484b55a947d99a0b32bd25e0ced56fae

commit 89540b6de025b80404a0cb8418c06377f3f98848
Author: mmcc@openbsd.org <mmcc@openbsd.org>
Date:   Fri Dec 11 02:31:47 2015 +0000

    upstream commit
    
    Remove NULL-checks before sshkey_free().
    
    ok djm@
    
    Upstream-ID: 3e35afe8a25e021216696b5d6cde7f5d2e5e3f52

commit 79394ed6d74572c2d2643d73937dad33727fc240
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Dec 11 02:29:03 2015 +0000

    upstream commit
    
    fflush stdout so that output is seen even when running in
     debug mode when output may otherwise not be flushed.  Patch from dustin at
     null-ptr.net.
    
    Upstream-ID: b0c6b4cd2cdb01d7e9eefbffdc522e35b5bc4acc

commit ee607cccb6636eb543282ba90e0677b0604d8b7a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 15 15:23:49 2015 +1100

    Increase robustness of redhat/openssh.spec
    
     - remove configure --with-rsh, because this option isn't supported anymore
     - replace last occurrence of BuildPreReq by BuildRequires
     - update grep statement to query the krb5 include directory
    
    Patch from CarstenGrohmann via github, ok djm.

commit b5fa0cd73555b991a543145603658d7088ec6b60
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 15 15:10:32 2015 +1100

    Allow --without-ssl-engine with --without-openssl
    
    Patch from Mike Frysinger via github.

commit c1d7e546f6029024f3257cc25c92f2bddf163125
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 15 14:27:09 2015 +1100

    Include openssl crypto.h for SSLeay.
    
    Patch from doughdemon via github.

commit c6f5f01651526e88c00d988ce59d71f481ebac62
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 15 13:59:12 2015 +1100

    Add sys/time.h for gettimeofday.
    
    Should allow it it compile with MUSL libc.  Based on patch from
    doughdemon via github.

commit 39736be06c7498ef57d6970f2d85cf066ae57c82
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 11 02:20:28 2015 +0000

    upstream commit
    
    correct error messages; from Tomas Kuthan bz#2507
    
    Upstream-ID: 7454a0affeab772398052954c79300aa82077093

commit 94141b7ade24afceeb6762a3f99e09e47a6c42b6
Author: mmcc@openbsd.org <mmcc@openbsd.org>
Date:   Fri Dec 11 00:20:04 2015 +0000

    upstream commit
    
    Pass (char *)NULL rather than (char *)0 to execl and
     execlp.
    
    ok dtucker@
    
    Upstream-ID: 56c955106cbddba86c3dd9bbf786ac0d1b361492

commit d59ce08811bf94111c2f442184cf7d1257ffae24
Author: mmcc@openbsd.org <mmcc@openbsd.org>
Date:   Thu Dec 10 17:08:40 2015 +0000

    upstream commit
    
    Remove NULL-checks before free().
    
    ok dtucker@
    
    Upstream-ID: e3d3cb1ce900179906af36517b5eea0fb15e6ef8

commit 8e56dd46cb37879c73bce2d6032cf5e7f82d5a71
Author: mmcc@openbsd.org <mmcc@openbsd.org>
Date:   Thu Dec 10 07:01:35 2015 +0000

    upstream commit
    
    Fix a couple "the the" typos. ok dtucker@
    
    Upstream-ID: ec364c5af32031f013001fd28d1bd3dfacfe9a72

commit 6262a0522ddc2c0f2e9358dcb68d59b46e9c533e
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Dec 7 20:04:09 2015 +0000

    upstream commit
    
    stricter encoding type checks for ssh-rsa; ok djm@
    
    Upstream-ID: 8cca7c787599a5e8391e184d0b4f36fdc3665650

commit d86a3ba7af160c13496102aed861ae48a4297072
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 9 09:18:45 2015 +1100

    Don't set IPV6_V6ONLY on OpenBSD
    
    It isn't necessary and runs afoul of pledge(2) restrictions.

commit da98c11d03d819a15429d8fff9688acd7505439f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 7 02:20:46 2015 +0000

    upstream commit
    
    basic unit tests for rsa-sha2-* signature types
    
    Upstream-Regress-ID: 7dc4b9db809d578ff104d591b4d86560c3598d3c

commit 3da893fdec9936dd2c23739cdb3c0c9d4c59fca0
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Sat Dec 5 20:53:21 2015 +0000

    upstream commit
    
    prefer rsa-sha2-512 over -256 for hostkeys, too; noticed
     by naddy@
    
    Upstream-ID: 685f55f7ec566a8caca587750672723a0faf3ffe

commit 8b56e59714d87181505e4678f0d6d39955caf10e
Author: tobias@openbsd.org <tobias@openbsd.org>
Date:   Fri Dec 4 21:51:06 2015 +0000

    upstream commit
    
    Properly handle invalid %-format by calling fatal.
    
    ok deraadt, djm
    
    Upstream-ID: 5692bce7d9f6eaa9c488cb93d3b55e758bef1eac

commit 76c9fbbe35aabc1db977fb78e827644345e9442e
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Dec 4 16:41:28 2015 +0000

    upstream commit
    
    implement SHA2-{256,512} for RSASSA-PKCS1-v1_5 signatures
     (user and host auth) based on draft-rsa-dsa-sha2-256-03.txt and
     draft-ssh-ext-info-04.txt; with & ok djm@
    
    Upstream-ID: cf82ce532b2733e5c4b34bb7b7c94835632db309

commit 6064a8b8295cb5a17b5ebcfade53053377714f40
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 4 00:24:55 2015 +0000

    upstream commit
    
    clean up agent_fd handling; properly initialise it to -1
     and make tests consistent
    
    ok markus@
    
    Upstream-ID: ac9554323d5065745caf17b5e37cb0f0d4825707

commit b91926a97620f3e51761c271ba57aa5db790f48d
Author: semarie@openbsd.org <semarie@openbsd.org>
Date:   Thu Dec 3 17:00:18 2015 +0000

    upstream commit
    
    pledges ssh client:   - mux client: which is used when
     ControlMaster is in use.     will end with "stdio proc tty" (proc is to
     permit sending SIGWINCH to mux master on window resize)
    
      - client loop: several levels of pledging depending of your used options
    
    ok deraadt@
    
    Upstream-ID: 21676155a700e51f2ce911e33538e92a2cd1d94b

commit bcce47466bbc974636f588b5e4a9a18ae386f64a
Author: doug@openbsd.org <doug@openbsd.org>
Date:   Wed Dec 2 08:30:50 2015 +0000

    upstream commit
    
    Add "cpath" to the ssh-agent pledge so the cleanup
     handler can unlink().
    
    ok djm@
    
    Upstream-ID: 9e632991d48241d56db645602d381253a3d8c29d

commit a90d001543f46716b6590c6dcc681d5f5322f8cf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Dec 2 08:00:58 2015 +0000

    upstream commit
    
    ssh-agent pledge needs proc for askpass; spotted by todd@
    
    Upstream-ID: 349aa261b29cc0e7de47ef56167769c432630b2a

commit d952162b3c158a8f23220587bb6c8fcda75da551
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 1 23:29:24 2015 +0000

    upstream commit
    
    basic pledge() for ssh-agent, more refinement needed
    
    Upstream-ID: 5b5b03c88162fce549e45e1b6dd833f20bbb5e13

commit f0191d7c8e76e30551084b79341886d9bb38e453
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 30 10:53:25 2015 +1100

    Revert "stub for pledge(2) for systems that lack it"
    
    This reverts commit 14c887c8393adde2d9fd437d498be30f8c98535c.
    
    dtucker beat me to it :/

commit 6283cc72eb0e49a3470d30e07ca99a1ba9e89676
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 30 10:37:03 2015 +1100

    revert 7d4c7513: bring back S/Key prototypes
    
    (but leave RCSID changes)

commit 14c887c8393adde2d9fd437d498be30f8c98535c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 30 09:45:29 2015 +1100

    stub for pledge(2) for systems that lack it

commit 452c0b6af5d14c37553e30059bf74456012493f3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 29 22:18:37 2015 +0000

    upstream commit
    
    pledge, better fatal() messages; feedback deraadt@
    
    Upstream-ID: 3e00f6ccfe2b9a7a2d1dbba5409586180801488f

commit 6da413c085dba37127687b2617a415602505729b
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sat Nov 28 06:50:52 2015 +0000

    upstream commit
    
    do not leak temp file if there is no known_hosts file
     from craig leres, ok djm
    
    Upstream-ID: c820497fd5574844c782e79405c55860f170e426

commit 3ddd15e1b63a4d4f06c8ab16fbdd8a5a61764f16
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 30 07:23:53 2015 +1100

    Add a null implementation of pledge.
    
    Fixes builds on almost everything.

commit b1d6b3971ef256a08692efc409fc9ada719111cc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Nov 28 06:41:03 2015 +0000

    upstream commit
    
    don't include port number in tcpip-forward replies for
     requests that don't allocate a port; bz#2509 diagnosed by Ron Frederick ok
     markus
    
    Upstream-ID: 77efad818addb61ec638b5a2362f1554e21a970a

commit 9080bd0b9cf10d0f13b1f642f20cb84285cb8d65
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Nov 27 00:49:31 2015 +0000

    upstream commit
    
    pledge "stdio rpath wpath cpath fattr tty proc exec"
     except for the -p option (which sadly has insane semantics...) ok semarie
     dtucker
    
    Upstream-ID: 8854bbd58279abe00f6c33f8094bdc02c8c65059

commit 4d90625b229cf6b3551d81550a9861897509a65f
Author: halex@openbsd.org <halex@openbsd.org>
Date:   Fri Nov 20 23:04:01 2015 +0000

    upstream commit
    
    allow comment change for all supported formats
    
    ok djm@
    
    Upstream-ID: 5fc477cf2f119b2d44aa9c683af16cb00bb3744b

commit 8ca915fc761519dd1f7766a550ec597a81db5646
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 20 01:45:29 2015 +0000

    upstream commit
    
    add cast to make -Werror clean
    
    Upstream-ID: 288db4f8f810bd475be01320c198250a04ff064d

commit ac9473580dcd401f8281305af98635cdaae9bf96
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 20 12:35:41 2015 +1100

    fix multiple authentication using S/Key w/ privsep
    
    bz#2502, patch from Kevin Korb and feandil_

commit 88b6fcdeb87a2fb76767854d9eb15006662dca57
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 19 08:23:27 2015 +0000

    upstream commit
    
    ban ConnectionAttempts=0, it makes no sense and would cause
     ssh_connect_direct() to print an uninitialised stack variable; bz#2500
     reported by dvw AT phas.ubc.ca
    
    Upstream-ID: 32b5134c608270583a90b93a07b3feb3cbd5f7d5

commit 964ab3ee7a8f96bdbc963d5b5a91933d6045ebe7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 19 01:12:32 2015 +0000

    upstream commit
    
    trailing whitespace
    
    Upstream-ID: 31fe0ad7c4d08e87f1d69c79372f5e3c5cd79051

commit f96516d052dbe38561f6b92b0e4365d8e24bb686
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 19 01:09:38 2015 +0000

    upstream commit
    
    print host certificate contents at debug level
    
    Upstream-ID: 39354cdd8a2b32b308fd03f98645f877f540f00d

commit 499cf36fecd6040e30e2912dd25655bc574739a7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Nov 19 01:08:55 2015 +0000

    upstream commit
    
    move the certificate validity formatting code to
     sshkey.[ch]
    
    Upstream-ID: f05f7c78fab20d02ff1d5ceeda533ef52e8fe523

commit bcb7bc77bbb1535d1008c7714085556f3065d99d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 18 08:37:28 2015 +0000

    upstream commit
    
    fix "ssh-keygen -l" of private key, broken in support for
     multiple plain keys on stdin
    
    Upstream-ID: 6b3132d2c62d03d0bad6f2bcd7e2d8b7dab5cd9d

commit 259adb6179e23195c8f6913635ea71040d1ccd63
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Mon Nov 16 23:47:52 2015 +0000

    upstream commit
    
    Replace remaining calls to index(3) with strchr(3).  OK
     jca@ krw@
    
    Upstream-ID: 33837d767a0cf1db1489b96055f9e330bc0bab6d

commit c56a255162c2166884539c0a1f7511575325b477
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 16 22:53:07 2015 +0000

    upstream commit
    
    Allow fingerprinting from standard input "ssh-keygen -lf
     -"
    
    Support fingerprinting multiple plain keys in a file and authorized_keys
    files too (bz#1319)
    
    ok markus@
    
    Upstream-ID: 903f8b4502929d6ccf53509e4e07eae084574b77

commit 5b4010d9b923cf1b46c9c7b1887c013c2967e204
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 16 22:51:05 2015 +0000

    upstream commit
    
    always call privsep_preauth_child() regardless of whether
     sshd was started by root; it does important priming before sandboxing and
     failing to call it could result in sandbox violations later; ok markus@
    
    Upstream-ID: c8a6d0d56c42f3faab38460dc917ca0d1705d383

commit 3a9f84b58b0534bbb485f1eeab75665e2d03371f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 16 22:50:01 2015 +0000

    upstream commit
    
    improve sshkey_read() semantics; only update *cpp when a
     key is successfully read; ok markus@
    
    Upstream-ID: f371e78e8f4fab366cf69a42bdecedaed5d1b089

commit db6f8dc5dd5655b59368efd074994d4568bc3556
Author: logan@openbsd.org <logan@openbsd.org>
Date:   Mon Nov 16 06:13:04 2015 +0000

    upstream commit
    
    1) Use xcalloc() instead of xmalloc() to check for
     potential overflow.    (Feedback from both mmcc@ and djm@) 2) move set_size
     just before the for loop. (suggested by djm@)
    
    OK djm@
    
    Upstream-ID: 013534c308187284756c3141f11d2c0f33c47213

commit 383f10fb84a0fee3c01f9d97594f3e22aa3cd5e0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 16 00:30:02 2015 +0000

    upstream commit
    
    Add a new authorized_keys option "restrict" that
     includes all current and future key restrictions (no-*-forwarding, etc). Also
     add permissive versions of the existing restrictions, e.g. "no-pty" -> "pty".
     This simplifies the task of setting up restricted keys and ensures they are
     maximally-restricted, regardless of any permissions we might implement in the
     future.
    
    Example:
    
    restrict,pty,command="nethack" ssh-ed25519 AAAAC3NzaC1lZDI1...
    
    Idea from Jann Horn; ok markus@
    
    Upstream-ID: 04ceb9d448e46e67e13887a7ae5ea45b4f1719d0

commit e41a071f7bda6af1fb3f081bed0151235fa61f15
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sun Nov 15 23:58:04 2015 +0000

    upstream commit
    
    correct section number for ssh-agent;
    
    Upstream-ID: 44be72fd8bcc167635c49b357b1beea8d5674bd6

commit 1a11670286acddcc19f5eff0966c380831fc4638
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sun Nov 15 23:54:15 2015 +0000

    upstream commit
    
    do not confuse mandoc by presenting "Dd";
    
    Upstream-ID: 1470fce171c47b60bbc7ecd0fc717a442c2cfe65

commit f361df474c49a097bfcf16d1b7b5c36fcd844b4b
Author: jcs@openbsd.org <jcs@openbsd.org>
Date:   Sun Nov 15 22:26:49 2015 +0000

    upstream commit
    
    Add an AddKeysToAgent client option which can be set to
     'yes', 'no', 'ask', or 'confirm', and defaults to 'no'.  When enabled, a
     private key that is used during authentication will be added to ssh-agent if
     it is running (with confirmation enabled if set to 'confirm').
    
    Initial version from Joachim Schipper many years ago.
    
    ok markus@
    
    Upstream-ID: a680db2248e8064ec55f8be72d539458c987d5f4

commit d87063d9baf5479b6e813d47dfb694a97df6f6f5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 13 04:39:35 2015 +0000

    upstream commit
    
    send SSH2_MSG_UNIMPLEMENTED replies to unexpected
     messages during KEX; bz#2949, ok dtucker@
    
    Upstream-ID: 2b3abdff344d53c8d505f45c83a7b12e84935786

commit 9fd04681a1e9b0af21e08ff82eb674cf0a499bfc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 13 04:38:06 2015 +0000

    upstream commit
    
    Support "none" as an argument for sshd_config
     ForceCommand and ChrootDirectory. Useful inside Match blocks to override a
     global default. bz#2486 ok dtucker@
    
    Upstream-ID: 7ef478d6592bc7db5c7376fc33b4443e63dccfa5

commit 94bc0b72c29e511cbbc5772190d43282e5acfdfe
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 13 04:34:15 2015 +0000

    upstream commit
    
    support multiple certificates (one per line) and
     reading from standard input (using "-f -") for "ssh-keygen -L"; ok dtucker@
    
    Upstream-ID: ecbadeeef3926e5be6281689b7250a32a80e88db

commit b6b9108f5b561c83612cb97ece4134eb59fde071
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 13 02:57:46 2015 +0000

    upstream commit
    
    list a couple more options usable in Match blocks;
     bz#2489
    
    Upstream-ID: e4d03f39d254db4c0cc54101921bb89fbda19879

commit a7994b3f5a5a5a33b52b0a6065d08e888f0a99fb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 11 04:56:39 2015 +0000

    upstream commit
    
    improve PEEK/POKE macros: better casts, don't multiply
     evaluate arguments; ok deraadt@
    
    Upstream-ID: 9a1889e19647615ededbbabab89064843ba92d3e

commit 7d4c7513a7f209cb303a608ac6e46b3f1dfc11ec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Nov 11 01:48:01 2015 +0000

    upstream commit
    
    remove prototypes for long-gone s/key support; ok
     dtucker@
    
    Upstream-ID: db5bed3c57118af986490ab23d399df807359a79

commit 07889c75926c040b8e095949c724e66af26441cb
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 14 18:44:49 2015 +1100

    read back from libcrypto RAND when privdropping
    
    makes certain libcrypto implementations cache a /dev/urandom fd
    in preparation of sandboxing. Based on patch by Greg Hartman.

commit 1560596f44c01bb0cef977816410950ed17b8ecd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 10 11:14:47 2015 +1100

    Fix compiler warnings in the openssl header check.
    
    Noted by Austin English.

commit e72a8575ffe1d8adff42c9abe9ca36938acc036b
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sun Nov 8 23:24:03 2015 +0000

    upstream commit
    
    -c before -H, in SYNOPSIS and usage();
    
    Upstream-ID: 25e8c58a69e1f37fcd54ac2cd1699370acb5e404

commit 3a424cdd21db08c7b0ded902f97b8f02af5aa485
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 8 22:30:20 2015 +0000

    upstream commit
    
    Add "ssh-keyscan -c ..." flag to allow fetching
     certificates instead of plain keys; ok markus@
    
    Upstream-ID: 0947e2177dba92339eced9e49d3c5bf7dda69f82

commit 69fead5d7cdaa73bdece9fcba80f8e8e70b90346
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sun Nov 8 22:08:38 2015 +0000

    upstream commit
    
    remove slogin links; ok deraadt markus djm
    
    Upstream-ID: 39ba08548acde4c54f2d4520c202c2a863a3c730

commit 2fecfd486bdba9f51b3a789277bb0733ca36e1c0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Nov 8 21:59:11 2015 +0000

    upstream commit
    
    fix OOB read in packet code caused by missing return
     statement found by Ben Hawkes; ok markus@ deraadt@
    
    Upstream-ID: a3e3a85434ebfa0690d4879091959591f30efc62

commit 5e288923a303ca672b686908320bc5368ebec6e6
Author: mmcc@openbsd.org <mmcc@openbsd.org>
Date:   Fri Nov 6 00:31:41 2015 +0000

    upstream commit
    
    1. rlogin and rsh are long gone 2. protocol version isn't
     of core relevance here, and v1 is going away
    
    ok markus@, deraadt@
    
    Upstream-ID: 8b46bc94cf1ca7c8c1a75b1c958b2bb38d7579c8

commit 8b29008bbe97f33381d9b4b93fcfa304168d0286
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Nov 5 09:48:05 2015 +0000

    upstream commit
    
    "commandline" -> "command line", since there are so few
     examples of the former in the pages, so many of the latter, and in some of
     these pages we had multiple spellings;
    
    prompted by tj
    
    Upstream-ID: 78459d59bff74223f8139d9001ccd56fc4310659

commit 996b24cebf20077fbe5db07b3a2c20c2d9db736e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 29 20:57:34 2015 +1100

    (re)wrap SYS_sendsyslog in ifdef.
    
    Replace ifdef that went missing in commit
    c61b42f2678f21f05653ac2d3d241b48ab5d59ac.  Fixes build on older
    OpenBSDs.

commit b67e2e76fcf1ae7c802eb27ca927e16c91a513ff
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 29 08:05:17 2015 +0000

    upstream commit
    
    regress test for "PubkeyAcceptedKeyTypes +..." inside a
     Match block
    
    Upstream-Regress-ID: 246c37ed64a2e5704d4c158ccdca1ff700e10647

commit abd9dbc3c0d8c8c7561347cfa22166156e78c077
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Oct 26 02:50:58 2015 +0000

    upstream commit
    
    Fix typo certopt->certopts in shell variable.  This would
     cause the test to hang at a host key prompt if you have an A or CNAME for
     "proxy" in your local domain.
    
    Upstream-Regress-ID: 6ea03bcd39443a83c89e2c5606392ceb9585836a

commit ed08510d38aef930a061ae30d10f2a9cf233bafa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 29 08:05:01 2015 +0000

    upstream commit
    
    Fix "PubkeyAcceptedKeyTypes +..." inside a Match block;
     ok dtucker@
    
    Upstream-ID: 853662c4036730b966aab77684390c47b9738c69

commit a4aef3ed29071719b2af82fdf1ac3c2514f82bc5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 27 08:54:52 2015 +0000

    upstream commit
    
    fix execv arguments in a way less likely to cause grief
     for -portable; ok dtucker@
    
    Upstream-ID: 5902bf0ea0371f39f1300698dc3b8e4105fc0fc5

commit 63d188175accea83305e89fafa011136ff3d96ad
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 27 01:44:45 2015 +0000

    upstream commit
    
    log certificate serial in verbose() messages to match the
     main auth success/fail message; ok dtucker@
    
    Upstream-ID: dfc48b417c320b97c36ff351d303c142f2186288

commit 2aaba0cfd560ecfe92aa50c00750e6143842cf1f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 27 00:49:53 2015 +0000

    upstream commit
    
    avoid de-const warning & shrink; ok dtucker@
    
    Upstream-ID: 69a85ef94832378952a22c172009cbf52aaa11db

commit 03239c18312b9bab7d1c3b03062c61e8bbc1ca6e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Oct 25 23:42:00 2015 +0000

    upstream commit
    
    Expand tildes in filenames passed to -i before checking
     whether or not the identity file exists.  This means that if the shell
     doesn't do the expansion (eg because the option and filename were given as a
     single argument) then we'll still add the key.  bz#2481, ok markus@
    
    Upstream-ID: db1757178a14ac519e9a3e1a2dbd21113cb3bfc6

commit 97e184e508dd33c37860c732c0eca3fc57698b40
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Sun Oct 25 23:14:03 2015 +0000

    upstream commit
    
    Do not prepend "exec" to the shell command run by "Match
     exec" in a config file.  It's an unnecessary optimization from repurposed
     ProxyCommand code and prevents some things working with some shells.
     bz#2471, pointed out by res at qoxp.net.  ok markus@
    
    Upstream-ID: a1ead25ae336bfa15fb58d8c6b5589f85b4c33a3

commit 8db134e7f457bcb069ec72bc4ee722e2af557c69
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 29 10:48:23 2015 +1100

    Prevent name collisions with system glob (bz#2463)
    
    Move glob.h from includes.h to the only caller (sftp) and override the
    names for the symbols.  This prevents name collisions with the system glob
    in the case where something other than ssh uses it (eg kerberos).  With
    jjelen at redhat.com, ok djm@

commit 86c10dbbef6a5800d2431a66cf7f41a954bb62b5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Oct 23 02:22:01 2015 +0000

    upstream commit
    
    Update expected group sizes to match recent code changes.
    
    Upstream-Regress-ID: 0004f0ea93428969fe75bcfff0d521c553977794

commit 9ada37d36003a77902e90a3214981e417457cf13
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Oct 24 22:56:19 2015 +0000

    upstream commit
    
    fix keyscan output for multiple hosts/addrs on one line
     when host hashing or a non standard port is in use; bz#2479 ok dtucker@
    
    Upstream-ID: 5321dabfaeceba343da3c8a8b5754c6f4a0a307b

commit 44fc7cd7dcef6c52c6b7e9ff830dfa32879bd319
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Oct 24 22:52:22 2015 +0000

    upstream commit
    
    skip "Could not chdir to home directory" message when
     chrooted
    
    patch from Christian Hesse in bz#2485 ok dtucker@
    
    Upstream-ID: 86783c1953da426dff5b03b03ce46e699d9e5431

commit a820a8618ec44735dabc688fab96fba38ad66bb2
Author: sthen@openbsd.org <sthen@openbsd.org>
Date:   Sat Oct 24 08:34:09 2015 +0000

    upstream commit
    
    Handle the split of tun(4) "link0" into tap(4) in ssh
     tun-forwarding. Adapted from portable (using separate devices for this is the
     normal case in most OS). ok djm@
    
    Upstream-ID: 90facf4c59ce73d6741db1bc926e578ef465cd39

commit 66d2e229baa9fe57b868c373b05f7ff3bb20055b
Author: gsoares@openbsd.org <gsoares@openbsd.org>
Date:   Wed Oct 21 11:33:03 2015 +0000

    upstream commit
    
    fix memory leak in error path ok djm@
    
    Upstream-ID: dd2f402b0a0029b755df029fc7f0679e1365ce35

commit 7d6c0362039ceacdc1366b5df29ad5d2693c13e5
Author: mmcc@openbsd.org <mmcc@openbsd.org>
Date:   Tue Oct 20 23:24:25 2015 +0000

    upstream commit
    
    Compare pointers to NULL rather than 0.
    
    ok djm@
    
    Upstream-ID: 21616cfea27eda65a06e772cc887530b9a1a27f8

commit f98a09cacff7baad8748c9aa217afd155a4d493f
Author: mmcc@openbsd.org <mmcc@openbsd.org>
Date:   Tue Oct 20 03:36:35 2015 +0000

    upstream commit
    
    Replace a function-local allocation with stack memory.
    
    ok djm@
    
    Upstream-ID: c09fbbab637053a2ab9f33ca142b4e20a4c5a17e

commit ac908c1eeacccfa85659594d92428659320fd57e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 22 09:35:24 2015 +1100

    turn off PrintLastLog when --disable-lastlog
    
    bz#2278 from Brent Paulson

commit b56deb847f4a0115a8bf488bf6ee8524658162fd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 16 22:32:22 2015 +0000

    upstream commit
    
    increase the minimum modulus that we will send or accept in
     diffie-hellman-group-exchange to 2048 bits; ok markus@
    
    Upstream-ID: 06dce7a24c17b999a0f5fadfe95de1ed6a1a9b6a

commit 5ee0063f024bf5b3f3ffb275b8cd20055d62b4b9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Oct 16 18:40:49 2015 +0000

    upstream commit
    
    better handle anchored FQDNs (e.g. 'cvs.openbsd.org.') in
     hostname canonicalisation - treat them as already canonical and remove the
     trailing '.' before matching ssh_config; ok markus@
    
    Upstream-ID: f7619652e074ac3febe8363f19622aa4853b679a

commit e92c499a75477ecfe94dd7b4aed89f20b1fac5a7
Author: mmcc@openbsd.org <mmcc@openbsd.org>
Date:   Fri Oct 16 17:07:24 2015 +0000

    upstream commit
    
    0 -> NULL when comparing with a char*.
    
    ok dtucker@, djm@.
    
    Upstream-ID: a928e9c21c0a9020727d99738ff64027c1272300

commit b1d38a3cc6fe349feb8d16a5f520ef12d1de7cb2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 15 23:51:40 2015 +0000

    upstream commit
    
    fix some signed/unsigned integer type mismatches in
     format strings; reported by Nicholas Lemonias
    
    Upstream-ID: 78cd55420a0eef68c4095bdfddd1af84afe5f95c

commit 1a2663a15d356bb188196b6414b4c50dc12fd42b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Oct 15 23:08:23 2015 +0000

    upstream commit
    
    argument to sshkey_from_private() and sshkey_demote()
     can't be NULL
    
    Upstream-ID: 0111245b1641d387977a9b38da15916820a5fd1f

commit 0f754e29dd3760fc0b172c1220f18b753fb0957e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 16 10:53:14 2015 +1100

    need va_copy before va_start
    
    reported by Nicholas Lemonias

commit eb6c50d82aa1f0d3fc95f5630ea69761e918bfcd
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 15 15:48:28 2015 -0700

    fix compilation on systems without SYMLOOP_MAX

commit fafe1d84a210fb3dae7744f268059cc583db8c12
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 14 09:22:15 2015 -0700

    s/SANDBOX_TAME/SANDBOX_PLEDGE/g

commit 8f22911027ff6c17d7226d232ccd20727f389310
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 14 08:28:19 2015 +1100

    upstream commit
    
    revision 1.20
    date: 2015/10/13 20:55:37;  author: millert;  state: Exp;  lines: +2 -2;  commitid: X39sl5ay1czgFIgp;
    In rev 1.15 the sizeof argument was fixed in a strlcat() call but
    the truncation check immediately following it was not updated to
    match.  Not an issue in practice since the buffers are the same
    size.  OK deraadt@

commit 23fa695bb735f54f04d46123662609edb6c76767
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 14 08:27:51 2015 +1100

    upstream commit
    
    revision 1.19
    date: 2015/01/16 16:48:51;  author: deraadt;  state: Exp;  lines: +3 -3;  commitid: 0DYulI8hhujBHMcR;
    Move to the <limits.h> universe.
    review by millert, binary checking process with doug, concept with guenther

commit c71be375a69af00c2d0a0c24d8752bec12d8fd1b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 14 08:27:08 2015 +1100

    upstream commit
    
    revision 1.18
    date: 2014/10/19 03:56:28;  author: doug;  state: Exp;  lines: +9 -9;  commitid: U6QxmtbXrGoc02S5;
    Revert last commit due to changed semantics found by make release.

commit c39ad23b06e9aecc3ff788e92f787a08472905b1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 14 08:26:24 2015 +1100

    upstream commit
    
    revision 1.17
    date: 2014/10/18 20:43:52;  author: doug;  state: Exp;  lines: +10 -10;  commitid: I74hI1tVZtsspKEt;
    Better POSIX compliance in realpath(3).
    
    millert@ made changes to realpath.c based on FreeBSD's version.  I merged
    Todd's changes into dl_realpath.c.
    
    ok millert@, guenther@

commit e929a43f957dbd1254aca2aaf85c8c00cbfc25f4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 14 08:25:55 2015 +1100

    upstream commit
    
    revision 1.16
    date: 2013/04/05 12:59:54;  author: kurt;  state: Exp;  lines: +3 -1;
    - Add comments regarding copies of these files also in libexec/ld.so
    okay guenther@

commit 5225db68e58a1048cb17f0e36e0d33bc4a8fc410
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 14 08:25:32 2015 +1100

    upstream commit
    
    revision 1.15
    date: 2012/09/13 15:39:05;  author: deraadt;  state: Exp;  lines: +2 -2;
    specify the bounds of the dst to strlcat (both values were static and
    equal, but it is more correct)
    from Michal Mazurek

commit 7365fe5b4859de2305e40ea132da3823830fa710
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 14 08:25:09 2015 +1100

    upstream commit
    
    revision 1.14
    date: 2011/07/24 21:03:00;  author: miod;  state: Exp;  lines: +35 -13;
    Recent Single Unix will malloc memory if the second argument of realpath()
    is NULL, and third-party software is starting to rely upon this.
    Adapted from FreeBSD via Jona Joachim (jaj ; hcl-club , .lu), with minor
    tweaks from nicm@ and yours truly.

commit e679c09cd1951f963793aa3d9748d1c3fdcf808f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 13 16:15:21 2015 +0000

    upstream commit
    
    apply PubkeyAcceptedKeyTypes filtering earlier, so all
     skipped keys are noted before pubkey authentication starts. ok dtucker@
    
    Upstream-ID: ba4f52f54268a421a2a5f98bb375403f4cb044b8

commit 179c353f564ec7ada64b87730b25fb41107babd7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 13 00:21:27 2015 +0000

    upstream commit
    
    free the correct IV length, don't assume it's always the
     cipher blocksize; ok dtucker@
    
    Upstream-ID: c260d9e5ec73628d9ff4b067fbb060eff5a7d298

commit 2539dce2a049a8f6bb0d44cac51f07ad48e691d3
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Oct 9 01:37:08 2015 +0000

    upstream commit
    
    Change all tame callers to namechange to pledge(2).
    
    Upstream-ID: 17e654fc27ceaf523c60f4ffd9ec7ae4e7efc7f2

commit 9846a2f4067383bb76b4e31a9d2303e0a9c13a73
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 8 04:30:48 2015 +1100

    hook tame(2) sandbox up to build
    
    OpenBSD only for now

commit 0c46bbe68b70bdf0d6d20588e5847e71f3739fe6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 7 15:59:12 2015 +0000

    upstream commit
    
    include PubkeyAcceptedKeyTypes in ssh -G config dump
    
    Upstream-ID: 6c097ce6ffebf6fe393fb7988b5d152a5d6b36bb

commit bdcb73fb7641b1cf73c0065d1a0dd57b1e8b778e
Author: sobrado@openbsd.org <sobrado@openbsd.org>
Date:   Wed Oct 7 14:45:30 2015 +0000

    upstream commit
    
    UsePrivilegeSeparation defaults to sandbox now.
    
    ok djm@
    
    Upstream-ID: bff136c38bcae89df82e044d2f42de21e1ad914f

commit 2905d6f99c837bb699b6ebc61711b19acd030709
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 7 00:54:06 2015 +0000

    upstream commit
    
    don't try to change tun device flags if they are already
     what we need; makes it possible to use tun/tap networking as non- root user
     if device permissions and interface flags are pre-established; based on patch
     by Ossi Herrala
    
    Upstream-ID: 89099ac4634cd477b066865acf54cb230780fd21

commit 0dc74512bdb105b048883f07de538b37e5e024d4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 5 18:33:05 2015 -0700

    unbreak merge botch

commit fdd020e86439afa7f537e2429d29d4b744c94331
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Oct 6 01:20:59 2015 +0000

    upstream commit
    
    adapt to recent sshkey_parse_private_fileblob() API
     change
    
    Upstream-Regress-ID: 5c0d818da511e33e0abf6a92a31bd7163b7ad988

commit 21ae8ee3b630b0925f973db647a1b9aa5fcdd4c5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 24 07:15:39 2015 +0000

    upstream commit
    
    fix command-line option to match what was actually
     committed
    
    Upstream-Regress-ID: 3e8c24a2044e8afd37e7ce17b69002ca817ac699

commit e14ac43b75e68f1ffbd3e1a5e44143c8ae578dcd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 24 06:16:53 2015 +0000

    upstream commit
    
    regress test for CertificateFile; patch from Meghana Bhat
     via bz#2436
    
    Upstream-Regress-ID: e7a6e980cbe0f8081ba2e83de40d06c17be8bd25

commit 905b054ed24e0d5b4ef226ebf2c8bfc02ae6d4ad
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 5 17:11:21 2015 +0000

    upstream commit
    
    some more bzero->explicit_bzero, from Michael McConville
    
    Upstream-ID: 17f19545685c33327db2efdc357c1c9225ff00d0

commit b007159a0acdbcf65814b3ee05dbe2cf4ea46011
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Oct 2 15:52:55 2015 +0000

    upstream commit
    
    fix email
    
    Upstream-ID: 72150f2d54b94de14ebef1ea054ef974281bf834

commit b19e1b4ab11884c4f62aee9f8ab53127a4732658
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Oct 2 01:39:52 2015 +0000

    upstream commit
    
    a sandbox using tame ok djm
    
    Upstream-ID: 4ca24e47895e72f5daaa02f3e3d3e5ca2d820fa3

commit c61b42f2678f21f05653ac2d3d241b48ab5d59ac
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Oct 2 01:39:26 2015 +0000

    upstream commit
    
    re-order system calls in order of risk, ok i'll be
     honest, ordered this way they look like tame... ok djm
    
    Upstream-ID: 42a1e6d251fd8be13c8262bee026059ae6328813

commit c5f7c0843cb6e6074a93c8ac34e49ce33a6f5546
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Sep 25 18:19:54 2015 +0000

    upstream commit
    
    some certificatefile tweaks; ok djm
    
    Upstream-ID: 0e5a7852c28c05fc193419cc7e50e64c1c535af0

commit 4e44a79a07d4b88b6a4e5e8c1bed5f58c841b1b8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Sep 24 06:15:11 2015 +0000

    upstream commit
    
    add ssh_config CertificateFile option to explicitly list
     a certificate; patch from Meghana Bhat on bz#2436; ok markus@
    
    Upstream-ID: 58648ec53c510b41c1f46d8fe293aadc87229ab8

commit e3cbb06ade83c72b640a53728d362bbefa0008e2
Author: sobrado@openbsd.org <sobrado@openbsd.org>
Date:   Tue Sep 22 08:33:23 2015 +0000

    upstream commit
    
    fix two typos.
    
    Upstream-ID: 424402c0d8863a11b51749bacd7f8d932083b709

commit 8408218c1ca88cb17d15278174a24a94a6f65fe1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Sep 21 04:31:00 2015 +0000

    upstream commit
    
    fix possible hang on closed output; bz#2469 reported by Tomas
     Kuthan ok markus@
    
    Upstream-ID: f7afd41810f8540f524284f1be6b970859f94fe3

commit 0097248f90a00865082e8c146b905a6555cc146f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 11 04:55:01 2015 +0000

    upstream commit
    
    skip if running as root; many systems (inc OpenBSD) allow
     root to ptrace arbitrary processes
    
    Upstream-Regress-ID: be2b925df89360dff36f972951fa0fa793769038

commit 9c06c814aff925e11a5cc592c06929c258a014f6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 11 03:44:21 2015 +0000

    upstream commit
    
    try all supported key types here; bz#2455 reported by
     Jakub Jelen
    
    Upstream-Regress-ID: 188cb7d9031cdbac3a0fa58b428b8fa2b2482bba

commit 3c019a936b43f3e2773f3edbde7c114d73caaa4c
Author: tim@openbsd.org <tim@openbsd.org>
Date:   Sun Sep 13 14:39:16 2015 +0000

    upstream commit
    
    - Fix error message: passphrase needs to be at least 5
     characters, not 4. - Remove unused function argument. - Remove two
     unnecessary variables.
    
    OK djm@
    
    Upstream-ID: 13010c05bfa8b523da1c0dc19e81dd180662bc30

commit 2681cdb6e0de7c1af549dac37a9531af202b4434
Author: tim@openbsd.org <tim@openbsd.org>
Date:   Sun Sep 13 13:48:19 2015 +0000

    upstream commit
    
    When adding keys to the agent, don't ignore the comment
     of keys for which the user is prompted for a passphrase.
    
    Tweak and OK djm@
    
    Upstream-ID: dc737c620a5a8d282cc4f66e3b9b624e9abefbec

commit 14692f7b8251cdda847e648a82735eef8a4d2a33
Author: guenther@openbsd.org <guenther@openbsd.org>
Date:   Fri Sep 11 08:50:04 2015 +0000

    upstream commit
    
    Use explicit_bzero() when zeroing before free()
    
    from Michael McConville (mmcconv1 (at) sccs.swarthmore.edu)
    ok millert@ djm@
    
    Upstream-ID: 2e3337db046c3fe70c7369ee31515ac73ec00f50

commit 846f6fa4cfa8483a9195971dbdd162220f199d85
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Sep 11 06:55:46 2015 +0000

    upstream commit
    
    sync -Q in usage() to SYNOPSIS; since it's drastically
     shorter, i've reformatted the block to sync with the man (80 cols) and saved
     a line;
    
    Upstream-ID: 86e2c65c3989a0777a6258a77e589b9f6f354abd

commit 95923e0520a8647417ee6dcdff44694703dfeef0
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Sep 11 06:51:39 2015 +0000

    upstream commit
    
    tweak previous;
    
    Upstream-ID: f29b3cfcfd9aa31fa140c393e7bd48c1c74139d6

commit 86ac462f833b05d8ed9de9c50ccb295d7faa79ff
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 11 05:27:02 2015 +0000

    upstream commit
    
    Update usage to match man page.
    
    Upstream-ID: 9e85aefaecfb6aaf34c7cfd0700cd21783a35675

commit 674b3b68c1d36b2562324927cd03857b565e05e8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 11 03:47:28 2015 +0000

    upstream commit
    
    expand %i in ControlPath to UID; bz#2449
    
    patch from Christian Hesse w/ feedback from dtucker@
    
    Upstream-ID: 2ba8d303e555a84e2f2165ab4b324b41e80ab925

commit c0f55db7ee00c8202b05cb4b9ad4ce72cc45df41
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 11 03:42:32 2015 +0000

    upstream commit
    
    mention -Q key-plain and -Q key-cert; bz#2455 pointed out
     by Jakub Jelen
    
    Upstream-ID: c8f1f8169332e4fa73ac96b0043e3b84e01d4896

commit cfffbdb10fdf0f02d3f4232232eef7ec3876c383
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 14 16:24:21 2015 +1000

    Use ssh-keygen -A when generating host keys.
    
    Use ssh-keygen -A instead of per-keytype invocations when generating host
    keys.  Add tests when doing host-key-force since we can't use ssh-keygen -A
    since it can't specify alternate locations.  bz#2459, ok djm@

commit 366bada1e9e124654aac55b72b6ccf878755b0dc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 11 13:29:22 2015 +1000

    Correct default value for --with-ssh1.
    
    bz#2457, from konto-mindrot.org at walimnieto.com.

commit 2bca8a43e7dd9b04d7070824ffebb823c72587b2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 11 03:13:36 2015 +0000

    upstream commit
    
    more clarity on what AuthorizedKeysFile=none does; based
     on diff by Thiebaud Weksteen
    
    Upstream-ID: 78ab87f069080f0cc3bc353bb04eddd9e8ad3704

commit 61942ea4a01e6db4fdf37ad61de81312ffe310e9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 9 00:52:44 2015 +0000

    upstream commit
    
    openssh_RSA_verify return type is int, so don't make it
     size_t within the function itself with only negative numbers or zero assigned
     to it. bz#2460
    
    Upstream-ID: b6e794b0c7fc4f9f329509263c8668d35f83ea55

commit 4f7cc2f8cc861a21e6dbd7f6c25652afb38b9b96
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Sep 4 08:21:47 2015 +0000

    upstream commit
    
    Plug minor memory leaks when options are used more than
     once.  bz#2182, patch from Tiago Cunha, ok deraadt djm
    
    Upstream-ID: 5b84d0401e27fe1614c10997010cc55933adb48e

commit 7ad8b287c8453a3e61dbc0d34d467632b8b06fc8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 11 13:11:02 2015 +1000

    Force resolution of _res for correct detection.
    
    bz#2259, from sconeu at yahoo.com.

commit 26ad18247213ff72b4438abe7fc660c958810fa2
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 10 10:57:41 2015 +1000

    allow getrandom syscall; from Felix von Leitner

commit 5245bc1e6b129a10a928f73f11c3aa32656c44b4
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Sep 4 06:40:45 2015 +0000

    upstream commit
    
    full stop belongs outside the brackets, not inside;
    
    Upstream-ID: 99d098287767799ac33d2442a05b5053fa5a551a

commit a85768a9321d74b41219eeb3c9be9f1702cbf6a5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 4 04:56:09 2015 +0000

    upstream commit
    
    add a debug2() right before DNS resolution; it's a place
     where ssh could previously silently hang for a while. bz#2433
    
    Upstream-ID: 52a1a3e0748db66518e7598352c427145692a6a0

commit 46152af8d27aa34d5d26ed1c371dc8aa142d4730
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 4 04:55:24 2015 +0000

    upstream commit
    
    correct function name in error messages
    
    Upstream-ID: 92fb2798617ad9561370897f4ab60adef2ff4c0e

commit a954cdb799a4d83c2d40fbf3e7b9f187fbfd72fc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 4 04:47:50 2015 +0000

    upstream commit
    
    better document ExitOnForwardFailure; bz#2444, ok
     dtucker@
    
    Upstream-ID: a126209b5a6d9cb3117ac7ab5bc63d284538bfc2

commit f54d8ac2474b6fc3afa081cf759b48a6c89d3319
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 4 04:44:08 2015 +0000

    upstream commit
    
    don't record hostbased authentication hostkeys as user
     keys in test for multiple authentication with the same key
    
    Upstream-ID: 26b368fa2cff481f47f37e01b8da1ae5b57b1adc

commit ac3451dd65f27ecf85dc045c46d49e2bbcb8dddd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 4 03:57:38 2015 +0000

    upstream commit
    
    remove extra newline in nethack-mode hostkey; from
     Christian Hesse bz#2686
    
    Upstream-ID: 4f56368b1cc47baeea0531912186f66007fd5b92

commit 9e3ed9ebb1a7e47c155c28399ddf09b306ea05df
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Sep 4 04:23:10 2015 +0000

    upstream commit
    
    trim junk from end of file; bz#2455 from Jakub Jelen
    
    Upstream-Regress-ID: a4e64e8931e40d23874b047074444eff919cdfe6

commit f3a3ea180afff080bab82087ee0b60db9fd84f6c
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Wed Sep 2 07:51:12 2015 +0000

    upstream commit
    
    Fix occurrences of "r = func() != 0" which result in the
     wrong error codes being returned due to != having higher precedence than =.
    
    ok deraadt@ markus@
    
    Upstream-ID: 5fc35c9fc0319cc6fca243632662d2f06b5fd840

commit f498a98cf83feeb7ea01c15cd1c98b3111361f3a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 3 09:11:22 2015 +1000

    don't check for yp_match; ok tim@

commit 9690b78b7848b0b376980a61d51b1613e187ddb5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 21 23:57:48 2015 +0000

    upstream commit
    
    Improve printing of KEX offers and decisions
    
    The debug output now labels the client and server offers and the
    negotiated options. ok markus@
    
    Upstream-ID: 8db921b3f92a4565271b1c1fbce6e7f508e1a2cb

commit 60a92470e21340e1a3fc10f9c7140d8e1519dc55
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 21 23:53:08 2015 +0000

    upstream commit
    
    Fix printing (ssh -G ...) of HostKeyAlgorithms=+...
     Reported by Bryan Drewery
    
    Upstream-ID: 19ad20c41bd5971e006289b6f9af829dd46c1293

commit 6310f60fffca2d1e464168e7d1f7e3b6b0268897
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 21 23:52:30 2015 +0000

    upstream commit
    
    Fix expansion of HostkeyAlgorithms=+...
    
    Reported by Bryan Drewery
    
    Upstream-ID: 70ca1deea39d758ba36d36428ae832e28566f78d

commit e774e5ea56237fd626a8161f9005023dff3e76c9
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Aug 21 23:29:31 2015 +0000

    upstream commit
    
    Improve size == 0, count == 0 checking in mm_zalloc,
     which is "array" like. Discussed with tedu, millert, otto.... and ok djm
    
    Upstream-ID: 899b021be43b913fad3eca1aef44efe710c53e29

commit 189de02d9ad6f3645417c0ddf359b923aae5f926
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 21 15:45:02 2015 +1000

    expose POLLHUP and POLLNVAL for netcat.c

commit e91346dc2bbf460246df2ab591b7613908c1b0ad
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 21 14:49:03 2015 +1000

    we don't use Github for issues/pull-requests

commit a4f5b507c708cc3dc2c8dd2d02e4416d7514dc23
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 21 14:43:55 2015 +1000

    fix URL for connect.c

commit d026a8d3da0f8186598442997c7d0a28e7275414
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 21 13:47:10 2015 +1000

    update version numbers for 7.1

commit 78f8f589f0ca1c9f41e5a9bae3cda5ce8a6b42ed
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 21 03:45:26 2015 +0000

    upstream commit
    
    openssh-7.1
    
    Upstream-ID: ff7b1ef4b06caddfb45e08ba998128c88be3d73f

commit 32a181980c62fce94f7f9ffaf6a79d90f0c309cf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Aug 21 03:42:19 2015 +0000

    upstream commit
    
    fix inverted logic that broke PermitRootLogin; reported
     by Mantas Mikulenas; ok markus@
    
    Upstream-ID: 260dd6a904c1bb7e43267e394b1c9cf70bdd5ea5

commit ce445b0ed927e45bd5bdce8f836eb353998dd65c
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Thu Aug 20 22:32:42 2015 +0000

    upstream commit
    
    Do not cast result of malloc/calloc/realloc* if stdlib.h
     is in scope ok krw millert
    
    Upstream-ID: 5e50ded78cadf3841556649a16cc4b1cb6c58667

commit 05291e5288704d1a98bacda269eb5a0153599146
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Thu Aug 20 19:20:06 2015 +0000

    upstream commit
    
    In the certificates section, be consistent about using
     "host_key" and "user_key" for the respective key types.  ok sthen@ deraadt@
    
    Upstream-ID: 9e037ea3b15577b238604c5533e082a3947f13cb

commit 8543d4ef6f2e9f98c3e6b77c894ceec30c5e4ae4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 19 23:21:42 2015 +0000

    upstream commit
    
    Better compat matching for WinSCP, add compat matching
     for FuTTY (fork of PuTTY); ok markus@ deraadt@
    
    Upstream-ID: 24001d1ac115fa3260fbdc329a4b9aeb283c5389

commit ec6eda16ebab771aa3dfc90629b41953b999cb1e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 19 23:19:01 2015 +0000

    upstream commit
    
    fix double-free() in error path of DSA key generation
     reported by Mateusz Kocielski; ok markus@
    
    Upstream-ID: 4735d8f888b10599a935fa1b374787089116713c

commit 45b0eb752c94954a6de046bfaaf129e518ad4b5b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 19 23:18:26 2015 +0000

    upstream commit
    
    fix free() of uninitialised pointer reported by Mateusz
     Kocielski; ok markus@
    
    Upstream-ID: 519552b050618501a06b7b023de5cb104e2c5663

commit c837643b93509a3ef538cb6624b678c5fe32ff79
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 19 23:17:51 2015 +0000

    upstream commit
    
    fixed unlink([uninitialised memory]) reported by Mateusz
     Kocielski; ok markus@
    
    Upstream-ID: 14a0c4e7d891f5a8dabc4b89d4f6b7c0d5a20109

commit 1f8d3d629cd553031021068eb9c646a5f1e50994
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Aug 14 15:32:41 2015 +0000

    upstream commit
    
    match myproposal.h order; from brian conway (i snuck in a
     tweak while here)
    
    ok dtucker
    
    Upstream-ID: 35174a19b5237ea36aa3798f042bf5933b772c67

commit 1dc8d93ce69d6565747eb44446ed117187621b26
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Thu Aug 6 14:53:21 2015 +0000

    upstream commit
    
    add prohibit-password as a synonymn for without-password,
     since the without-password is causing too many questions.  Harden it to ban
     all but pubkey, hostbased, and GSSAPI auth (when the latter is enabled) from
     djm, ok markus
    
    Upstream-ID: d53317d7b28942153e6236d3fd6e12ceb482db7a

commit 90a95a4745a531b62b81ce3b025e892bdc434de5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 11 13:53:41 2015 +1000

    update version in README

commit 318c37743534b58124f1bab37a8a0087a3a9bd2f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 11 13:53:09 2015 +1000

    update versions in *.spec

commit 5e75f5198769056089fb06c4d738ab0e5abc66f7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 11 13:34:12 2015 +1000

    set sshpam_ctxt to NULL after free
    
    Avoids use-after-free in monitor when privsep child is compromised.
    Reported by Moritz Jodeit; ok dtucker@

commit d4697fe9a28dab7255c60433e4dd23cf7fce8a8b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 11 13:33:24 2015 +1000

    Don't resend username to PAM; it already has it.
    
    Pointed out by Moritz Jodeit; ok dtucker@

commit 88763a6c893bf3dfe951ba9271bf09715e8d91ca
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 27 12:14:25 2015 +1000

    Import updated moduli file from OpenBSD.

commit 55b263fb7cfeacb81aaf1c2036e0394c881637da
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 10 11:13:44 2015 +1000

    let principals-command.sh work for noexec /var/run

commit 2651e34cd11b1aac3a0fe23b86d8c2ff35c07897
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 6 11:43:42 2015 +1000

    work around echo -n / sed behaviour in tests

commit d85dad81778c1aa8106acd46930b25fdf0d15b2a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Aug 5 05:27:33 2015 +0000

    upstream commit
    
    adjust for RSA minimum modulus switch; ok deraadt@
    
    Upstream-Regress-ID: 5a72c83431b96224d583c573ca281cd3a3ebfdae

commit 57e8e229bad5fe6056b5f1199665f5f7008192c6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 4 05:23:06 2015 +0000

    upstream commit
    
    backout SSH_RSA_MINIMUM_MODULUS_SIZE increase for this
     release; problems spotted by sthen@ ok deraadt@ markus@
    
    Upstream-ID: d0bd60dde9e8c3cd7030007680371894c1499822

commit f097d0ea1e0889ca0fa2e53a00214e43ab7fa22a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Aug 2 09:56:42 2015 +0000

    upstream commit
    
    openssh 7.0; ok deraadt@
    
    Upstream-ID: c63afdef537f57f28ae84145c5a8e29e9250221f

commit 3d5728a0f6874ce4efb16913a12963595070f3a9
Author: chris@openbsd.org <chris@openbsd.org>
Date:   Fri Jul 31 15:38:09 2015 +0000

    upstream commit
    
    Allow PermitRootLogin to be overridden by config
    
    ok markus@ deeradt@
    
    Upstream-ID: 5cf3e26ed702888de84e2dc9d0054ccf4d9125b4

commit 6f941396b6835ad18018845f515b0c4fe20be21a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 30 23:09:15 2015 +0000

    upstream commit
    
    fix pty permissions; patch from Nikolay Edigaryev; ok
     deraadt
    
    Upstream-ID: 40ff076d2878b916fbfd8e4f45dbe5bec019e550

commit f4373ed1e8fbc7c8ce3fc4ea97d0ba2e0c1d7ef0
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Thu Jul 30 19:23:02 2015 +0000

    upstream commit
    
    change default: PermitRootLogin without-password matching
     install script changes coming as well ok djm markus
    
    Upstream-ID: 0e2a6c4441daf5498b47a61767382bead5eb8ea6

commit 0c30ba91f87fcda7e975e6ff8a057f624e87ea1c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 30 12:31:39 2015 +1000

    downgrade OOM adjustment logging: verbose -> debug

commit f9eca249d4961f28ae4b09186d7dc91de74b5895
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jul 30 00:01:34 2015 +0000

    upstream commit
    
    Allow ssh_config and sshd_config kex parameters options be
     prefixed by a '+' to indicate that the specified items be appended to the
     default rather than replacing it.
    
    approach suggested by dtucker@, feedback dlg@, ok markus@
    
    Upstream-ID: 0f901137298fc17095d5756ff1561a7028e8882a

commit 5cefe769105a2a2e3ca7479d28d9a325d5ef0163
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 29 08:34:54 2015 +0000

    upstream commit
    
    fix bug in previous; was printing incorrect string for
     failed host key algorithms negotiation
    
    Upstream-ID: 22c0dc6bc61930513065d92e11f0753adc4c6e6e

commit f319912b0d0e1675b8bb051ed8213792c788bcb2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 29 04:43:06 2015 +0000

    upstream commit
    
    include the peer's offer when logging a failure to
     negotiate a mutual set of algorithms (kex, pubkey, ciphers, etc.) ok markus@
    
    Upstream-ID: bbb8caabf5c01790bb845f5ce135565248d7c796

commit b6ea0e573042eb85d84defb19227c89eb74cf05a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jul 28 23:20:42 2015 +0000

    upstream commit
    
    add Cisco to the list of clients that choke on the
     hostkeys update extension. Pointed out by Howard Kash
    
    Upstream-ID: c9eadde28ecec056c73d09ee10ba4570dfba7e84

commit 3f628c7b537291c1019ce86af90756fb4e66d0fd
Author: guenther@openbsd.org <guenther@openbsd.org>
Date:   Mon Jul 27 16:29:23 2015 +0000

    upstream commit
    
    Permit kbind(2) use in the sandbox now, to ease testing
     of ld.so work using it
    
    reminded by miod@, ok deraadt@
    
    Upstream-ID: 523922e4d1ba7a091e3824e77a8a3c818ee97413

commit ebe27ebe520098bbc0fe58945a87ce8490121edb
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Mon Jul 20 18:44:12 2015 +0000

    upstream commit
    
    Move .Pp before .Bl, not after to quiet mandoc -Tlint.
     Noticed by jmc@
    
    Upstream-ID: 59fadbf8407cec4e6931e50c53cfa0214a848e23

commit d5d91d0da819611167782c66ab629159169d94d4
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Mon Jul 20 18:42:35 2015 +0000

    upstream commit
    
    Sync usage with SYNOPSIS
    
    Upstream-ID: 7a321a170181a54f6450deabaccb6ef60cf3f0b7

commit 79ec2142fbc68dd2ed9688608da355fc0b1ed743
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Mon Jul 20 15:39:52 2015 +0000

    upstream commit
    
    Better desciption of Unix domain socket forwarding.
     bz#2423; ok jmc@
    
    Upstream-ID: 85e28874726897e3f26ae50dfa2e8d2de683805d

commit d56fd1828074a4031b18b8faa0bf949669eb18a0
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 20 11:19:51 2015 +1000

    make realpath.c compile -Wsign-compare clean

commit c63c9a691dca26bb7648827f5a13668832948929
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jul 20 00:30:01 2015 +0000

    upstream commit
    
    mention that the default of UseDNS=no implies that
     hostnames cannot be used for host matching in sshd_config and
     authorized_keys; bz#2045, ok dtucker@
    
    Upstream-ID: 0812705d5f2dfa59aab01f2764ee800b1741c4e1

commit 63ebcd0005e9894fcd6871b7b80aeea1fec0ff76
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jul 18 08:02:17 2015 +0000

    upstream commit
    
    don't ignore PKCS#11 hosted keys that return empty
     CKA_ID; patch by Jakub Jelen via bz#2429; ok markus
    
    Upstream-ID: 2f7c94744eb0342f8ee8bf97b2351d4e00116485

commit b15fd989c8c62074397160147a8d5bc34b3f3c63
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jul 18 08:00:21 2015 +0000

    upstream commit
    
    skip uninitialised PKCS#11 slots; patch from Jakub Jelen
     in bz#2427 ok markus@
    
    Upstream-ID: 744c1e7796e237ad32992d0d02148e8a18f27d29

commit 5b64f85bb811246c59ebab70aed331f26ba37b18
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jul 18 07:57:14 2015 +0000

    upstream commit
    
    only query each keyboard-interactive device once per
     authentication request regardless of how many times it is listed; ok markus@
    
    Upstream-ID: d73fafba6e86030436ff673656ec1f33d9ffeda1

commit cd7324d0667794eb5c236d8a4e0f236251babc2d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 17 03:34:27 2015 +0000

    upstream commit
    
    remove -u flag to diff (only used for error output) to make
     things easier for -portable
    
    Upstream-Regress-ID: a5d6777d2909540d87afec3039d9bb2414ade548

commit deb8d99ecba70b67f4af7880b11ca8768df9ec3a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 17 03:09:19 2015 +0000

    upstream commit
    
    direct-streamlocal@openssh.com Unix domain foward
     messages do not contain a "reserved for future use" field and in fact,
     serverloop.c checks that there isn't one. Remove erroneous mention from
     PROTOCOL description. bz#2421 from Daniel Black
    
    Upstream-ID: 3d51a19e64f72f764682f1b08f35a8aa810a43ac

commit 356b61f365405b5257f5b2ab446e5d7bd33a7b52
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 17 03:04:27 2015 +0000

    upstream commit
    
    describe magic for setting up Unix domain socket fowards
     via the mux channel; bz#2422 patch from Daniel Black
    
    Upstream-ID: 943080fe3864715c423bdeb7c920bb30c4eee861

commit d3e2aee41487d55b8d7d40f538b84ff1db7989bc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 17 12:52:34 2015 +1000

    Check if realpath works on nonexistent files.
    
    On some platforms the native realpath doesn't work with non-existent
    files (this is actually specified in some versions of POSIX), however
    the sftp spec says its realpath with "canonicalize any given path name".
    On those platforms, use realpath from the compat library.
    
    In addition, when compiling with -DFORTIFY_SOURCE, glibc redefines
    the realpath symbol to the checked version, so redefine ours to
    something else so we pick up the compat version we want.
    
    bz#2428, ok djm@

commit 25b14610dab655646a109db5ef8cb4c4bf2a48a0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 17 02:47:45 2015 +0000

    upstream commit
    
    fix incorrect test for SSH1 keys when compiled without SSH1
     support
    
    Upstream-ID: 6004d720345b8e481c405e8ad05ce2271726e451

commit df56a8035d429b2184ee94aaa7e580c1ff67f73a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 15 08:00:11 2015 +0000

    upstream commit
    
    fix NULL-deref when SSH1 reenabled
    
    Upstream-ID: f22fd805288c92b3e9646782d15b48894b2d5295

commit 41e38c4d49dd60908484e6703316651333f16b93
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 15 07:19:50 2015 +0000

    upstream commit
    
    regen RSA1 test keys; the last batch was missing their
     private parts
    
    Upstream-Regress-ID: 7ccf437305dd63ff0b48dd50c5fd0f4d4230c10a

commit 5bf0933184cb622ca3f96d224bf3299fd2285acc
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Jul 10 06:23:25 2015 +0000

    upstream commit
    
    Adapt tests, now that DSA if off by default; use
     PubkeyAcceptedKeyTypes and PubkeyAcceptedKeyTypes to test DSA.
    
    Upstream-Regress-ID: 0ff2a3ff5ac1ce5f92321d27aa07b98656efcc5c

commit 7a6e3fd7b41dbd3756b6bf9acd67954c0b1564cc
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Jul 7 14:54:16 2015 +0000

    upstream commit
    
    regen test data after mktestdata.sh changes
    
    Upstream-Regress-ID: 3495ecb082b9a7c048a2d7c5c845d3bf181d25a4

commit 7c8c174c69f681d4910fa41c37646763692b28e2
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Jul 7 14:53:30 2015 +0000

    upstream commit
    
    adapt tests to new minimum RSA size and default FP format
    
    Upstream-Regress-ID: a4b30afd174ce82b96df14eb49fb0b81398ffd0e

commit 6a977a4b68747ade189e43d302f33403fd4a47ac
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 3 04:39:23 2015 +0000

    upstream commit
    
    legacy v00 certificates are gone; adapt and don't try to
     test them; "sure" markus@ dtucker@
    
    Upstream-Regress-ID: c57321e69b3cd4a3b3396dfcc43f0803d047da12

commit 0c4123ad5e93fb90fee9c6635b13a6cdabaac385
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 1 23:11:18 2015 +0000

    upstream commit
    
    don't expect SSH v.1 in unittests
    
    Upstream-Regress-ID: f8812b16668ba78e6a698646b2a652b90b653397

commit 3c099845798a817cdde513c39074ec2063781f18
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 15 06:38:50 2015 +0000

    upstream commit
    
    turn SSH1 back on to match src/usr.bin/ssh being tested
    
    Upstream-Regress-ID: 6c4f763a2f0cc6893bf33983919e9030ae638333

commit b1dc2b33689668c75e95f873a42d5aea1f4af1db
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jul 13 04:57:14 2015 +0000

    upstream commit
    
    Add "PuTTY_Local:" to the clients to which we do not
     offer DH-GEX. This was the string that was used for development versions
     prior to September 2014 and they don't do RFC4419 DH-GEX, but unfortunately
     there are some extant products based on those versions.  bx2424 from Jay
     Rouman, ok markus@ djm@
    
    Upstream-ID: be34d41e18b966832fe09ca243d275b81882e1d5

commit 3a1638dda19bbc73d0ae02b4c251ce08e564b4b9
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Jul 10 06:21:53 2015 +0000

    upstream commit
    
    Turn off DSA by default; add HostKeyAlgorithms to the
     server and PubkeyAcceptedKeyTypes to the client side, so it still can be
     tested or turned back on; feedback and ok djm@
    
    Upstream-ID: 8450a9e6d83f80c9bfed864ff061dfc9323cec21

commit 16db0a7ee9a87945cc594d13863cfcb86038db59
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Jul 9 09:49:46 2015 +0000

    upstream commit
    
    re-enable ed25519-certs if compiled w/o openssl; ok djm
    
    Upstream-ID: e10c90808b001fd2c7a93778418e9b318f5c4c49

commit c355bf306ac33de6545ce9dac22b84a194601e2f
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jul 8 20:24:02 2015 +0000

    upstream commit
    
    no need to include the old buffer/key API
    
    Upstream-ID: fb13c9f7c0bba2545f3eb0a0e69cb0030819f52b

commit a3cc48cdf9853f1e832d78cb29bedfab7adce1ee
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jul 8 19:09:25 2015 +0000

    upstream commit
    
    typedefs for Cipher&CipherContext are unused
    
    Upstream-ID: 50e6a18ee92221d23ad173a96d5b6c42207cf9a7

commit a635bd06b5c427a57c3ae760d3a2730bb2c863c0
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jul 8 19:04:21 2015 +0000

    upstream commit
    
    xmalloc.h is unused
    
    Upstream-ID: afb532355b7fa7135a60d944ca1e644d1d63cb58

commit 2521cf0e36c7f3f6b19f206da0af134f535e4a31
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jul 8 19:01:15 2015 +0000

    upstream commit
    
    compress.c is gone
    
    Upstream-ID: 174fa7faa9b9643cba06164b5e498591356fbced

commit c65a7aa6c43aa7a308ee1ab8a96f216169ae9615
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 3 04:05:54 2015 +0000

    upstream commit
    
    another SSH_RSA_MINIMUM_MODULUS_SIZE that needed
     cranking
    
    Upstream-ID: 9d8826cafe96aab4ae8e2f6fd22800874b7ffef1

commit b1f383da5cd3cb921fc7776f17a14f44b8a31757
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 3 03:56:25 2015 +0000

    upstream commit
    
    add an XXX reminder for getting correct key paths from
     sshd_config
    
    Upstream-ID: feae52b209d7782ad742df04a4260e9fe41741db

commit 933935ce8d093996c34d7efa4d59113163080680
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 3 03:49:45 2015 +0000

    upstream commit
    
    refuse to generate or accept RSA keys smaller than 1024
     bits; feedback and ok dtucker@
    
    Upstream-ID: 7ea3d31271366ba264f06e34a3539bf1ac30f0ba

commit bdfd29f60b74f3e678297269dc6247a5699583c1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 3 03:47:00 2015 +0000

    upstream commit
    
    turn off 1024 bit diffie-hellman-group1-sha1 key
     exchange method (already off in server, this turns it off in the client by
     default too) ok dtucker@
    
    Upstream-ID: f59b88f449210ab7acf7d9d88f20f1daee97a4fa

commit c28fc62d789d860c75e23a9fa9fb250eb2beca57
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jul 3 03:43:18 2015 +0000

    upstream commit
    
    delete support for legacy v00 certificates; "sure"
     markus@ dtucker@
    
    Upstream-ID: b5b9bb5f9202d09e88f912989d74928601b6636f

commit 564d63e1b4a9637a209d42a9d49646781fc9caef
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 1 23:10:47 2015 +0000

    upstream commit
    
    Compile-time disable SSH v.1 again
    
    Upstream-ID: 1d4b513a3a06232f02650b73bad25100d1b800af

commit 868109b650504dd9bcccdb1f51d0906f967c20ff
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 1 02:39:06 2015 +0000

    upstream commit
    
    twiddle PermitRootLogin back
    
    Upstream-ID: 2bd23976305d0512e9f84d054e1fc23cd70b89f2

commit 7de4b03a6e4071d454b72927ffaf52949fa34545
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 1 02:32:17 2015 +0000

    upstream commit
    
    twiddle; (this commit marks the openssh-6.9 release)
    
    Upstream-ID: 78500582819f61dd8adee36ec5cc9b9ac9351234

commit 1bf477d3cdf1a864646d59820878783d42357a1d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 1 02:26:31 2015 +0000

    upstream commit
    
    better refuse ForwardX11Trusted=no connections attempted
     after ForwardX11Timeout expires; reported by Jann Horn
    
    Upstream-ID: bf0fddadc1b46a0334e26c080038313b4b6dea21

commit 47aa7a0f8551b471fcae0447c1d78464f6dba869
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 1 01:56:13 2015 +0000

    upstream commit
    
    put back default PermitRootLogin=no
    
    Upstream-ID: 7bdedd5cead99c57ed5571f3b6b7840922d5f728

commit 984b064fe2a23733733262f88d2e1b2a1a501662
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 1 01:55:13 2015 +0000

    upstream commit
    
    openssh-6.9
    
    Upstream-ID: 6cfe8e1904812531080e6ab6e752d7001b5b2d45

commit d921082ed670f516652eeba50705e1e9f6325346
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jul 1 01:55:00 2015 +0000

    upstream commit
    
    reset default PermitRootLogin to 'yes' (momentarily, for
     release)
    
    Upstream-ID: cad8513527066e65dd7a1c16363d6903e8cefa24

commit 66295e0e1ba860e527f191b6325d2d77dec4dbce
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 1 11:49:12 2015 +1000

    crank version numbers for release

commit 37035c07d4f26bb1fbe000d2acf78efdb008681d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 1 10:49:37 2015 +1000

    s/--with-ssh1/--without-ssh1/

commit 629df770dbadc2accfbe1c81b3f31f876d0acd84
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 30 05:25:07 2015 +0000

    upstream commit
    
    fatal() when a remote window update causes the window
     value to overflow. Reported by Georg Wicherski, ok markus@
    
    Upstream-ID: ead397a9aceb3bf74ebfa5fcaf259d72e569f351

commit f715afebe735d61df3fd30ad72d9ac1c8bd3b5f2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 30 05:23:25 2015 +0000

    upstream commit
    
    Fix math error in remote window calculations that causes
     eventual stalls for datagram channels. Reported by Georg Wicherski, ok
     markus@
    
    Upstream-ID: be54059d11bf64e0d85061f7257f53067842e2ab

commit 52fb6b9b034fcfd24bf88cc7be313e9c31de9889
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 30 16:05:40 2015 +1000

    skip IPv6-related portions on hosts without IPv6
    
    with Tim Rice

commit 512caddf590857af6aa12218461b5c0441028cf5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 29 22:35:12 2015 +0000

    upstream commit
    
    add getpid to sandbox, reachable by grace_alarm_handler
    
    reported by Jakub Jelen; bz#2419
    
    Upstream-ID: d0da1117c16d4c223954995d35b0f47c8f684cd8

commit 78c2a4f883ea9aba866358e2acd9793a7f42ca93
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 26 05:13:20 2015 +0000

    upstream commit
    
    Fix \-escaping bug that caused forward path parsing to skip
     two characters and skip past the end of the string.
    
    Based on patch by Salvador Fandino; ok dtucker@
    
    Upstream-ID: 7b879dc446335677cbe4cb549495636a0535f3bd

commit bc20205c91c9920361d12b15d253d4997dba494a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 25 09:51:39 2015 +1000

    add missing pselect6
    
    patch from Jakub Jelen

commit 9d27fb73b4a4e5e99cb880af790d5b1ce44f720a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jun 24 23:47:23 2015 +0000

    upstream commit
    
    correct test to sshkey_sign(); spotted by Albert S.
    
    Upstream-ID: 5f7347f40f0ca6abdaca2edb3bd62f4776518933

commit 7ed01a96a1911d8b4a9ef4f3d064e1923bfad7e3
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jun 24 01:49:19 2015 +0000

    upstream commit
    
    Revert previous commit.  We still want to call setgroups
     in the case where there are zero groups to remove any that we might otherwise
     inherit (as pointed out by grawity at gmail.com) and since the 2nd argument
     to setgroups is always a static global it's always valid to dereference in
     this case.  ok deraadt@ djm@
    
    Upstream-ID: 895b5ac560a10befc6b82afa778641315725fd01

commit 882f8bf94f79528caa65b0ba71c185d705bb7195
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Jun 24 01:49:19 2015 +0000

    upstream commit
    
    Revert previous commit.  We still want to call setgroups in
     the case where there are zero groups to remove any that we might otherwise
     inherit (as pointed out by grawity at gmail.com) and since the 2nd argument
     to setgroups is always a static global it's always valid to dereference in
     this case.  ok deraadt@ djm@
    
    Upstream-ID: 895b5ac560a10befc6b82afa778641315725fd01

commit 9488538a726951e82b3a4374f3c558d72c80a89b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 22 23:42:16 2015 +0000

    upstream commit
    
    Don't count successful partial authentication as failures
     in monitor; this may have caused the monitor to refuse multiple
     authentications that would otherwise have successfully completed; ok markus@
    
    Upstream-ID: eb74b8e506714d0f649bd5c300f762a527af04a3

commit 63b78d003bd8ca111a736e6cea6333da50f5f09b
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Jun 22 12:29:57 2015 +0000

    upstream commit
    
    Don't call setgroups if we have zero groups; there's no
     guarantee that it won't try to deref the pointer.  Based on a patch from mail
     at quitesimple.org, ok djm deraadt
    
    Upstream-ID: 2fff85e11d7a9a387ef7fddf41fbfaf566708ab1

commit 5c15e22c691c79a47747bcf5490126656f97cecd
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 18 15:07:56 2015 +1000

    fix syntax error

commit 596dbca82f3f567fb3d2d69af4b4e1d3ba1e6403
Author: jsing@openbsd.org <jsing@openbsd.org>
Date:   Mon Jun 15 18:44:22 2015 +0000

    upstream commit
    
    If AuthorizedPrincipalsCommand is specified, however
     AuthorizedPrincipalsFile is not (or is set to "none"), authentication will
     potentially fail due to key_cert_check_authority() failing to locate a
     principal that matches the username, even though an authorized principal has
     already been matched in the output of the subprocess. Fix this by using the
     same logic to determine if pw->pw_name should be passed, as is used to
     determine if a authorized principal must be matched earlier on.
    
    ok djm@
    
    Upstream-ID: 43b42302ec846b0ea68aceb40677245391b9409d

commit aff3e94c0d75d0d0fa84ea392b50ab04f8c57905
Author: jsing@openbsd.org <jsing@openbsd.org>
Date:   Mon Jun 15 18:42:19 2015 +0000

    upstream commit
    
    Make the arguments to match_principals_command() similar
     to match_principals_file(), by changing the last argument a struct
     sshkey_cert * and dereferencing key->cert in the caller.
    
    No functional change.
    
    ok djm@
    
    Upstream-ID: 533f99b844b21b47342b32b62e198dfffcf8651c

commit 97e2e1596c202a4693468378b16b2353fd2d6c5e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 17 14:36:54 2015 +1000

    trivial optimisation for seccomp-bpf
    
    When doing arg inspection and the syscall doesn't match, skip
    past the instruction that reloads the syscall into the accumulator,
    since the accumulator hasn't been modified at this point.

commit 99f33d7304893bd9fa04d227cb6e870171cded19
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 17 10:50:51 2015 +1000

    aarch64 support for seccomp-bpf sandbox
    
    Also resort and tidy syscall list. Based on patches by Jakub Jelen
    bz#2361; ok dtucker@

commit 4ef702e1244633c1025ec7cfe044b9ab267097bf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jun 15 01:32:50 2015 +0000

    upstream commit
    
    return failure on RSA signature error; reported by Albert S
    
    Upstream-ID: e61bb93dbe0349625807b0810bc213a6822121fa

commit a170f22baf18af0b1acf2788b8b715605f41a1f9
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jun 9 22:41:13 2015 -0700

    Fix t12 rules for out of tree builds.

commit ec04dc4a5515c913121bc04ed261857e68fa5c18
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Fri Jun 5 15:13:13 2015 +0000

    upstream commit
    
    For "ssh -L 12345:/tmp/sock" don't fail with "No forward host
     name." (we have a path, not a host name).  Based on a diff from Jared
     Yanovich. OK djm@
    
    Upstream-ID: 2846b0a8c7de037e33657f95afbd282837fc213f

commit 732d61f417a6aea0aa5308b59cb0f563bcd6edd6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jun 5 03:44:14 2015 +0000

    upstream commit
    
    typo: accidental repetition; bz#2386
    
    Upstream-ID: 45e620d99f6bc301e5949d34a54027374991c88b

commit adfb24c69d1b6f5e758db200866c711e25a2ba73
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 5 14:51:40 2015 +1000

    Add Linux powerpc64le and powerpcle entries.
    
    Stopgap to resolve bz#2409 because we are so close to release and will
    update config.guess and friends shortly after the release.  ok djm@

commit a1195a0fdc9eddddb04d3e9e44c4775431cb77da
Merge: 6397eedf9 d2480bcac
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jun 3 21:43:13 2015 -0700

    Merge branch 'master' of git.mindrot.org:/var/git/openssh

commit 6397eedf953b2b973d2d7cbb504ab501a07f8ddc
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jun 3 21:41:11 2015 -0700

    Remove unneeded backslashes. Patch from Ángel González

commit d2480bcac1caf31b03068de877a47d6e1027bf6d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 4 14:10:55 2015 +1000

    Remove redundant include of stdarg.h.  bz#2410

commit 5e67859a623826ccdf2df284cbb37e2d8e2787eb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jun 2 09:10:40 2015 +0000

    upstream commit
    
    mention CheckHostIP adding addresses to known_hosts;
     bz#1993; ok dtucker@
    
    Upstream-ID: fd44b68440fd0dc29abf9f2d3f703d74a2396cb7

commit d7a58bbac6583e33fd5eca8e2c2cc70c57617818
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 2 20:15:26 2015 +1000

    Replace strcpy with strlcpy.
    
    ok djm, sanity check by Corinna Vinschen.

commit 51a1c2115265c6e80ede8a5c9dccada9aeed7143
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 29 18:27:21 2015 +1000

    skip, rather than fatal when run without SUDO set

commit 599f01142a376645b15cbc9349d7e8975e1cf245
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 29 18:03:15 2015 +1000

    fix merge botch that left ",," in KEX algs

commit 0c2a81dfc21822f2423edd30751e5ec53467b347
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 29 17:08:28 2015 +1000

    re-enable SSH protocol 1 at compile time

commit db438f9285d64282d3ac9e8c0944f59f037c0151
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 29 03:05:13 2015 +0000

    upstream commit
    
    make this work without SUDO set; ok dtucker@
    
    Upstream-Regress-ID: bca88217b70bce2fe52b23b8e06bdeb82d98c715

commit 1d9a2e2849c9864fe75daabf433436341c968e14
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 28 07:37:31 2015 +0000

    upstream commit
    
    wrap all moduli-related code in #ifdef WITH_OPENSSL.
     based on patch from Reuben Hawkins; bz#2388 feedback and ok dtucker@
    
    Upstream-ID: d80cfc8be3e6ec65b3fac9e87c4466533b31b7cf

commit 496aeb25bc2d6c434171292e4714771b594bd00e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu May 28 05:41:29 2015 +0000

    upstream commit
    
    Increase the allowed length of the known host file name
     in the log message to be consistent with other cases.  Part of bz#1993, ok
     deraadt.
    
    Upstream-ID: a9e97567be49f25daf286721450968251ff78397

commit dd2cfeb586c646ff8d70eb93567b2e559ace5b14
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu May 28 05:09:45 2015 +0000

    upstream commit
    
    Fix typo (keywork->keyword)
    
    Upstream-ID: 8aacd0f4089c0a244cf43417f4f9045dfaeab534

commit 9cc6842493fbf23025ccc1edab064869640d3bec
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 28 04:50:53 2015 +0000

    upstream commit
    
    add error message on ftruncate failure; bz#2176
    
    Upstream-ID: cbcc606e0b748520c74a210d8f3cc9718d3148cf

commit d1958793a0072c22be26d136dbda5ae263e717a0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 28 04:40:13 2015 +0000

    upstream commit
    
    make ssh-keygen default to ed25519 keys when compiled
     without OpenSSL; bz#2388, ok dtucker@
    
    Upstream-ID: 85a471fa6d3fa57a7b8e882d22cfbfc1d84cdc71

commit 3ecde664c9fc5fb3667aedf9e6671462600f6496
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed May 27 23:51:10 2015 +0000

    upstream commit
    
    Reorder client proposal to prefer
     diffie-hellman-group-exchange-sha1 over diffie-hellman-group14-sha1.  ok djm@
    
    Upstream-ID: 552c08d47347c3ee1a9a57d88441ab50abe17058

commit 40f64292b907afd0a674fdbf3e4c2356d17a7d68
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed May 27 23:39:18 2015 +0000

    upstream commit
    
    Add a stronger (4k bit) fallback group that sshd can use
     when the moduli file is missing or broken, sourced from RFC3526.  bz#2302, ok
     markus@ (earlier version), djm@
    
    Upstream-ID: b635215746a25a829d117673d5e5a76d4baee7f4

commit 5ab7d5fa03ad55bc438fab45dfb3aeb30a3c237a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 28 10:03:40 2015 +1000

    New moduli file from OpenBSD, removing 1k groups.
    
    Remove 1k bit groups.  ok deraadt@, markus@

commit a71ba58adf34e599f30cdda6e9b93ae6e3937eea
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed May 27 05:15:02 2015 +0000

    upstream commit
    
    support PKCS#11 devices with external PIN entry devices
     bz#2240, based on patch from Dirk-Willem van Gulik; feedback and ok dtucker@
    
    Upstream-ID: 504568992b55a8fc984375242b1bd505ced61b0d

commit b282fec1aa05246ed3482270eb70fc3ec5f39a00
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue May 26 23:23:40 2015 +0000

    upstream commit
    
    Cap DH-GEX group size at 4kbits for Cisco implementations.
     Some of them will choke when asked for preferred sizes >4k instead of
     returning the 4k group that they do have.  bz#2209, ok djm@
    
    Upstream-ID: 54b863a19713446b7431f9d06ad0532b4fcfef8d

commit 3e91b4e8b0dc2b4b7e7d42cf6e8994a32e4cb55e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun May 24 23:39:16 2015 +0000

    upstream commit
    
    add missing 'c' option to getopt(), case statement was
     already there; from Felix Bolte
    
    Upstream-ID: 9b19b4e2e0b54d6fefa0dfac707c51cf4bae3081

commit 64a89ec07660abba4d0da7c0095b7371c98bab62
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Sat May 23 14:28:37 2015 +0000

    upstream commit
    
    fix a memory leak in an error path ok markus@ dtucker@
    
    Upstream-ID: bc1da0f205494944918533d8780fde65dff6c598

commit f948737449257d2cb83ffcfe7275eb79b677fd4a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 22 05:28:45 2015 +0000

    upstream commit
    
    mention ssh-keygen -E for comparing legacy MD5
     fingerprints; bz#2332
    
    Upstream-ID: 079a3669549041dbf10dbc072d9563f0dc3b2859

commit 0882332616e4f0272c31cc47bf2018f9cb258a4e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 22 04:45:52 2015 +0000

    upstream commit
    
    Reorder EscapeChar option parsing to avoid a single-byte
     out- of-bounds read. bz#2396 from Jaak Ristioja; ok dtucker@
    
    Upstream-ID: 1dc6b5b63d1c8d9a88619da0b27ade461d79b060

commit d7c31da4d42c115843edee2074d7d501f8804420
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 22 03:50:02 2015 +0000

    upstream commit
    
    add knob to relax GSSAPI host credential check for
     multihomed hosts bz#928, patch by Simon Wilkinson; ok dtucker
     (kerberos/GSSAPI is not compiled by default on OpenBSD)
    
    Upstream-ID: 15ddf1c6f7fd9d98eea9962f480079ae3637285d

commit aa72196a00be6e0b666215edcffbc10af234cb0e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 22 17:49:46 2015 +1000

    Include signal.h for sig_atomic_t, used by kex.h.
    
    bz#2402, from tomas.kuthan at oracle com.

commit 8b02481143d75e91c49d1bfae0876ac1fbf9511a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 22 12:47:24 2015 +1000

    Import updated moduli file from OpenBSD.

commit 4739e8d5e1c0be49624082bd9f6b077e9e758db9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 21 12:01:19 2015 +0000

    upstream commit
    
    Support "ssh-keygen -lF hostname" to find search known_hosts
     and print key hashes. Already advertised by ssh-keygen(1), but not delivered
     by code; ok dtucker@
    
    Upstream-ID: 459e0e2bf39825e41b0811c336db2d56a1c23387

commit e97201feca10b5196da35819ae516d0b87cf3a50
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 21 17:55:15 2015 +1000

    conditionalise util.h inclusion

commit 13640798c7dd011ece0a7d02841fe48e94cfa0e0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 21 06:44:25 2015 +0000

    upstream commit
    
    regress test for AuthorizedPrincipalsCommand
    
    Upstream-Regress-ID: c658fbf1ab6b6011dc83b73402322e396f1e1219

commit 84452c5d03c21f9bfb28c234e0dc1dc67dd817b1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 21 06:40:02 2015 +0000

    upstream commit
    
    regress test for AuthorizedKeysCommand arguments
    
    Upstream-Regress-ID: bbd65c13c6b3be9a442ec115800bff9625898f12

commit bcc50d816187fa9a03907ac1f3a52f04a52e10d1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 21 06:43:30 2015 +0000

    upstream commit
    
    add AuthorizedPrincipalsCommand that allows getting
     authorized_principals from a subprocess rather than a file, which is quite
     useful in deployments with large userbases
    
    feedback and ok markus@
    
    Upstream-ID: aa1bdac7b16fc6d2fa3524ef08f04c7258d247f6

commit 24232a3e5ab467678a86aa67968bbb915caffed4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 21 06:38:35 2015 +0000

    upstream commit
    
    support arguments to AuthorizedKeysCommand
    
    bz#2081 loosely based on patch by Sami Hartikainen
    feedback and ok markus@
    
    Upstream-ID: b080387a14aa67dddd8ece67c00f268d626541f7

commit d80fbe41a57c72420c87a628444da16d09d66ca7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu May 21 04:55:51 2015 +0000

    upstream commit
    
    refactor: split base64 encoding of pubkey into its own
     sshkey_to_base64() function and out of sshkey_write(); ok markus@
    
    Upstream-ID: 54fc38f5832e9b91028900819bda46c3959a0c1a

commit 7cc44ef74133a473734bbcbd3484f24d6a7328c5
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Mon May 18 15:06:05 2015 +0000

    upstream commit
    
    getentropy() and sendsyslog() have been around long
     enough. openssh-portable may want the #ifdef's but not base. discussed with
     djm few weeks back
    
    Upstream-ID: 0506a4334de108e3fb6c66f8d6e0f9c112866926

commit 9173d0fbe44de7ebcad8a15618e13a8b8d78902e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 15 05:44:21 2015 +0000

    upstream commit
    
    Use a salted hash of the lock passphrase instead of plain
     text and do constant-time comparisons of it. Should prevent leaking any
     information about it via timing, pointed out by Ryan Castellucci.  Add a 0.1s
     incrementing delay for each failed unlock attempt up to 10s.  ok markus@
     (earlier version), djm@
    
    Upstream-ID: c599fcc325aa1cc65496b25220b622d22208c85f

commit d028d5d3a697c71b21e4066d8672cacab3caa0a8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 5 19:10:58 2015 +1000

    upstream commit
    
       - tedu@cvs.openbsd.org 2015/01/12 03:20:04
         [bcrypt_pbkdf.c]
         rename blocks to words. bcrypt "blocks" are unrelated to blowfish blocks,
         nor are they the same size.

commit f6391d4e59b058984163ab28f4e317e7a72478f1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 5 19:10:23 2015 +1000

    upstream commit
    
       - deraadt@cvs.openbsd.org 2015/01/08 00:30:07
         [bcrypt_pbkdf.c]
         declare a local version of MIN(), call it MINIMUM()

commit 8ac6b13cc9113eb47cd9e86c97d7b26b4b71b77f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 5 19:09:46 2015 +1000

    upstream commit
    
       - djm@cvs.openbsd.org 2014/12/30 01:41:43
         [bcrypt_pbkdf.c]
         typo in comment: ouput => output

commit 1f792489d5cf86a4f4e3003e6e9177654033f0f2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 4 06:10:48 2015 +0000

    upstream commit
    
    Remove pattern length argument from match_pattern_list(), we
     only ever use it for strlen(pattern).
    
    Prompted by hanno AT hboeck.de pointing an out-of-bound read
    error caused by an incorrect pattern length found using AFL
    and his own tools.
    
    ok markus@

commit 639d6bc57b1942393ed12fb48f00bc05d4e093e4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 07:10:01 2015 +0000

    upstream commit
    
    refactor ssh_dispatch_run_fatal() to use sshpkt_fatal()
     to better report error conditions. Teach sshpkt_fatal() about ECONNRESET.
    
    Improves error messages on TCP connection resets. bz#2257
    
    ok dtucker@

commit 9559d7de34c572d4d3fd990ca211f8ec99f62c4d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 07:08:08 2015 +0000

    upstream commit
    
    a couple of parse targets were missing activep checks,
     causing them to be misapplied in match context; bz#2272 diagnosis and
     original patch from Sami Hartikainen ok dtucker@

commit 7e8528cad04b2775c3b7db08abf8fb42e47e6b2a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 04:17:51 2015 +0000

    upstream commit
    
    make handling of AuthorizedPrincipalsFile=none more
     consistent with other =none options; bz#2288 from Jakub Jelen; ok dtucker@

commit ca430d4d9cc0f62eca3b1fb1e2928395b7ce80f7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 04:03:20 2015 +0000

    upstream commit
    
    remove failed remote forwards established by muliplexing
     from the list of active forwards; bz#2363, patch mostly by Yoann Ricordel; ok
     dtucker@

commit 8312cfb8ad88657517b3e23ac8c56c8e38eb9792
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 04:01:58 2015 +0000

    upstream commit
    
    reduce stderr spam when using ssh -S /path/mux -O forward
     -R 0:... ok dtucker@

commit 179be0f5e62f1f492462571944e45a3da660d82b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 03:23:51 2015 +0000

    upstream commit
    
    prevent authorized_keys options picked up on public key
     tests without a corresponding private key authentication being applied to
     other authentication methods. Reported by halex@, ok markus@

commit a42d67be65b719a430b7fcaba2a4e4118382723a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 03:20:54 2015 +0000

    upstream commit
    
    Don't make parsing of authorized_keys' environment=
     option conditional on PermitUserEnv - always parse it, but only use the
     result if the option is enabled. This prevents the syntax of authorized_keys
     changing depending on which sshd_config options were enabled.
    
    bz#2329; based on patch from coladict AT gmail.com, ok dtucker@

commit e661a86353e11592c7ed6a847e19a83609f49e77
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon May 4 06:10:48 2015 +0000

    upstream commit
    
    Remove pattern length argument from match_pattern_list(), we
     only ever use it for strlen(pattern).
    
    Prompted by hanno AT hboeck.de pointing an out-of-bound read
    error caused by an incorrect pattern length found using AFL
    and his own tools.
    
    ok markus@

commit 0ef1de742be2ee4b10381193fe90730925b7f027
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Apr 23 05:01:19 2015 +0000

    upstream commit
    
    Add a simple regression test for sshd's configuration
     parser.  Right now, all it does is run the output of sshd -T back through
     itself and ensure the output is valid and invariant.

commit 368f83c793275faa2c52f60eaa9bdac155c4254b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 22 01:38:36 2015 +0000

    upstream commit
    
    use correct key for nested certificate test

commit 8d4d1bfddbbd7d21f545dc6997081d1ea1fbc99a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 1 07:11:47 2015 +0000

    upstream commit
    
    mention that the user's shell from /etc/passwd is used
     for commands too; bz#1459 ok dtucker@

commit 5ab283d0016bbc9d4d71e8e5284d011bc5a930cf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 8 07:29:00 2015 +0000

    upstream commit
    
    whitespace
    
    Upstream-Regress-ID: 6b708a3e709d5b7fd37890f874bafdff1f597519

commit 8377d5008ad260048192e1e56ad7d15a56d103dd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 8 07:26:13 2015 +0000

    upstream commit
    
    whitespace at EOL
    
    Upstream-Regress-ID: 9c48911643d5b05173b36a012041bed4080b8554

commit c28a3436fa8737709ea88e4437f8f23a6ab50359
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 8 06:45:13 2015 +0000

    upstream commit
    
    moar whitespace at eol
    
    Upstream-ID: 64eaf872a3ba52ed41e494287e80d40aaba4b515

commit 2b64c490468fd4ca35ac8d5cc31c0520dc1508bb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 8 06:41:56 2015 +0000

    upstream commit
    
    whitespace at EOL
    
    Upstream-ID: 57bcf67d666c6fc1ad798aee448fdc3f70f7ec2c

commit 4e636cf201ce6e7e3b9088568218f9d4e2c51712
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 8 03:56:51 2015 +0000

    upstream commit
    
    whitespace at EOL

commit 38b8272f823dc1dd4e29dbcee83943ed48bb12fa
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon May 4 01:47:53 2015 +0000

    upstream commit
    
    Use diff w/out -u for better portability

commit 297060f42d5189a4065ea1b6f0afdf6371fb0507
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri May 8 03:25:07 2015 +0000

    upstream commit
    
    Use xcalloc for permitted_adm_opens instead of xmalloc to
     ensure it's zeroed. Fixes post-auth crash with permitopen=none.  bz#2355, ok
     djm@

commit 63ebf019be863b2d90492a85e248cf55a6e87403
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri May 8 03:17:49 2015 +0000

    upstream commit
    
    don't choke on new-format private keys encrypted with an
     AEAD cipher; bz#2366, patch from Ron Frederick; ok markus@

commit f8484dac678ab3098ae522a5f03bb2530f822987
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed May 6 05:45:17 2015 +0000

    upstream commit
    
    Clarify pseudo-terminal request behaviour and use
     "pseudo-terminal" consistently.  bz#1716, ok jmc@ "I like it" deraadt@.

commit ea139507bef8bad26e86ed99a42c7233ad115c38
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed May 6 04:07:18 2015 +0000

    upstream commit
    
    Blacklist DH-GEX for specific PuTTY versions known to
     send non-RFC4419 DH-GEX messages rather than all versions of PuTTY.
     According to Simon Tatham, 0.65 and newer versions will send RFC4419 DH-GEX
     messages.  ok djm@

commit b58234f00ee3872eb84f6e9e572a9a34e902e36e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue May 5 10:17:49 2015 +0000

    upstream commit
    
    WinSCP doesn't implement RFC4419 DH-GEX so flag it so we
     don't offer that KEX method.  ok markus@

commit d5b1507a207253b39e810e91e68f9598691b7a29
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Tue May 5 02:48:17 2015 +0000

    upstream commit
    
    use the sizeof the struct not the sizeof a pointer to the
     struct in ssh_digest_start()
    
    This file is only used if ssh is built with OPENSSL=no
    
    ok markus@

commit a647b9b8e616c231594b2710c925d31b1b8afea3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 8 11:07:27 2015 +1000

    Put brackets around mblen() compat constant.
    
    This might help with the reported problem cross compiling for Android
    ("error: expected identifier or '(' before numeric constant") but
    shouldn't hurt in any case.

commit d1680d36e17244d9af3843aeb5025cb8e40d6c07
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Apr 30 09:18:11 2015 +1000

    xrealloc -> xreallocarray in portable code too.

commit 531a57a3893f9fcd4aaaba8c312b612bbbcc021e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Apr 29 03:48:56 2015 +0000

    upstream commit
    
    Allow ListenAddress, Port and AddressFamily in any
     order.  bz#68, ok djm@, jmc@ (for the man page bit).

commit c1d5bcf1aaf1209af02f79e48ba1cbc76a87b56f
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Tue Apr 28 13:47:38 2015 +0000

    upstream commit
    
    enviroment -> environment: apologies to darren for not
     spotting that first time round...

commit 43beea053db191cac47c2cd8d3dc1930158aff1a
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Apr 28 10:25:15 2015 +0000

    upstream commit
    
    Fix typo in previous

commit 85b96ef41374f3ddc9139581f87da09b2cd9199e
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Apr 28 10:17:58 2015 +0000

    upstream commit
    
    Document that the TERM environment variable is not
     subject to SendEnv and AcceptEnv.  bz#2386, based loosely on a patch from
     jjelen at redhat, help and ok jmc@

commit 88a7c598a94ff53f76df228eeaae238d2d467565
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Apr 27 21:42:48 2015 +0000

    upstream commit
    
    Make sshd default to PermitRootLogin=no; ok deraadt@
     rpe@

commit 734226b4480a6c736096c729fcf6f391400599c7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Apr 27 01:52:30 2015 +0000

    upstream commit
    
    fix compilation with OPENSSL=no; ok dtucker@

commit a4b9d2ce1eb7703eaf0809b0c8a82ded8aa4f1c6
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Mon Apr 27 00:37:53 2015 +0000

    upstream commit
    
    Include stdio.h for FILE (used in sshkey.h) so it
     compiles with OPENSSL=no.

commit dbcc652f4ca11fe04e5930c7ef18a219318c6cda
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Apr 27 00:21:21 2015 +0000

    upstream commit
    
    allow "sshd -f none" to skip reading the config file,
     much like "ssh -F none" does. ok dtucker

commit b7ca276fca316c952f0b90f5adb1448c8481eedc
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Fri Apr 24 06:26:49 2015 +0000

    upstream commit
    
    combine -Dd onto one line and update usage();

commit 2ea974630d7017e4c7666d14d9dc939707613e96
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 24 05:26:44 2015 +0000

    upstream commit
    
    add ssh-agent -D to leave ssh-agent in foreground
     without enabling debug mode; bz#2381 ok dtucker@

commit 8ac2ffd7aa06042f6b924c87139f2fea5c5682f7
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Apr 24 01:36:24 2015 +0000

    upstream commit
    
    2*len -> use xreallocarray() ok djm

commit 657a5fbc0d0aff309079ff8fb386f17e964963c2
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Apr 24 01:36:00 2015 +0000

    upstream commit
    
    rename xrealloc() to xreallocarray() since it follows
     that form. ok djm

commit 1108ae242fdd2c304307b68ddf46aebe43ebffaa
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Apr 23 04:59:10 2015 +0000

    upstream commit
    
    Two small fixes for sshd -T: ListenAddress'es are added
     to a list head so reverse the order when printing them to ensure the
     behaviour remains the same, and print StreamLocalBindMask as octal with
     leading zero.  ok deraadt@

commit bd902b8473e1168f19378d5d0ae68d0c203525df
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Apr 23 04:53:53 2015 +0000

    upstream commit
    
    Check for and reject missing arguments for
     VersionAddendum and ForceCommand. bz#2281, patch from plautrba at redhat com,
     ok djm@

commit ca42c1758575e592239de1d5755140e054b91a0d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Apr 22 01:24:01 2015 +0000

    upstream commit
    
    unknown certificate extensions are non-fatal, so don't
     fatal when they are encountered; bz#2387 reported by Bob Van Zant; ok
     dtucker@

commit 39bfbf7caad231cc4bda6909fb1af0705bca04d8
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Tue Apr 21 07:01:00 2015 +0000

    upstream commit
    
    Add back a backslash removed in rev 1.42 so
     KEX_SERVER_ENCRYPT will include aes again.
    
    ok deraadt@

commit 6b0d576bb87eca3efd2b309fcfe4edfefc289f9c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 17 13:32:09 2015 +0000

    upstream commit
    
    s/recommended/required/ that private keys be og-r this
     wording change was made a while ago but got accidentally reverted

commit 44a8e7ce6f3ab4c2eb1ae49115c210b98e53c4df
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 17 13:25:52 2015 +0000

    upstream commit
    
    don't try to cleanup NULL KEX proposals in
     kex_prop_free(); found by Jukka Taimisto and Markus Hietava

commit 3038a191872d2882052306098c1810d14835e704
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 17 13:19:22 2015 +0000

    upstream commit
    
    use error/logit/fatal instead of fprintf(stderr, ...)
     and exit(0), fix a few errors that were being printed to stdout instead of
     stderr and a few non-errors that were going to stderr instead of stdout
     bz#2325; ok dtucker

commit a58be33cb6cd24441fa7e634db0e5babdd56f07f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 17 13:16:48 2015 +0000

    upstream commit
    
    debug log missing DISPLAY environment when X11
     forwarding requested; bz#1682 ok dtucker@

commit 17d4d9d9fbc8fb80e322f94d95eecc604588a474
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 17 04:32:31 2015 +0000

    upstream commit
    
    don't call record_login() in monitor when UseLogin is
     enabled; bz#278 reported by drk AT sgi.com; ok dtucker

commit 40132ff87b6cbc3dc05fb5df2e9d8e3afa06aafd
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 17 04:12:35 2015 +0000

    upstream commit
    
    Add some missing options to sshd -T and fix the output
     of VersionAddendum HostCertificate.  bz#2346, patch from jjelen at redhat
     com, ok djm.

commit 6cc7cfa936afde2d829e56ee6528c7ea47a42441
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Apr 16 23:25:50 2015 +0000

    upstream commit
    
    Document "none" for PidFile XAuthLocation
     TrustedUserCAKeys and RevokedKeys. bz#2382, feedback from jmc@, ok djm@

commit 15fdfc9b1c6808b26bc54d4d61a38b54541763ed
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Wed Apr 15 23:23:25 2015 +0000

    upstream commit
    
    Plug leak of address passed to logging.  bz#2373, patch
     from jjelen at redhat, ok markus@

commit bb2289e2a47d465eaaaeff3dee2a6b7777b4c291
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Tue Apr 14 04:17:03 2015 +0000

    upstream commit
    
    Output remote username in debug output since with Host
     and Match it's not always obvious what it will be.  bz#2368, ok djm@

commit 70860b6d07461906730632f9758ff1b7c98c695a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 17 10:56:13 2015 +1000

    Format UsePAM setting when using sshd -T.
    
    Part of bz#2346, patch from jjelen at redhat com.

commit ee15d9c9f0720f5a8b0b34e4b10ecf21f9824814
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 17 10:40:23 2015 +1000

    Wrap endian.h include inside ifdef (bz#2370).

commit 408f4c2ad4a4c41baa7b9b2b7423d875abbfa70b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 17 09:39:58 2015 +1000

    Look for '${host}-ar' before 'ar'.
    
    This changes configure.ac to look for '${host}-ar' as set by
    AC_CANONICAL_HOST before looking for the unprefixed 'ar'.
    Useful when cross-compiling when all your binutils are prefixed.
    
    Patch from moben at exherbo org via astrand at lysator liu se and
    bz#2352.

commit 673a1c16ad078d41558247ce739fe812c960acc8
Author: Damien Miller <djm@google.com>
Date:   Thu Apr 16 11:40:20 2015 +1000

    remove dependency on arpa/telnet.h

commit 202d443eeda1829d336595a3cfc07827e49f45ed
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Apr 15 15:59:49 2015 +1000

    Remove duplicate include of pwd.h.  bz#2337, patch from Mordy Ovits.

commit 597986493412c499f2bc2209420cb195f97b3668
Author: Damien Miller <djm@google.com>
Date:   Thu Apr 9 10:14:48 2015 +1000

    platform's with openpty don't need pty_release

commit 318be28cda1fd9108f2e6f2f86b0b7589ba2aed0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Apr 13 02:04:08 2015 +0000

    upstream commit
    
    deprecate ancient, pre-RFC4419 and undocumented
     SSH2_MSG_KEX_DH_GEX_REQUEST_OLD message; ok markus@ deraadt@ "seems
     reasonable" dtucker@

commit d8f391caef62378463a0e6b36f940170dadfe605
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Fri Apr 10 05:16:50 2015 +0000

    upstream commit
    
    Don't send hostkey advertisments
     (hostkeys-00@openssh.com) to current versions of Tera Term as they can't
     handle them.  Newer versions should be OK.  Patch from Bryan Drewery and
     IWAMOTO Kouichi, ok djm@

commit 2c2cfe1a1c97eb9a08cc9817fd0678209680c636
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 10 00:08:55 2015 +0000

    upstream commit
    
    include port number if a non-default one has been
     specified; based on patch from Michael Handler

commit 4492a4f222da4cf1e8eab12689196322e27b08c4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Apr 7 23:00:42 2015 +0000

    upstream commit
    
    treat Protocol=1,2|2,1 as Protocol=2 when compiled
     without SSH1 support; ok dtucker@ millert@

commit c265e2e6e932efc6d86f6cc885dea33637a67564
Author: miod@openbsd.org <miod@openbsd.org>
Date:   Sun Apr 5 15:43:43 2015 +0000

    upstream commit
    
    Do not use int for sig_atomic_t; spotted by
     christos@netbsd; ok markus@

commit e7bf3a5eda6a1b02bef6096fed78527ee11e54cc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Apr 7 10:48:04 2015 +1000

    Use do{}while(0) for no-op functions.
    
    From FreeBSD.

commit bb99844abae2b6447272f79e7fa84134802eb4df
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Apr 7 10:47:15 2015 +1000

    Wrap blf.h include in ifdef.  From FreeBSD.

commit d9b9b43656091cf0ad55c122f08fadb07dad0abd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Apr 7 09:10:00 2015 +1000

    Fix misspellings of regress CONFOPTS env variables.
    
    Patch from Bryan Drewery.

commit 3f4ea3c9ab1d32d43c9222c4351f58ca11144156
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Apr 3 22:17:27 2015 +0000

    upstream commit
    
    correct return value in pubkey parsing, spotted by Ben Hawkes
     ok markus@

commit 7da2be0cb9601ed25460c83aa4d44052b967ba0f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 31 22:59:01 2015 +0000

    upstream commit
    
    adapt to recent hostfile.c change: when parsing
     known_hosts without fully parsing the keys therein, hostkeys_foreach() will
     now correctly identify KEY_RSA1 keys; ok markus@ miod@

commit 9e1777a0d1c706714b055811c12ab8cc21033e4a
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Mar 24 20:19:15 2015 +0000

    upstream commit
    
    use ${SSH} for -Q instead of installed ssh

commit ce1b358ea414a2cc88e4430cd5a2ea7fecd9de57
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 16 22:46:14 2015 +0000

    upstream commit
    
    make CLEANFILES clean up more of the tests' droppings

commit 398f9ef192d820b67beba01ec234d66faca65775
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 31 22:57:06 2015 +0000

    upstream commit
    
    downgrade error() for known_hosts parse errors to debug()
     to quiet warnings from ssh1 keys present when compiled !ssh1.
    
    also identify ssh1 keys when scanning, even when compiled !ssh1
    
    ok markus@ miod@

commit 9a47ab80030a31f2d122b8fd95bd48c408b9fcd9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 31 22:55:50 2015 +0000

    upstream commit
    
    fd leak for !ssh1 case; found by unittests; ok markus@

commit c9a0805a6280681901c270755a7cd630d7c5280e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 31 22:55:24 2015 +0000

    upstream commit
    
    don't fatal when a !ssh1 sshd is reexeced from a w/ssh1
     listener; reported by miod@; ok miod@ markus@

commit 704d8c88988cae38fb755a6243b119731d223222
Author: tobias@openbsd.org <tobias@openbsd.org>
Date:   Tue Mar 31 11:06:49 2015 +0000

    upstream commit
    
    Comments are only supported for RSA1 keys. If a user
     tried to add one and entered his passphrase, explicitly clear it before exit.
     This is done in all other error paths, too.
    
    ok djm

commit 78de1673c05ea2c33e0d4a4b64ecb5186b6ea2e9
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Mar 30 18:28:37 2015 +0000

    upstream commit
    
    ssh-askpass(1) is the default, overridden by SSH_ASKPASS;
     diff originally from jiri b;

commit 26e0bcf766fadb4a44fb6199386fb1dcab65ad00
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 30 00:00:29 2015 +0000

    upstream commit
    
    fix uninitialised memory read when parsing a config file
     consisting of a single nul byte. Found by hanno AT hboeck.de using AFL; ok
     dtucker

commit fecede00a76fbb33a349f5121c0b2f9fbc04a777
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Mar 26 19:32:19 2015 +0000

    upstream commit
    
    sigp and lenp are not optional in ssh_agent_sign(); ok
     djm@

commit 1b0ef3813244c78669e6d4d54c624f600945327d
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Thu Mar 26 12:32:38 2015 +0000

    upstream commit
    
    don't try to load .ssh/identity by default if SSH1 is
     disabled; ok markus@

commit f9b78852379b74a2d14e6fc94fe52af30b7e9c31
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Mar 26 07:00:04 2015 +0000

    upstream commit
    
    ban all-zero curve25519 keys as recommended by latest
     CFRG curves draft; ok markus

commit b8afbe2c1aaf573565e4da775261dfafc8b1ba9c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Mar 26 06:59:28 2015 +0000

    upstream commit
    
    relax bits needed check to allow
     diffie-hellman-group1-sha1 key exchange to complete for chacha20-poly1305 was
     selected as symmetric cipher; ok markus

commit 47842f71e31da130555353c1d57a1e5a8937f1c0
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Mar 25 19:29:58 2015 +0000

    upstream commit
    
    ignore v1 errors on ssh-add -D; only try v2 keys on
     -l/-L (unless WITH_SSH1) ok djm@

commit 5f57e77f91bf2230c09eca96eb5ecec39e5f2da6
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Mar 25 19:21:48 2015 +0000

    upstream commit
    
    unbreak ssh_agent_sign (lenp vs *lenp)

commit 4daeb67181054f2a377677fac919ee8f9ed3490e
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Mar 24 20:10:08 2015 +0000

    upstream commit
    
    don't leak 'setp' on error; noted by Nicholas Lemonias;
     ok djm@

commit 7d4f96f9de2a18af0d9fa75ea89a4990de0344f5
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Mar 24 20:09:11 2015 +0000

    upstream commit
    
    consistent check for NULL as noted by Nicholas
     Lemonias; ok djm@

commit df100be51354e447d9345cf1ec22e6013c0eed50
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Mar 24 20:03:44 2015 +0000

    upstream commit
    
    correct fmt-string for size_t as noted by Nicholas
     Lemonias; ok djm@

commit a22b9ef21285e81775732436f7c84a27bd3f71e0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 24 09:17:21 2015 +0000

    upstream commit
    
    promote chacha20-poly1305@openssh.com to be the default
     cipher; ok markus

commit 2aa9da1a3b360cf7b13e96fe1521534b91501fb5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 24 01:29:19 2015 +0000

    upstream commit
    
    Compile-time disable SSH protocol 1. You can turn it
     back on using the Makefile.inc knob if you need it to talk to ancient
     devices.

commit 53097b2022154edf96b4e8526af5666f979503f7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 24 01:11:12 2015 +0000

    upstream commit
    
    fix double-negative error message "ssh1 is not
     unsupported"

commit 5c27e3b6ec2db711dfcd40e6359c0bcdd0b62ea9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 23 06:06:38 2015 +0000

    upstream commit
    
    for ssh-keygen -A, don't try (and fail) to generate ssh
     v.1 keys when compiled without SSH1 support RSA/DSA/ECDSA keys when compiled
     without OpenSSL based on patch by Mike Frysinger; bz#2369

commit 725fd22a8c41db7de73a638539a5157b7e4424ae
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 18 01:44:21 2015 +0000

    upstream commit
    
    KRL support doesn't need OpenSSL anymore, remove #ifdefs
     from around call

commit b07011c18e0b2e172c5fd09d21fb159a0bf5fcc7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Mar 16 11:09:52 2015 +0000

    upstream commit
    
    #if 0 some more arrays used only for decrypting (we don't
     use since we only need encrypt for AES-CTR)

commit 1cb3016635898d287e9d58b50c430995652d5358
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Wed Mar 11 00:48:39 2015 +0000

    upstream commit
    
    add back the changes from rev 1.206, djm reverted this by
     mistake in rev 1.207

commit 4d24b3b6a4a6383e05e7da26d183b79fa8663697
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 20 09:11:59 2015 +1100

    remove error() accidentally inserted for debugging
    
    pointed out by Christian Hesse

commit 9f82e5a9042f2d872e98f48a876fcab3e25dd9bb
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Mar 16 22:49:20 2015 -0700

    portability fix: Solaris systems may not have a grep that understands -q

commit 8ef691f7d9ef500257a549d0906d78187490668f
Author: Damien Miller <djm@google.com>
Date:   Wed Mar 11 10:35:26 2015 +1100

    fix compile with clang

commit 4df590cf8dc799e8986268d62019b487a8ed63ad
Author: Damien Miller <djm@google.com>
Date:   Wed Mar 11 10:02:39 2015 +1100

    make unit tests work for !OPENSSH_HAS_ECC

commit 307bb40277ca2c32e97e61d70d1ed74b571fd6ba
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Mar 7 04:41:48 2015 +0000

    upstream commit
    
    unbreak for w/SSH1 (default) case; ok markus@ deraadt@

commit b44ee0c998fb4c5f3c3281f2398af5ce42840b6f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 5 18:39:20 2015 -0800

    unbreak hostkeys test for w/ SSH1 case

commit 55e5bdeb519cb60cc18b7ba0545be581fb8598b4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Mar 6 01:40:56 2015 +0000

    upstream commit
    
    fix sshkey_certify() return value for unsupported key types;
     ok markus@ deraadt@

commit be8f658e550a434eac04256bfbc4289457a24e99
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 4 15:38:03 2015 -0800

    update version numbers to match version.h

commit ac5e8acefa253eb5e5ba186e34236c0e8007afdc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 4 23:22:35 2015 +0000

    upstream commit
    
    make these work with !SSH1; ok markus@ deraadt@

commit 2f04af92f036b0c87a23efb259c37da98cd81fe6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 4 21:12:59 2015 +0000

    upstream commit
    
    make ssh-add -D work with !SSH1 agent

commit a05adf95d2af6abb2b7826ddaa7a0ec0cdc1726b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 4 00:55:48 2015 -0800

    netcat needs poll.h portability goop

commit dad2b1892b4c1b7e58df483a8c5b983c4454e099
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Mar 3 22:35:19 2015 +0000

    upstream commit
    
    make it possible to run tests w/o ssh1 support; ok djm@

commit d48a22601bdd3eec054794c535f4ae8d8ae4c6e2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Mar 4 18:53:53 2015 +0000

    upstream commit
    
    crank; ok markus, deraadt

commit bbffb23daa0b002dd9f296e396a9ab8a5866b339
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 3 13:50:27 2015 -0800

    more --without-ssh1 fixes

commit 6c2039286f503e2012a58a1d109e389016e7a99b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 3 13:48:48 2015 -0800

    fix merge both that broke --without-ssh1 compile

commit 111dfb225478a76f89ecbcd31e96eaf1311b59d3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 3 21:21:13 2015 +0000

    upstream commit
    
    add SSH1 Makefile knob to make it easier to build without
     SSH1 support; ok markus@

commit 3f7f5e6c5d2aa3f6710289c1a30119e534e56c5c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 3 20:42:49 2015 +0000

    upstream commit
    
    expand __unused to full __attribute__ for better portability

commit 2fab9b0f8720baf990c931e3f68babb0bf9949c6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 4 07:41:27 2015 +1100

    avoid warning

commit d1bc844322461f882b4fd2277ba9a8d4966573d2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 4 06:31:45 2015 +1100

    Revert "define __unused to nothing if not already defined"
    
    This reverts commit 1598419e38afbaa8aa5df8dd6b0af98301e2c908.
    
    Some system headers have objects named __unused

commit 00797e86b2d98334d1bb808f65fa1fd47f328ff1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 4 05:02:45 2015 +1100

    check for crypt and DES_crypt in openssl block
    
    fixes builds on systems that use DES_crypt; based on patch
    from Roumen Petrov

commit 1598419e38afbaa8aa5df8dd6b0af98301e2c908
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 4 04:59:13 2015 +1100

    define __unused to nothing if not already defined
    
    fixes builds on BSD/OS

commit d608a51daad4f14ad6ab43d7cf74ef4801cc3fe9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 3 17:53:40 2015 +0000

    upstream commit
    
    reorder logic for better portability; patch from Roumen
     Petrov

commit 68d2dfc464fbcdf8d6387884260f9801f4352393
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Mar 3 06:48:58 2015 +0000

    upstream commit
    
    Allow "ssh -Q protocol-version" to list supported SSH
     protocol versions. Useful for detecting builds without SSH v.1 support; idea
     and ok markus@

commit 39e2f1229562e1195169905607bc12290d21f021
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Sun Mar 1 15:44:40 2015 +0000

    upstream commit
    
    Make sure we only call getnameinfo() for AF_INET or AF_INET6
     sockets. getpeername() of a Unix domain socket may return without error on
     some systems without actually setting ss_family so getnameinfo() was getting
     called with ss_family set to AF_UNSPEC.  OK djm@

commit e47536ba9692d271b8ad89078abdecf0a1c11707
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 28 08:20:11 2015 -0800

    portability fixes for regress/netcat.c
    
    Mostly avoiding "err(1, NULL)"

commit 02973ad5f6f49d8420e50a392331432b0396c100
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 28 08:05:27 2015 -0800

    twiddle another test for portability
    
    from Tom G. Christensen

commit f7f3116abf2a6e2f309ab096b08c58d19613e5d0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 27 15:52:49 2015 -0800

    twiddle test for portability

commit 1ad3a77cc9d5568f5437ff99d377aa7a41859b83
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 26 20:33:22 2015 -0800

    make regress/netcat.c fd passing (more) portable

commit 9e1cfca7e1fe9cf8edb634fc894e43993e4da1ea
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 26 20:32:58 2015 -0800

    create OBJ/valgrind-out before running unittests

commit bd58853102cee739f0e115e6d4b5334332ab1442
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 25 16:58:22 2015 -0800

    valgrind support

commit f43d17269194761eded9e89f17456332f4c83824
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Feb 26 20:45:47 2015 +0000

    upstream commit
    
    don't printf NULL key comments; reported by Tom Christensen

commit 6e6458b476ec854db33e3e68ebf4f489d0ab3df8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 25 23:05:47 2015 +0000

    upstream commit
    
    zero cmsgbuf before use; we initialise the bits we use
     but valgrind still spams warning on it

commit a63cfa26864b93ab6afefad0b630e5358ed8edfa
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 25 19:54:02 2015 +0000

    upstream commit
    
    fix small memory leak when UpdateHostkeys=no

commit e6b950341dd75baa8526f1862bca39e52f5b879b
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Feb 25 09:56:48 2015 -0800

    Revert "Work around finicky USL linker so netcat will build."
    
    This reverts commit d1db656021d0cd8c001a6692f772f1de29b67c8b.
    
    No longer needed with commit 678e473e2af2e4802f24dd913985864d9ead7fb3

commit 6f621603f9cff2a5d6016a404c96cb2f8ac2dec0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 25 17:29:38 2015 +0000

    upstream commit
    
    don't leak validity of user in "too many authentication
     failures" disconnect message; reported by Sebastian Reitenbach

commit 6288e3a935494df12519164f52ca5c8c65fc3ca5
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Tue Feb 24 15:24:05 2015 +0000

    upstream commit
    
    add -v (show ASCII art) to -l's synopsis; ok djm@

commit 678e473e2af2e4802f24dd913985864d9ead7fb3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 26 04:12:58 2015 +1100

    Remove dependency on xmalloc.
    
    Remove ssh_get_progname's dependency on xmalloc, which should reduce
    link order problems.  ok djm@

commit 5d5ec165c5b614b03678afdad881f10e25832e46
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 25 15:32:49 2015 +1100

    Restrict ECDSA and ECDH tests.
    
    ifdef out some more ECDSA and ECDH tests when built against an OpenSSL
    that does not have eliptic curve functionality.

commit 1734e276d99b17e92d4233fac7aef3a3180aaca7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 25 13:40:45 2015 +1100

    Move definition of _NSIG.
    
    _NSIG is only unsed in one file, so move it there prevent redefinition
    warnings reported by Kevin Brott.

commit a47ead7c95cfbeb72721066c4da2312e5b1b9f3d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 25 13:17:40 2015 +1100

    Add includes.h for compatibility stuff.

commit 38806bda6d2e48ad32812b461eebe17672ada771
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 24 16:50:06 2015 -0800

    include netdb.h to look for MAXHOSTNAMELEN; ok tim

commit d1db656021d0cd8c001a6692f772f1de29b67c8b
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 24 10:42:08 2015 -0800

    Work around finicky USL linker so netcat will build.

commit cb030ce25f555737e8ba97bdd7883ac43f3ff2a3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 24 09:23:04 2015 -0800

    include includes.h to avoid build failure on AIX

commit 13af342458f5064144abbb07e5ac9bbd4eb42567
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 24 07:56:47 2015 -0800

    Original portability patch from djm@ for platforms missing err.h.
    Fix name space clash on Solaris 10. Still more to do for Solaris 10
    to deal with msghdr structure differences. ok djm@

commit 910209203d0cd60c5083901cbcc0b7b44d9f48d2
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Feb 23 22:06:56 2015 -0800

    cleaner way fix dispatch.h portion of commit
    a88dd1da119052870bb2654c1a32c51971eade16
    (some systems have sig_atomic_t in signal.h, some in sys/signal.h)
    Sounds good to me djm@

commit 676c38d7cbe65b76bbfff796861bb6615cc6a596
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Feb 23 21:51:33 2015 -0800

    portability fix: if we can't dind a better define for HOST_NAME_MAX, use 255

commit 1221b22023dce38cbc90ba77eae4c5d78c77a5e6
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Feb 23 21:50:34 2015 -0800

    portablity fix: s/__inline__/inline/

commit 4c356308a88d309c796325bb75dce90ca16591d5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 13:49:31 2015 +1100

    Wrap stdint.h includes in HAVE_STDINT_H.

commit c9c88355c6a27a908e7d1e5003a2b35ea99c1614
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 13:43:57 2015 +1100

    Add AI_NUMERICSERV to fake-rfc2553.
    
    Our getaddrinfo implementation always returns numeric values already.

commit ef342ab1ce6fb9a4b30186c89c309d0ae9d0eeb4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 13:39:57 2015 +1100

    Include OpenSSL's objects.h before bn.h.
    
    Prevents compile errors on some platforms (at least old GCCs and AIX's
    XLC compilers).

commit dcc8997d116f615195aa7c9ec019fb36c28c6228
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 12:30:59 2015 +1100

    Convert two macros into functions.
    
    Convert packet_send_debug and packet_disconnect from macros to
    functions.  Some older GCCs (2.7.x, 2.95.x) see to have problems with
    variadic macros with only one argument so we convert these two into
    functions.  ok djm@

commit 2285c30d51b7e2052c6526445abe7e7cc7e170a1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 23 22:21:21 2015 +0000

    upstream commit
    
    further silence spurious error message even when -v is
     specified (e.g. to get visual host keys); reported by naddy@

commit 9af21979c00652029e160295e988dea40758ece2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 24 09:04:32 2015 +1100

    don't include stdint.h unless HAVE_STDINT_H set

commit 62f678dd51660d6f8aee1da33d3222c5de10a89e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 24 09:02:54 2015 +1100

    nother sys/queue.h -> sys-queue.h fix
    
    spotted by Tom Christensen

commit b3c19151cba2c0ed01b27f55de0d723ad07ca98f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 23 20:32:15 2015 +0000

    upstream commit
    
    fix a race condition by using a mux socket rather than an
     ineffectual wait statement

commit a88dd1da119052870bb2654c1a32c51971eade16
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 24 06:30:29 2015 +1100

    various include fixes for portable

commit 5248429b5ec524d0a65507cff0cdd6e0cb99effd
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 23 16:55:51 2015 +0000

    upstream commit
    
    add an XXX to remind me to improve sshkey_load_public

commit e94e4b07ef2eaead38b085a60535df9981cdbcdb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 23 16:55:31 2015 +0000

    upstream commit
    
    silence a spurious error message when listing
     fingerprints for known_hosts; bz#2342

commit f2293a65392b54ac721f66bc0b44462e8d1d81f8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 23 16:33:25 2015 +0000

    upstream commit
    
    fix setting/clearing of TTY raw mode around
     UpdateHostKeys=ask confirmation question; reported by Herb Goldman

commit f2004cd1adf34492eae0a44b1ef84e0e31b06088
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 23 05:04:21 2015 +1100

    Repair for non-ECC OpenSSL.
    
    Ifdef out the ECC parts when building with an OpenSSL that doesn't have
    it.

commit 37f9220db8d1a52c75894c3de1e5f2ae5bd71b6f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 23 03:07:24 2015 +1100

    Wrap stdint.h includes in ifdefs.

commit f81f1bbc5b892c8614ea740b1f92735652eb43f0
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Feb 21 18:12:10 2015 -0800

    out of tree build fix

commit 2e13a1e4d22f3b503c3bfc878562cc7386a1d1ae
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Feb 21 18:08:51 2015 -0800

    mkdir kex unit test directory so testing out of tree builds works

commit 1797f49b1ba31e8700231cd6b1d512d80bb50d2c
Author: halex@openbsd.org <halex@openbsd.org>
Date:   Sat Feb 21 21:46:57 2015 +0000

    upstream commit
    
    make "ssh-add -d" properly remove a corresponding
     certificate, and also not whine and fail if there is none
    
    ok djm@

commit 7faaa32da83a609059d95dbfcb0649fdb04caaf6
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 22 07:57:27 2015 +1100

    mkdir hostkey and bitmap unit test directories

commit bd49da2ef197efac5e38f5399263a8b47990c538
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 20 23:46:01 2015 +0000

    upstream commit
    
    sort options useable under Match case-insensitively; prodded
     jmc@

commit 1a779a0dd6cd8b4a1a40ea33b5415ab8408128ac
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Feb 21 20:51:02 2015 +0000

    upstream commit
    
    correct paths to configuration files being written/updated;
     they live in $OBJ not cwd; some by Roumen Petrov

commit 28ba006c1acddff992ae946d0bc0b500b531ba6b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Feb 21 15:41:07 2015 +1100

    More correct checking of HAVE_DECL_AI_NUMERICSERV.

commit e50e8c97a9cecae1f28febccaa6ca5ab3bc10f54
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Feb 21 15:10:33 2015 +1100

    Add null declaration of AI_NUMERICINFO.
    
    Some platforms (older FreeBSD and DragonFly versions) do have
    getaddrinfo() but do not have AI_NUMERICINFO. so define it to zero
    in those cases.

commit 18a208d6a460d707a45916db63a571e805f5db46
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 20 22:40:32 2015 +0000

    upstream commit
    
    more options that are available under Match; bz#2353 reported
     by calestyo AT scientia.net

commit 44732de06884238049f285f1455b2181baa7dc82
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Feb 20 22:17:21 2015 +0000

    upstream commit
    
    UpdateHostKeys fixes:
    
    I accidentally changed the format of the hostkeys@openssh.com messages
    last week without changing the extension name, and this has been causing
    connection failures for people who are running -current. First reported
    by sthen@
    
    s/hostkeys@openssh.com/hostkeys-00@openssh.com/
    Change the name of the proof message too, and reorder it a little.
    
    Also, UpdateHostKeys=ask is incompatible with ControlPersist (no TTY
    available to read the response) so disable UpdateHostKeys if it is in
    ask mode and ControlPersist is active (and document this)

commit 13a39414d25646f93e6d355521d832a03aaaffe2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Feb 17 00:14:05 2015 +0000

    upstream commit
    
    Regression: I broke logging of public key fingerprints in
     1.46. Pointed out by Pontus Lundkvist

commit 773dda25e828c4c9a52f7bdce6e1e5924157beab
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 30 23:10:17 2015 +1100

    repair --without-openssl; broken in refactor

commit e89c780886b23600de1e1c8d74aabd1ff61f43f0
Author: Damien Miller <djm@google.com>
Date:   Tue Feb 17 10:04:55 2015 +1100

    hook up hostkeys unittest to portable Makefiles

commit 0abf41f99aa16ff09b263bead242d6cb2dbbcf99
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 16 22:21:03 2015 +0000

    upstream commit
    
    enable hostkeys unit tests

commit 68a5d647ccf0fb6782b2f749433a1eee5bc9044b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 16 22:20:50 2015 +0000

    upstream commit
    
    check string/memory compare arguments aren't NULL

commit ef575ef20d09f20722e26b45dab80b3620469687
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 16 22:18:34 2015 +0000

    upstream commit
    
    unit tests for hostfile.c code, just hostkeys_foreach so
     far

commit 8ea3365e6aa2759ccf5c76eaea62cbc8a280b0e7
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Sat Feb 14 12:43:16 2015 +0000

    upstream commit
    
    test server rekey limit

commit ce63c4b063c39b2b22d4ada449c9e3fbde788cb3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 16 22:30:03 2015 +0000

    upstream commit
    
    partial backout of:
    
    revision 1.441
    date: 2015/01/31 20:30:05;  author: djm;  state: Exp;  lines: +17 -10;  commitid
    : x8klYPZMJSrVlt3O;
    Let sshd load public host keys even when private keys are missing.
    Allows sshd to advertise additional keys for future key rotation.
    Also log fingerprint of hostkeys loaded; ok markus@
    
    hostkey updates now require access to the private key, so we can't
    load public keys only. The improved log messages (fingerprints of keys
    loaded) are kept.

commit 523463a3a2a9bfc6cfc5afa01bae9147f76a37cc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 16 22:13:32 2015 +0000

    upstream commit
    
    Revise hostkeys@openssh.com hostkey learning extension.
    
    The client will not ask the server to prove ownership of the private
    halves of any hitherto-unseen hostkeys it offers to the client.
    
    Allow UpdateHostKeys option to take an 'ask' argument to let the
    user manually review keys offered.
    
    ok markus@

commit 6c5c949782d86a6e7d58006599c7685bfcd01685
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 16 22:08:57 2015 +0000

    upstream commit
    
    Refactor hostkeys_foreach() and dependent code Deal with
     IP addresses (i.e. CheckHostIP) Don't clobber known_hosts when nothing
     changed ok markus@ as part of larger commit

commit 51b082ccbe633dc970df1d1f4c9c0497115fe721
Author: miod@openbsd.org <miod@openbsd.org>
Date:   Mon Feb 16 18:26:26 2015 +0000

    upstream commit
    
    Declare ge25519_base as extern, to prevent it from
     becoming a common. Gets us rid of ``lignment 4 of symbol
     `crypto_sign_ed25519_ref_ge25519_base' in mod_ge25519.o is smaller than 16 in
     mod_ed25519.o'' warnings at link time.

commit 02db468bf7e3281a8e3c058ced571b38b6407c34
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Fri Feb 13 18:57:00 2015 +0000

    upstream commit
    
    make rekey_limit for sshd w/privsep work; ok djm@
     dtucker@

commit 8ec67d505bd23c8bf9e17b7a364b563a07a58ec8
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date:   Thu Feb 12 20:34:19 2015 +0000

    upstream commit
    
    Prevent sshd spamming syslog with
     "ssh_dispatch_run_fatal: disconnected". ok markus@

commit d4c0295d1afc342057ba358237acad6be8af480b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Feb 11 01:20:38 2015 +0000

    upstream commit
    
    Some packet error messages show the address of the peer,
     but might be generated after the socket to the peer has suffered a TCP reset.
     In these cases, getpeername() won't work so cache the address earlier.
    
    spotted in the wild via deraadt@ and tedu@

commit 4af1709cf774475ce5d1bc3ddcc165f6c222897d
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Mon Feb 9 23:22:37 2015 +0000

    upstream commit
    
    fix some leaks in error paths ok markus@

commit fd36834871d06a03e1ff8d69e41992efa1bbf85f
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Fri Feb 6 23:21:59 2015 +0000

    upstream commit
    
    SIZE_MAX is standard, we should be using it in preference to
     the obsolete SIZE_T_MAX.  OK miod@ beck@

commit 1910a286d7771eab84c0b047f31c0a17505236fa
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Thu Feb 5 12:59:57 2015 +0000

    upstream commit
    
    Include stdint.h, not limits.h to get SIZE_MAX.  OK guenther@

commit ce4f59b2405845584f45e0b3214760eb0008c06c
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Tue Feb 3 08:07:20 2015 +0000

    upstream commit
    
    missing ; djm and mlarkin really having great
     interactions recently

commit 5d34aa94938abb12b877a25be51862757f25d54b
Author: halex@openbsd.org <halex@openbsd.org>
Date:   Tue Feb 3 00:34:14 2015 +0000

    upstream commit
    
    slightly extend the passphrase prompt if running with -c
     in order to give the user a chance to notice if unintentionally running
     without it
    
    wording tweak and ok djm@

commit cb3bde373e80902c7d5d0db429f85068d19b2918
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 2 22:48:53 2015 +0000

    upstream commit
    
    handle PKCS#11 C_Login returning
     CKR_USER_ALREADY_LOGGED_IN; based on patch from Yuri Samoilenko; ok markus@

commit 15ad750e5ec3cc69765b7eba1ce90060e7083399
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Feb 2 07:41:40 2015 +0000

    upstream commit
    
    turn UpdateHostkeys off by default until I figure out
     mlarkin@'s warning message; requested by deraadt@

commit 3cd5103c1e1aaa59bd66f7f52f6ebbcd5deb12f9
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Mon Feb 2 01:57:44 2015 +0000

    upstream commit
    
    increasing encounters with difficult DNS setups in
     darknets has convinced me UseDNS off by default is better ok djm

commit 6049a548a8a68ff0bbe581ab1748ea6a59ecdc38
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 31 20:30:05 2015 +0000

    upstream commit
    
    Let sshd load public host keys even when private keys are
     missing. Allows sshd to advertise additional keys for future key rotation.
     Also log fingerprint of hostkeys loaded; ok markus@

commit 46347ed5968f582661e8a70a45f448e0179ca0ab
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 30 11:43:14 2015 +0000

    upstream commit
    
    Add a ssh_config HostbasedKeyType option to control which
     host public key types are tried during hostbased authentication.
    
    This may be used to prevent too many keys being sent to the server,
    and blowing past its MaxAuthTries limit.
    
    bz#2211 based on patch by Iain Morgan; ok markus@

commit 802660cb70453fa4d230cb0233bc1bbdf8328de1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 30 10:44:49 2015 +0000

    upstream commit
    
    set a timeout to prevent hangs when talking to busted
     servers; ok markus@

commit 86936ec245a15c7abe71a0722610998b0a28b194
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 30 01:11:39 2015 +0000

    upstream commit
    
    regression test for 'wildcard CA' serial/key ID revocations

commit 4509b5d4a4fa645a022635bfa7e86d09b285001f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 30 01:13:33 2015 +0000

    upstream commit
    
    avoid more fatal/exit in the packet.c paths that
     ssh-keyscan uses; feedback and "looks good" markus@

commit 669aee994348468af8b4b2ebd29b602cf2860b22
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 30 01:10:33 2015 +0000

    upstream commit
    
    permit KRLs that revoke certificates by serial number or
     key ID without scoping to a particular CA; ok markus@

commit 7a2c368477e26575d0866247d3313da4256cb2b5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 30 00:59:19 2015 +0000

    upstream commit
    
    missing parentheses after if in do_convert_from() broke
     private key conversion from other formats some time in 2010; bz#2345 reported
     by jjelen AT redhat.com

commit 25f5f78d8bf5c22d9cea8b49de24ebeee648a355
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 30 00:22:25 2015 +0000

    upstream commit
    
    fix ssh protocol 1, spotted by miod@

commit 9ce86c926dfa6e0635161b035e3944e611cbccf0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 28 22:36:00 2015 +0000

    upstream commit
    
    update to new API (key_fingerprint => sshkey_fingerprint)
     check sshkey_fingerprint return values; ok markus

commit 9125525c37bf73ad3ee4025520889d2ce9d10f29
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 28 22:05:31 2015 +0000

    upstream commit
    
    avoid fatal() calls in packet code makes ssh-keyscan more
     reliable against server failures ok dtucker@ markus@

commit fae7bbe544cba7a9e5e4ab47ff6faa3d978646eb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 28 21:15:47 2015 +0000

    upstream commit
    
    avoid fatal() calls in packet code makes ssh-keyscan more
     reliable against server failures ok dtucker@ markus@

commit 1a3d14f6b44a494037c7deab485abe6496bf2c60
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 28 11:07:25 2015 +0000

    upstream commit
    
    remove obsolete comment

commit 80c25b7bc0a71d75c43a4575d9a1336f589eb639
Author: okan@openbsd.org <okan@openbsd.org>
Date:   Tue Jan 27 12:54:06 2015 +0000

    upstream commit
    
    Since r1.2 removed the use of PRI* macros, inttypes.h is
     no longer required.
    
    ok djm@

commit 69ff64f69615c2a21c97cb5878a0996c21423257
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 27 23:07:43 2015 +1100

    compile on systems without TCP_MD5SIG (e.g. OSX)

commit 358964f3082fb90b2ae15bcab07b6105cfad5a43
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 27 23:07:25 2015 +1100

    use ssh-keygen under test rather than system's

commit a2c95c1bf33ea53038324d1fdd774bc953f98236
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 27 23:06:59 2015 +1100

    OSX lacks HOST_NAME_MAX, has _POSIX_HOST_NAME_MAX

commit ade31d7b6f608a19b85bee29a7a00b1e636a2919
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 27 23:06:23 2015 +1100

    these need active_state defined to link on OSX
    
    temporary measure until active_state goes away entirely

commit e56aa87502f22c5844918c10190e8b4f785f067b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 27 12:01:36 2015 +0000

    upstream commit
    
    use printf instead of echo -n to reduce diff against
     -portable

commit 9f7637f56eddfaf62ce3c0af89c25480f2cf1068
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Jan 26 13:55:29 2015 +0000

    upstream commit
    
    sort previous;

commit 3076ee7d530d5b16842fac7a6229706c7e5acd26
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 26 13:36:53 2015 +0000

    upstream commit
    
    properly restore umask

commit d411d395556b73ba1b9e451516a0bd6697c4b03d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 26 06:12:18 2015 +0000

    upstream commit
    
    regression test for host key rotation

commit fe8a3a51699afbc6407a8fae59b73349d01e49f8
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 26 06:11:28 2015 +0000

    upstream commit
    
    adapt to sshkey API tweaks

commit 7dd355fb1f0038a3d5cdca57ebab4356c7a5b434
Author: miod@openbsd.org <miod@openbsd.org>
Date:   Sat Jan 24 10:39:21 2015 +0000

    upstream commit
    
    Move -lz late in the linker commandline for things to
     build on static arches.

commit 0dad3b806fddb93c475b30853b9be1a25d673a33
Author: miod@openbsd.org <miod@openbsd.org>
Date:   Fri Jan 23 21:21:23 2015 +0000

    upstream commit
    
    -Wpointer-sign is supported by gcc 4 only.

commit 2b3b1c1e4bd9577b6e780c255c278542ea66c098
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 20 22:58:57 2015 +0000

    upstream commit
    
    use SUBDIR to recuse into unit tests; makes "make obj"
     actually work

commit 1d1092bff8db27080155541212b420703f8b9c92
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 26 12:16:36 2015 +0000

    upstream commit
    
    correct description of UpdateHostKeys in ssh_config.5 and
     add it to -o lists for ssh, scp and sftp; pointed out by jmc@

commit 5104db7cbd6cdd9c5971f4358e74414862fc1022
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 26 06:10:03 2015 +0000

    upstream commit
    
    correctly match ECDSA subtype (== curve) for
     offered/recevied host keys. Fixes connection-killing host key mismatches when
     a server offers multiple ECDSA keys with different curve type (an extremely
     unlikely configuration).
    
    ok markus, "looks mechanical" deraadt@

commit 8d4f87258f31cb6def9b3b55b6a7321d84728ff2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 26 03:04:45 2015 +0000

    upstream commit
    
    Host key rotation support.
    
    Add a hostkeys@openssh.com protocol extension (global request) for
    a server to inform a client of all its available host key after
    authentication has completed. The client may record the keys in
    known_hosts, allowing it to upgrade to better host key algorithms
    and a server to gracefully rotate its keys.
    
    The client side of this is controlled by a UpdateHostkeys config
    option (default on).
    
    ok markus@

commit 60b1825262b1f1e24fc72050b907189c92daf18e
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 26 02:59:11 2015 +0000

    upstream commit
    
    small refactor and add some convenience functions; ok
     markus

commit a5a3e3328ddce91e76f71ff479022d53e35c60c9
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Jan 22 21:00:42 2015 +0000

    upstream commit
    
    heirarchy -> hierarchy;

commit dcff5810a11195c57e1b3343c0d6b6f2b9974c11
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Thu Jan 22 20:24:41 2015 +0000

    upstream commit
    
    Provide a warning about chroot misuses (which sadly, seem
     to have become quite popular because shiny).  sshd cannot detect/manage/do
     anything about these cases, best we can do is warn in the right spot in the
     man page. ok markus

commit 087266ec33c76fc8d54ac5a19efacf2f4a4ca076
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Tue Jan 20 23:14:00 2015 +0000

    upstream commit
    
    Reduce use of <sys/param.h> and transition to <limits.h>
     throughout. ok djm markus

commit 57e783c8ba2c0797f93977e83b2a8644a03065d8
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Jan 20 20:16:21 2015 +0000

    upstream commit
    
    kex_setup errors are fatal()

commit 1d6424a6ff94633c221297ae8f42d54e12a20912
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 20 08:02:33 2015 +0000

    upstream commit
    
    this test would accidentally delete agent.sh if run without
     obj/

commit 12b5f50777203e12575f1b08568281e447249ed3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 20 07:56:44 2015 +0000

    upstream commit
    
    make this compile with KERBEROS5 enabled

commit e2cc6bef08941256817d44d146115b3478586ad4
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 20 07:55:33 2015 +0000

    upstream commit
    
    fix hostkeys in agent; ok markus@

commit 1ca3e2155aa5d3801a7ae050f85c71f41fcb95b1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 20 10:11:31 2015 +1100

    fix kex test

commit c78a578107c7e6dcf5d30a2f34cb6581bef14029
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 19 20:45:25 2015 +0000

    upstream commit
    
    finally enable the KEX tests I wrote some years ago...

commit 31821d7217e686667d04935aeec99e1fc4a46e7e
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 19 20:42:31 2015 +0000

    upstream commit
    
    adapt to new error message (SSH_ERR_MAC_INVALID)

commit d3716ca19e510e95d956ae14d5b367e364bff7f1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 19 17:31:13 2015 +0000

    upstream commit
    
    this test was broken in at least two ways, such that it
     wasn't checking that a KRL was not excluding valid keys

commit 3f797653748e7c2b037dacb57574c01d9ef3b4d3
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 19 20:32:39 2015 +0000

    upstream commit
    
    switch ssh-keyscan from setjmp to multiple ssh transport
     layer instances ok djm@

commit f582f0e917bb0017b00944783cd5f408bf4b0b5e
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 19 20:30:23 2015 +0000

    upstream commit
    
    add experimental api for packet layer; ok djm@

commit 48b3b2ba75181f11fca7f327058a591f4426cade
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 19 20:20:20 2015 +0000

    upstream commit
    
    store compat flags in struct ssh; ok djm@

commit 57d10cbe861a235dd269c74fb2fe248469ecee9d
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 19 20:16:15 2015 +0000

    upstream commit
    
    adapt kex to sshbuf and struct ssh; ok djm@

commit 3fdc88a0def4f86aa88a5846ac079dc964c0546a
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 19 20:07:45 2015 +0000

    upstream commit
    
    move dispatch to struct ssh; ok djm@

commit 091c302829210c41e7f57c3f094c7b9c054306f0
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 19 19:52:16 2015 +0000

    upstream commit
    
    update packet.c & isolate, introduce struct ssh a) switch
     packet.c to buffer api and isolate per-connection info into struct ssh b)
     (de)serialization of the state is moved from monitor to packet.c c) the old
     packet.c API is implemented in opacket.[ch] d) compress.c/h is removed and
     integrated into packet.c with and ok djm@

commit 4e62cc68ce4ba20245d208b252e74e91d3785b74
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 19 17:35:48 2015 +0000

    upstream commit
    
    fix format strings in (disabled) debugging

commit d85e06245907d49a2cd0cfa0abf59150ad616f42
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 19 06:01:32 2015 +0000

    upstream commit
    
    be a bit more careful in these tests to ensure that
     known_hosts is clean

commit 7947810eab5fe0ad311f32a48f4d4eb1f71be6cf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 18 22:00:18 2015 +0000

    upstream commit
    
    regression test for known_host file editing using
     ssh-keygen (-H / -R / -F) after hostkeys_foreach() change; feedback and ok
     markus@

commit 3a2b09d147a565d8a47edf37491e149a02c0d3a3
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 18 19:54:46 2015 +0000

    upstream commit
    
    more and better key tests
    
    test signatures and verification
    test certificate generation
    flesh out nested cert test
    
    removes most of the XXX todo markers

commit 589e69fd82724cfc9738f128e4771da2e6405d0d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 18 19:53:58 2015 +0000

    upstream commit
    
    make the signature fuzzing test much more rigorous:
     ensure that the fuzzed input cases do not match the original (using new
     fuzz_matches_original() function) and check that the verification fails in
     each case

commit 80603c0daa2538c349c1c152405580b164d5475f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 18 19:52:44 2015 +0000

    upstream commit
    
    add a fuzz_matches_original() function to the fuzzer to
     detect fuzz cases that are identical to the original data. Hacky
     implementation, but very useful when you need the fuzz to be different, e.g.
     when verifying signature

commit 87d5495bd337e358ad69c524fcb9495208c0750b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 18 19:50:55 2015 +0000

    upstream commit
    
    better dumps from the fuzzer (shown on errors) -
     include the original data as well as the fuzzed copy.

commit d59ec478c453a3fff05badbbfd96aa856364f2c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 18 19:47:55 2015 +0000

    upstream commit
    
    enable hostkey-agent.sh test

commit 26b3425170bf840e4b095e1c10bf25a0a3e3a105
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 17 18:54:30 2015 +0000

    upstream commit
    
    unit test for hostkeys in ssh-agent

commit 9e06a0fb23ec55d9223b26a45bb63c7649e2f2f2
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Jan 15 23:41:29 2015 +0000

    upstream commit
    
    add kex unit tests

commit d2099dec6da21ae627f6289aedae6bc1d41a22ce
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Mon Jan 19 00:32:54 2015 +0000

    upstream commit
    
    djm, your /usr/include tree is old

commit 2b3c3c76c30dc5076fe09d590f5b26880f148a54
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 18 21:51:19 2015 +0000

    upstream commit
    
    some feedback from markus@: comment hostkeys_foreach()
     context and avoid a member in it.

commit cecb30bc2ba6d594366e657d664d5c494b6c8a7f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 18 21:49:42 2015 +0000

    upstream commit
    
    make ssh-keygen use hostkeys_foreach(). Removes some
     horrendous code; ok markus@

commit ec3d065df3a9557ea96b02d061fd821a18c1a0b9
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 18 21:48:09 2015 +0000

    upstream commit
    
    convert load_hostkeys() (hostkey ordering and
     known_host matching) to use the new hostkey_foreach() iterator; ok markus

commit c29811cc480a260e42fd88849fc86a80c1e91038
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 18 21:40:23 2015 +0000

    upstream commit
    
    introduce hostkeys_foreach() to allow iteration over a
     known_hosts file or controlled subset thereof. This will allow us to pull out
     some ugly and duplicated code, and will be used to implement hostkey rotation
     later.
    
    feedback and ok markus

commit f101d8291da01bbbfd6fb8c569cfd0cc61c0d346
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sun Jan 18 14:01:00 2015 +0000

    upstream commit
    
    string truncation due to sizeof(size) ok djm markus

commit 35d6022b55b7969fc10c261cb6aa78cc4a5fcc41
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 18 13:33:34 2015 +0000

    upstream commit
    
    avoid trailing ',' in host key algorithms

commit 7efb455789a0cb76bdcdee91c6060a3dc8f5c007
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Jan 18 13:22:28 2015 +0000

    upstream commit
    
    infer key length correctly when user specified a fully-
     qualified key name instead of using the -b bits option; ok markus@

commit 83f8ffa6a55ccd0ce9d8a205e3e7439ec18fedf5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sat Jan 17 18:53:34 2015 +0000

    upstream commit
    
    fix hostkeys on ssh agent; found by unit test I'm about
     to commit

commit 369d61f17657b814124268f99c033e4dc6e436c1
Author: schwarze@openbsd.org <schwarze@openbsd.org>
Date:   Fri Jan 16 16:20:23 2015 +0000

    upstream commit
    
    garbage collect empty .No macros mandoc warns about

commit bb8b442d32dbdb8521d610e10d8b248d938bd747
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 16 15:55:07 2015 +0000

    upstream commit
    
    regression: incorrect error message on
     otherwise-successful ssh-keygen -A. Reported by Dmitry Orlov, via deraadt@

commit 9010902954a40b59d0bf3df3ccbc3140a653e2bc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Jan 16 07:19:48 2015 +0000

    upstream commit
    
    when hostname canonicalisation is enabled, try to parse
     hostnames as addresses before looking them up for canonicalisation. fixes
     bz#2074 and avoids needless DNS lookups in some cases; ok markus

commit 2ae4f337b2a5fb2841b6b0053b49496fef844d1c
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Fri Jan 16 06:40:12 2015 +0000

    upstream commit
    
    Replace <sys/param.h> with <limits.h> and other less
     dirty headers where possible.  Annotate <sys/param.h> lines with their
     current reasons.  Switch to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1,
     LOGIN_NAME_MAX, etc.  Change MIN() and MAX() to local definitions of
     MINIMUM() and MAXIMUM() where sensible to avoid pulling in the pollution.
     These are the files confirmed through binary verification. ok guenther,
     millert, doug (helped with the verification protocol)

commit 3c4726f4c24118e8f1bb80bf75f1456c76df072c
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Jan 15 21:38:50 2015 +0000

    upstream commit
    
    remove xmalloc, switch to sshbuf

commit e17ac01f8b763e4b83976b9e521e90a280acc097
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Thu Jan 15 21:37:14 2015 +0000

    upstream commit
    
    switch to sshbuf

commit ddef9995a1fa6c7a8ff3b38bfe6cf724bebf13d0
Author: naddy@openbsd.org <naddy@openbsd.org>
Date:   Thu Jan 15 18:32:54 2015 +0000

    upstream commit
    
    handle UMAC128 initialization like UMAC; ok djm@ markus@

commit f14564c1f7792446bca143580aef0e7ac25dcdae
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 15 11:04:36 2015 +0000

    upstream commit
    
    fix regression reported by brad@ for passworded keys without
     agent present

commit 45c0fd70bb2a88061319dfff20cb12ef7b1bc47e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 15 22:08:23 2015 +1100

    make bitmap test compile

commit d333f89abf7179021e5c3f28673f469abe032062
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 15 07:36:28 2015 +0000

    upstream commit
    
    unit tests for KRL bitmap

commit 7613f828f49c55ff356007ae9645038ab6682556
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jan 14 09:58:21 2015 +0000

    upstream commit
    
    re-add comment about full path

commit 6c43b48b307c41cd656b415621a644074579a578
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jan 14 09:54:38 2015 +0000

    upstream commit
    
    don't reset  to the installed sshd; connect before
     reconfigure, too

commit 771bb47a1df8b69061f09462e78aa0b66cd594bf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 13 14:51:51 2015 +0000

    upstream commit
    
    implement a SIGINFO handler so we can discern a stuck
     fuzz test from a merely glacial one; prompted by and ok markus

commit cfaa57962f8536f3cf0fd7daf4d6a55d6f6de45f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 13 08:23:26 2015 +0000

    upstream commit
    
    use $SSH instead of installed ssh to allow override;
     spotted by markus@

commit 0920553d0aee117a596b03ed5b49b280d34a32c5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 13 07:49:49 2015 +0000

    upstream commit
    
    regress test for PubkeyAcceptedKeyTypes; ok markus@

commit 27ca1a5c0095eda151934bca39a77e391f875d17
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 12 20:13:27 2015 +0000

    upstream commit
    
    unbreak parsing of pubkey comments; with gerhard; ok
     djm/deraadt

commit 55358f0b4e0b83bc0df81c5f854c91b11e0bb4dc
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 12 11:46:32 2015 +0000

    upstream commit
    
    fatal if soft-PKCS11 library is missing rather (rather
     than continue and fail with a more cryptic error)

commit c3554cdd2a1a62434b8161017aa76fa09718a003
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 12 11:12:38 2015 +0000

    upstream commit
    
    let this test all supporte key types; pointed out/ok
     markus@

commit 1129dcfc5a3e508635004bcc05a3574cb7687167
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 15 09:40:00 2015 +0000

    upstream commit
    
    sync ssh-keysign, ssh-keygen and some dependencies to the
     new buffer/key API; mostly mechanical, ok markus@

commit e4ebf5586452bf512da662ac277aaf6ecf0efe7c
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 15 07:57:08 2015 +0000

    upstream commit
    
    remove commented-out test code now that it has moved to a
     proper unit test

commit e81cba066c1e9eb70aba0f6e7c0ff220611b370f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 14 20:54:29 2015 +0000

    upstream commit
    
    whitespace

commit 141efe49542f7156cdbc2e4cd0a041d8b1aab622
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 14 20:05:27 2015 +0000

    upstream commit
    
    move authfd.c and its tentacles to the new buffer/key
     API; ok markus@

commit 0088c57af302cda278bd26d8c3ae81d5b6f7c289
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 14 19:33:41 2015 +0000

    upstream commit
    
    fix small regression: ssh-agent would return a success
     message but an empty signature if asked to sign using an unknown key; ok
     markus@

commit b03ebe2c22b8166e4f64c37737f4278676e3488d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 15 03:08:58 2015 +1100

    more --without-openssl
    
    fix some regressions caused by upstream merges
    
    enable KRLs now that they no longer require BIGNUMs

commit bc42cc6fe784f36df225c44c93b74830027cb5a2
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 15 03:08:29 2015 +1100

    kludge around tun API mismatch betterer

commit c332110291089b624fa0951fbf2d1ee6de525b9f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 15 02:59:51 2015 +1100

    some systems lack SO_REUSEPORT

commit 83b9678a62cbdc74eb2031cf1e1e4ffd58e233ae
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 15 02:35:50 2015 +1100

    fix merge botch

commit 0cdc5a3eb6fb383569a4da2a30705d9b90428d6b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 15 02:35:33 2015 +1100

    unbreak across API change

commit 6e2549ac2b5e7f96cbc2d83a6e0784b120444b47
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 15 02:30:18 2015 +1100

    need includes.h for portable OpenSSH

commit 72ef7c148c42db7d5632a29f137f8b87b579f2d9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 15 02:21:31 2015 +1100

    support --without-openssl at configure time
    
    Disables and removes dependency on OpenSSL. Many features don't
    work and the set of crypto options is greatly restricted. This
    will only work on system with native arc4random or /dev/urandom.
    
    Considered highly experimental for now.

commit 4f38c61c68ae7e3f9ee4b3c38bc86cd39f65ece9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 15 02:28:00 2015 +1100

    add files missed in last commit

commit a165bab605f7be55940bb8fae977398e8c96a46d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 14 15:02:39 2015 +0000

    upstream commit
    
    avoid BIGNUM in KRL code by using a simple bitmap;
     feedback and ok markus

commit 7d845f4a0b7ec97887be204c3760e44de8bf1f32
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 14 13:54:13 2015 +0000

    upstream commit
    
    update sftp client and server to new buffer API. pretty
     much just mechanical changes; with & ok markus

commit 139ca81866ec1b219c717d17061e5e7ad1059e2a
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jan 14 13:09:09 2015 +0000

    upstream commit
    
    switch to sshbuf/sshkey; with & ok djm@

commit 81bfbd0bd35683de5d7f2238b985e5f8150a9180
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 14 21:48:18 2015 +1100

    support --without-openssl at configure time
    
    Disables and removes dependency on OpenSSL. Many features don't
    work and the set of crypto options is greatly restricted. This
    will only work on system with native arc4random or /dev/urandom.
    
    Considered highly experimental for now.

commit 54924b53af15ccdcbb9f89984512b5efef641a31
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 14 10:46:28 2015 +0000

    upstream commit
    
    avoid an warning for the !OPENSSL case

commit ae8b463217f7c9b66655bfc3945c050ffdaeb861
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jan 14 10:30:34 2015 +0000

    upstream commit
    
    swith auth-options to new sshbuf/sshkey; ok djm@

commit 540e891191b98b89ee90aacf5b14a4a68635e763
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Jan 14 10:29:45 2015 +0000

    upstream commit
    
    make non-OpenSSL aes-ctr work on sshd w/ privsep; ok
     markus@

commit 60c2c4ea5e1ad0ddfe8b2877b78ed5143be79c53
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Wed Jan 14 10:24:42 2015 +0000

    upstream commit
    
    remove unneeded includes, sync my copyright across files
     & whitespace; ok djm@

commit 128343bcdb0b60fc826f2733df8cf979ec1627b4
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Tue Jan 13 19:31:40 2015 +0000

    upstream commit
    
    adapt mac.c to ssherr.h return codes (de-fatal) and
     simplify dependencies ok djm@

commit e7fd952f4ea01f09ceb068721a5431ac2fd416ed
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 13 19:04:35 2015 +0000

    upstream commit
    
    sync changes from libopenssh; prepared by markus@ mostly
     debug output tweaks, a couple of error return value changes and some other
     minor stuff

commit 76c0480a85675f03a1376167cb686abed01a3583
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 13 19:38:18 2015 +1100

    add --without-ssh1 option to configure
    
    Allows disabling support for SSH protocol 1.

commit 1f729f0614d1376c3332fa1edb6a5e5cec7e9e03
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Jan 13 07:39:19 2015 +0000

    upstream commit
    
    add sshd_config HostbasedAcceptedKeyTypes and
     PubkeyAcceptedKeyTypes options to allow sshd to control what public key types
     will be accepted. Currently defaults to all. Feedback & ok markus@

commit 816d1538c24209a93ba0560b27c4fda57c3fff65
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 12 20:13:27 2015 +0000

    upstream commit
    
    unbreak parsing of pubkey comments; with gerhard; ok
     djm/deraadt

commit 0097565f849851812df610b7b6b3c4bd414f6c62
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 12 19:22:46 2015 +0000

    upstream commit
    
    missing error assigment on sshbuf_put_string()

commit a7f49dcb527dd17877fcb8d5c3a9a6f550e0bba5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Jan 12 15:18:07 2015 +0000

    upstream commit
    
    apparently memcpy(x, NULL, 0) is undefined behaviour
     according to C99 (cf. sections 7.21.1 and 7.1.4), so check skip memcpy calls
     when length==0; ok markus@

commit 905fe30fca82f38213763616d0d26eb6790bde33
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 12 14:05:19 2015 +0000

    upstream commit
    
    free->sshkey_free; ok djm@

commit f067cca2bc20c86b110174c3fef04086a7f57b13
Author: markus@openbsd.org <markus@openbsd.org>
Date:   Mon Jan 12 13:29:27 2015 +0000

    upstream commit
    
    allow WITH_OPENSSL w/o WITH_SSH1; ok djm@

commit c4bfafcc2a9300d9cfb3c15e75572d3a7d74670d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 8 13:10:58 2015 +0000

    upstream commit
    
    adjust for sshkey_load_file() API change

commit e752c6d547036c602b89e9e704851463bd160e32
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 8 13:44:36 2015 +0000

    upstream commit
    
    fix ssh_config FingerprintHash evaluation order; from Petr
     Lautrbach

commit ab24ab847b0fc94c8d5e419feecff0bcb6d6d1bf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 8 10:15:45 2015 +0000

    upstream commit
    
    reorder hostbased key attempts to better match the
     default hostkey algorithms order in myproposal.h; ok markus@

commit 1195f4cb07ef4b0405c839293c38600b3e9bdb46
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Jan 8 10:14:08 2015 +0000

    upstream commit
    
    deprecate key_load_private_pem() and
     sshkey_load_private_pem() interfaces. Refactor the generic key loading API to
     not require pathnames to be specified (they weren't really used).
    
    Fixes a few other things en passant:
    
    Makes ed25519 keys work for hostbased authentication (ssh-keysign
    previously used the PEM-only routines).
    
    Fixes key comment regression bz#2306: key pathnames were being lost as
    comment fields.
    
    ok markus@

commit febbe09e4e9aff579b0c5cc1623f756862e4757d
Author: tedu@openbsd.org <tedu@openbsd.org>
Date:   Wed Jan 7 18:15:07 2015 +0000

    upstream commit
    
    workaround for the Meyer, et al, Bleichenbacher Side
     Channel Attack. fake up a bignum key before RSA decryption. discussed/ok djm
     markus

commit 5191df927db282d3123ca2f34a04d8d96153911a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Dec 23 22:42:48 2014 +0000

    upstream commit
    
    KNF and add a little more debug()

commit 8abd80315d3419b20e6938f74d37e2e2b547f0b7
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Dec 22 09:26:31 2014 +0000

    upstream commit
    
    add fingerprinthash to the options list;

commit 296ef0560f60980da01d83b9f0e1a5257826536f
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Dec 22 09:24:59 2014 +0000

    upstream commit
    
    tweak previous;

commit 462082eacbd37778a173afb6b84c6f4d898a18b5
Author: Damien Miller <djm@google.com>
Date:   Tue Dec 30 08:16:11 2014 +1100

    avoid uninitialised free of ldns_res
    
    If an invalid rdclass was passed to getrrsetbyname() then
    this would execute a free on an uninitialised pointer.
    OpenSSH only ever calls this with a fixed and valid rdclass.
    
    Reported by Joshua Rogers

commit 01b63498801053f131a0740eb9d13faf35d636c8
Author: Damien Miller <djm@google.com>
Date:   Mon Dec 29 18:10:18 2014 +1100

    pull updated OpenBSD BCrypt PBKDF implementation
    
    Includes fix for 1 byte output overflow for large key length
    requests (not reachable in OpenSSH).
    
    Pointed out by Joshua Rogers

commit c528c1b4af2f06712177b3de9b30705752f7cbcb
Author: Damien Miller <djm@google.com>
Date:   Tue Dec 23 15:26:13 2014 +1100

    fix variable name for IPv6 case in construct_utmpx
    
    patch from writeonce AT midipix.org via bz#2296

commit 293cac52dcda123244b2e594d15592e5e481c55e
Author: Damien Miller <djm@google.com>
Date:   Mon Dec 22 16:30:42 2014 +1100

    include and use OpenBSD netcat in regress/

commit 8f6784f0cb56dc4fd00af3e81a10050a5785228d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 09:05:17 2014 +0000

    upstream commit
    
    mention ssh -Q feature to list supported { MAC, cipher,
     KEX, key } algorithms in more places and include the query string used to
     list the relevant information; bz#2288

commit 449e11b4d7847079bd0a2daa6e3e7ea03d8ef700
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Mon Dec 22 08:24:17 2014 +0000

    upstream commit
    
    tweak previous;

commit 4bea0ab3290c0b9dd2aa199e932de8e7e18062d6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 08:06:03 2014 +0000

    upstream commit
    
    regression test for multiple required pubkey authentication;
     ok markus@

commit f1c4d8ec52158b6f57834b8cd839605b0a33e7f2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 08:04:23 2014 +0000

    upstream commit
    
    correct description of what will happen when a
     AuthorizedKeysCommand is specified but AuthorizedKeysCommandUser is not (sshd
     will refuse to start)

commit 161cf419f412446635013ac49e8c660cadc36080
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 07:55:51 2014 +0000

    upstream commit
    
    make internal handling of filename arguments of "none"
     more consistent with ssh. "none" arguments are now replaced with NULL when
     the configuration is finalised.
    
    Simplifies checking later on (just need to test not-NULL rather than
    that + strcmp) and cleans up some inconsistencies. ok markus@

commit f69b69b8625be447b8826b21d87713874dac25a6
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 07:51:30 2014 +0000

    upstream commit
    
    remember which public keys have been used for
     authentication and refuse to accept previously-used keys.
    
    This allows AuthenticationMethods=publickey,publickey to require
    that users authenticate using two _different_ pubkeys.
    
    ok markus@

commit 46ac2ed4677968224c4ca825bc98fc68dae183f0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 07:24:11 2014 +0000

    upstream commit
    
    fix passing of wildcard forward bind addresses when
     connection multiplexing is in use; patch from Sami Hartikainen via bz#2324;
     ok dtucker@

commit 0d1b241a262e4d0a6bbfdd595489ab1b853c43a1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 06:14:29 2014 +0000

    upstream commit
    
    make this slightly easier to diff against portable

commit 0715bcdddbf68953964058f17255bf54734b8737
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 22 13:47:07 2014 +1100

    add missing regress output file

commit 1e30483c8ad2c2f39445d4a4b6ab20c241e40593
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 02:15:52 2014 +0000

    upstream commit
    
    adjust for new SHA256 key fingerprints and
     slightly-different MD5 hex fingerprint format

commit 6b40567ed722df98593ad8e6a2d2448fc2b4b151
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Dec 22 01:14:49 2014 +0000

    upstream commit
    
    poll changes to netcat (usr.bin/netcat.c r1.125) broke
     this test; fix it by ensuring more stdio fds are sent to devnull

commit a5375ccb970f49dddf7d0ef63c9b713ede9e7260
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sun Dec 21 23:35:14 2014 +0000

    upstream commit
    
    tweak previous;

commit b79efde5c3badf5ce4312fe608d8307eade533c5
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 21 23:12:42 2014 +0000

    upstream commit
    
    document FingerprintHash here too

commit d16bdd8027dd116afa01324bb071a4016cdc1a75
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 22 10:18:09 2014 +1100

    missing include for base64 encoding

commit 56d1c83cdd1ac76f1c6bd41e01e80dad834f3994
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Sun Dec 21 22:27:55 2014 +0000

    upstream commit
    
    Add FingerprintHash option to control algorithm used for
     key fingerprints. Default changes from MD5 to SHA256 and format from hex to
     base64.
    
    Feedback and ok naddy@ markus@

commit 058f839fe15c51be8b3a844a76ab9a8db550be4f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 18 23:58:04 2014 +0000

    upstream commit
    
    don't count partial authentication success as a failure
     against MaxAuthTries; ok deraadt@

commit c7219f4f54d64d6dde66dbcf7a2699daa782d2a1
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Dec 12 00:02:17 2014 +0000

    upstream commit
    
    revert chunk I didn't mean to commit yet; via jmc@

commit 7de5991aa3997e2981440f39c1ea01273a0a2c7b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 18 11:44:06 2014 +1100

    upstream libc change
    
    revision 1.2
    date: 2014/12/08 03:45:00;  author: bcook;  state: Exp;  lines: +2 -2;  commitid: 7zWEBgJJOCZ2hvTV;
    avoid left shift overflow in reallocarray.
    
    Some 64-bit platforms (e.g. Windows 64) have a 32-bit long. So, shifting
    1UL 32-bits to the left causes an overflow. This replaces the constant 1UL with
    (size_t)1 so that we get the correct constant size for the platform.
    
    discussed with tedu@ & deraadt@

commit 2048f85a5e6da8bc6e0532efe02ecfd4e63c978c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 18 10:15:49 2014 +1100

    include CFLAGS in gnome askpass targets
    
    from Fedora

commit 48b68ce19ca42fa488960028048dec023f7899bb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 11 08:20:09 2014 +0000

    upstream commit
    
    explicitly include sys/param.h in files that use the
     howmany() macro; from portable

commit d663bea30a294d440fef4398e5cd816317bd4518
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 11 05:25:06 2014 +0000

    upstream commit
    
    mention AuthorizedKeysCommandUser must be set for
     AuthorizedKeysCommand to be run; bz#2287

commit 17bf3d81e00f2abb414a4fd271118cf4913f049f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 11 05:13:28 2014 +0000

    upstream commit
    
    show in debug output which hostkeys are being tried when
     attempting hostbased auth; patch from Iain Morgan

commit da0277e3717eadf5b15e03379fc29db133487e94
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 11 04:16:14 2014 +0000

    upstream commit
    
    Make manual reflect reality: sftp-server's -d option
     accepts a "%d" option, not a "%h" one.
    
    bz#2316; reported by Kirk Wolf

commit 4cf87f4b81fa9380bce5fcff7b0f8382ae3ad996
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Dec 10 01:24:09 2014 +0000

    upstream commit
    
    better error value for invalid signature length

commit 4bfad14ca56f8ae04f418997816b4ba84e2cfc3c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Dec 10 02:12:51 2014 +1100

    Resync more with OpenBSD's rijndael.c, in particular "#if 0"-ing out some
    unused code.  Should fix compile error reported by plautrba at redhat.

commit 642652d280499691c8212ec6b79724b50008ce09
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Dec 10 01:32:23 2014 +1100

    Add reallocarray to compat library

commit 3dfd8d93dfcc69261f5af99df56f3ff598581979
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 4 22:31:50 2014 +0000

    upstream commit
    
    add tests for new client RevokedHostKeys option; refactor
     to make it a bit more readable

commit a31046cad1aed16a0b55171192faa6d02665ccec
Author: krw@openbsd.org <krw@openbsd.org>
Date:   Wed Nov 19 13:35:37 2014 +0000

    upstream commit
    
    Nuke yet more obvious #include duplications.
    
    ok deraadt@

commit a7c762e5b2c1093542c0bc1df25ccec0b4cf479f
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 4 20:47:36 2014 +0000

    upstream commit
    
    key_in_file() wrapper is no longer used

commit 5e39a49930d885aac9c76af3129332b6e772cd75
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 4 02:24:32 2014 +0000

    upstream commit
    
    add RevokedHostKeys option for the client
    
    Allow textfile or KRL-based revocation of hostkeys.

commit 74de254bb92c684cf53461da97f52d5ba34ded80
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Thu Dec 4 01:49:59 2014 +0000

    upstream commit
    
    convert KRL code to new buffer API
    
    ok markus@

commit db995f2eed5fc432598626fa3e30654503bf7151
Author: millert@openbsd.org <millert@openbsd.org>
Date:   Wed Nov 26 18:34:51 2014 +0000

    upstream commit
    
    Prefer setvbuf() to setlinebuf() for portability; ok
     deraadt@

commit 72bba3d179ced8b425272efe6956a309202a91f3
Author: jsg@openbsd.org <jsg@openbsd.org>
Date:   Mon Nov 24 03:39:22 2014 +0000

    upstream commit
    
    Fix crashes in the handling of the sshd config file found
     with the afl fuzzer.
    
    ok deraadt@ djm@

commit 867f49c666adcfe92bf539d9c37c1accdea08bf6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 26 13:22:41 2014 +1100

    Avoid Cygwin ssh-host-config reading /etc/group
    
    Patch from Corinna Vinschen

commit 8b66f36291a721b1ba7c44f24a07fdf39235593e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 26 13:20:35 2014 +1100

    allow custom service name for sshd on Cygwin
    
    Permits the use of multiple sshd running with different service names.
    
    Patch by Florian Friesdorf via Corinna Vinschen

commit 08c0eebf55d70a9ae1964399e609288ae3186a0c
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Sat Nov 22 19:21:03 2014 +0000

    upstream commit
    
    restore word zapped in previous, and remove some useless
     "No" macros;

commit a1418a0033fba43f061513e992e1cbcc3343e563
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Sat Nov 22 18:15:41 2014 +0000

    upstream commit
    
    /dev/random has created the same effect as /dev/arandom
     (and /dev/urandom) for quite some time.  Mop up the last few, by using
     /dev/random where we actually want it, or not even mentioning arandom where
     it is irrelevant.

commit b6de5ac9ed421362f479d1ad4fa433d2e25dad5b
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Fri Nov 21 01:00:38 2014 +0000

    upstream commit
    
    fix NULL pointer dereference crash on invalid timestamp
    
    found using Michal Zalewski's afl fuzzer

commit a1f8110cd5ed818d59b3a2964fab7de76e92c18e
Author: mikeb@openbsd.org <mikeb@openbsd.org>
Date:   Tue Nov 18 22:38:48 2014 +0000

    upstream commit
    
    Sync AES code to the one shipped in OpenSSL/LibreSSL.
    
    This includes a commit made by Andy Polyakov <appro at openssl ! org>
    to the OpenSSL source tree on Wed, 28 Jun 2006 with the following
    message: "Mitigate cache-collision timing attack on last round."
    
    OK naddy, miod, djm

commit 335c83d5f35d8620e16b8aa26592d4f836e09ad2
Author: krw@openbsd.org <krw@openbsd.org>
Date:   Tue Nov 18 20:54:28 2014 +0000

    upstream commit
    
    Nuke more obvious #include duplications.
    
    ok deraadt@ millert@ tedu@

commit 51b64e44121194ae4bf153dee391228dada2abcb
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 17 00:21:40 2014 +0000

    upstream commit
    
    fix KRL generation when multiple CAs are in use
    
    We would generate an invalid KRL when revoking certs by serial
    number for multiple CA keys due to a section being written out
    twice.
    
    Also extend the regress test to catch this case by having it
    produce a multi-CA KRL.
    
    Reported by peter AT pean.org

commit d2d51003a623e21fb2b25567c4878d915e90aa2a
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Nov 18 01:02:25 2014 +0000

    upstream commit
    
    fix NULL pointer dereference crash in key loading
    
    found by Michal Zalewski's AFL fuzzer

commit 9f9fad0191028edc43d100d0ded39419b6895fdf
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 17 00:21:40 2014 +0000

    upstream commit
    
    fix KRL generation when multiple CAs are in use
    
    We would generate an invalid KRL when revoking certs by serial
    number for multiple CA keys due to a section being written out
    twice.
    
    Also extend the regress test to catch this case by having it
    produce a multi-CA KRL.
    
    Reported by peter AT pean.org

commit da8af83d3f7ec00099963e455010e0ed1d7d0140
Author: bentley@openbsd.org <bentley@openbsd.org>
Date:   Sat Nov 15 14:41:03 2014 +0000

    upstream commit
    
    Reduce instances of `` '' in manuals.
    
    troff displays these as typographic quotes, but nroff implementations
    almost always print them literally, which rarely has the intended effect
    with modern fonts, even in stock xterm.
    
    These uses of `` '' can be replaced either with more semantic alternatives
    or with Dq, which prints typographic quotes in a UTF-8 locale (but will
    automatically fall back to `` '' in an ASCII locale).
    
    improvements and ok schwarze@

commit fc302561369483bb755b17f671f70fb894aec01d
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Nov 10 22:25:49 2014 +0000

    upstream commit
    
    mux-related manual tweaks
    
    mention ControlPersist=0 is the same as ControlPersist=yes
    
    recommend that ControlPath sockets be placed in a og-w directory

commit 0e4cff5f35ed11102fe3783779960ef07e0cd381
Author: Damien Miller <djm@google.com>
Date:   Wed Nov 5 11:01:31 2014 +1100

    Prepare scripts for next Cygwin release
    
    Makes the Cygwin-specific ssh-user-config script independent of the
    existence of /etc/passwd.  The next Cygwin release will allow to
    generate passwd and group entries from the Windows account DBs, so the
    scripts have to adapt.
    
    from Corinna Vinschen

commit 7d0ba5336651731949762eb8877ce9e3b52df436
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 30 10:45:41 2014 +1100

    include version number in OpenSSL-too-old error

commit 3bcb92e04d9207e9f78d82f7918c6d3422054ce9
Author: lteo@openbsd.org <lteo@openbsd.org>
Date:   Fri Oct 24 02:01:20 2014 +0000

    upstream commit
    
    Remove unnecessary include: netinet/in_systm.h is not needed
     by these programs.
    
    NB. skipped for portable
    
    ok deraadt@ millert@

commit 6fdcaeb99532e28a69f1a1599fbd540bb15b70a0
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 20 03:43:01 2014 +0000

    upstream commit
    
    whitespace

commit 165bc8786299e261706ed60342985f9de93a7461
Author: daniel@openbsd.org <daniel@openbsd.org>
Date:   Tue Oct 14 03:09:59 2014 +0000

    upstream commit
    
    plug a memory leak; from Maxime Villard.
    
    ok djm@

commit b1ba15f3885947c245c2dbfaad0a04ba050abea0
Author: jmc@openbsd.org <jmc@openbsd.org>
Date:   Thu Oct 9 06:21:31 2014 +0000

    upstream commit
    
    tweak previous;

commit 259a02ebdf74ad90b41d116ecf70aa823fa4c6e7
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 13 00:38:35 2014 +0000

    upstream commit
    
    whitespace

commit 957fbceb0f3166e41b76fdb54075ab3b9cc84cba
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 8 22:20:25 2014 +0000

    upstream commit
    
    Tweak config reparsing with host canonicalisation
    
    Make the second pass through the config files always run when
    hostname canonicalisation is enabled.
    
    Add a "Match canonical" criteria that allows ssh_config Match
    blocks to trigger only in the second config pass.
    
    Add a -G option to ssh that causes it to parse its configuration
    and dump the result to stdout, similar to "sshd -T"
    
    Allow ssh_config Port options set in the second config parse
    phase to be applied (they were being ignored).
    
    bz#2267 bz#2286; ok markus

commit 5c0dafd38bf66feeeb45fa0741a5baf5ad8039ba
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 8 22:15:27 2014 +0000

    upstream commit
    
    another -Wpointer-sign from clang

commit bb005dc815ebda9af3ae4b39ca101c4da918f835
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 8 22:15:06 2014 +0000

    upstream commit
    
    fix a few -Wpointer-sign warnings from clang

commit 3cc1fbb4fb0e804bfb873fd363cea91b27fc8188
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Oct 8 21:45:48 2014 +0000

    upstream commit
    
    parse cert sections using nested buffers to reduce
     copies; ok markus

commit 4a45922aebf99164e2fc83d34fe55b11ae1866ef
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Mon Oct 6 00:47:15 2014 +0000

    upstream commit
    
    correct options in usage(); from mancha1 AT zoho.com

commit 48dffd5bebae6fed0556dc5c36cece0370690618
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Sep 9 09:45:36 2014 +0000

    upstream commit
    
    mention permissions on tun(4) devices in PermitTunnel
     documentation; bz#2273

commit a5883d4eccb94b16c355987f58f86a7dee17a0c2
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Wed Sep 3 18:55:07 2014 +0000

    upstream commit
    
    tighten permissions on pty when the "tty" group does
     not exist; pointed out by Corinna Vinschen; ok markus

commit 180bcb406b58bf30723c01a6b010e48ee626dda8
Author: sobrado@openbsd.org <sobrado@openbsd.org>
Date:   Sat Aug 30 16:32:25 2014 +0000

    upstream commit
    
    typo.

commit f70b22bcdd52f6bf127047b3584371e6e5d45627
Author: sobrado@openbsd.org <sobrado@openbsd.org>
Date:   Sat Aug 30 15:33:50 2014 +0000

    upstream commit
    
    improve capitalization for the Ed25519 public-key
     signature system.
    
    ok djm@

commit 7df8818409c752cf3f0c3f8044fe9aebed8647bd
Author: doug@openbsd.org <doug@openbsd.org>
Date:   Thu Aug 21 01:08:52 2014 +0000

    upstream commit
    
    Free resources on error in mkstemp and fdopen
    
    ok djm@

commit 40ba4c9733aaed08304714faeb61529f18da144b
Author: deraadt@openbsd.org <deraadt@openbsd.org>
Date:   Wed Aug 20 01:28:55 2014 +0000

    upstream commit
    
    djm how did you make a typo like that...

commit 57d378ec9278ba417a726f615daad67d157de666
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 19 23:58:28 2014 +0000

    upstream commit
    
    When dumping the server configuration (sshd -T), print
     correct KEX, MAC and cipher defaults. Spotted by Iain Morgan

commit 7ff880ede5195d0b17e7f1e3b6cfbc4cb6f85240
Author: djm@openbsd.org <djm@openbsd.org>
Date:   Tue Aug 19 23:57:18 2014 +0000

    upstream commit
    
    ~-expand lcd paths

commit 4460a7ad0c78d4cd67c467f6e9f4254d0404ed59
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 12 12:35:48 2014 +1100

    remove duplicated KEX_DH1 entry

commit c9b8426a616138d0d762176c94f51aff3faad5ff
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 9 10:34:06 2014 +1100

    remove ChangeLog file
    
    Commit logs will be generated from git at release time.

commit 81d18ff7c93a04affbf3903e0963859763219aed
Author: Damien Miller <djm@google.com>
Date:   Tue Oct 7 21:24:25 2014 +1100

    delete contrib/caldera directory

commit 0ec9e87d3638206456968202f05bb5123670607a
Author: Damien Miller <djm@google.com>
Date:   Tue Oct 7 19:57:27 2014 +1100

    test commit

commit 8fb65a44568701b779f3d77326bceae63412d28d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 7 09:21:49 2014 +1100

     - (djm) Release OpenSSH-6.7

commit e8c9f2602c46f6781df5e52e6cd8413dab4602a3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 3 09:24:56 2014 +1000

     - (djm) [sshd_config.5] typo; from Iain Morgan

commit 703b98a26706f5083801d11059486d77491342ae
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 1 09:43:07 2014 +1000

     - (djm) [openbsd-compat/Makefile.in openbsd-compat/kludge-fd_set.c]
       [openbsd-compat/openbsd-compat.h] Kludge around bad glibc
       _FORTIFY_SOURCE check that doesn't grok heap-allocated fd_sets;
       ok dtucker@

commit 0fa0ed061bbfedb0daa705e220748154a84c3413
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 10 08:15:34 2014 +1000

     - (djm) [sandbox-seccomp-filter.c] Allow mremap and exit for DietLibc;
       patch from Felix von Leitner; ok dtucker

commit ad7d23d461c3b7e1dcb15db13aee5f4b94dc1a95
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 9 12:23:10 2014 +1000

    20140908
     - (dtucker) [INSTALL] Update info about egd.  ok djm@

commit 2a8699f37cc2515e3bc60e0c677ba060f4d48191
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 4 03:46:05 2014 +1000

     - (djm) [openbsd-compat/arc4random.c] Zero seed after keying PRNG

commit 44988defb1f5e3afe576d86000365e1f07a1b494
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 3 05:35:32 2014 +1000

     - (djm) [contrib/cygwin/ssh-host-config] Fix old code leading to
       permissions/ACLs; from Corinna Vinschen

commit 23f269562b7537b2f6f5014e50a25e5dcc55a837
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 3 05:33:25 2014 +1000

     - (djm) [defines.h sshbuf.c] Move __predict_true|false to defines.h and
       conditionalise to avoid duplicate definition.

commit 41c8de2c0031cf59e7cf0c06b5bcfbf4852c1fda
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 30 16:23:06 2014 +1000

     - (djm) [Makefile.in] Make TEST_SHELL a variable; "good idea" tim@

commit d7c81e216a7bd9eed6e239c970d9261bb1651947
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 30 04:18:28 2014 +1000

     - (djm) [openbsd-compat/openssl-compat.h] add include guard

commit 4687802dda57365b984b897fc3c8e2867ea09b22
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 30 03:29:19 2014 +1000

     - (djm) [misc.c] Missing newline between functions

commit 51c77e29220dee87c53be2dc47092934acab26fe
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 30 02:30:30 2014 +1000

     - (djm) [openbsd-compat/openssl-compat.h] add
       OPENSSL_[RD]SA_MAX_MODULUS_BITS defines for OpenSSL that lacks them

commit 3d673d103bad35afaec6e7ef73e5277216ce33a3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 27 06:32:01 2014 +1000

     - (djm) [openbsd-compat/explicit_bzero.c] implement explicit_bzero()
       using memset_s() where possible; improve fallback to indirect bzero
       via a volatile pointer to give it more of a chance to avoid being
       optimised away.

commit 146218ac11a1eb0dcade6f793d7acdef163b5ddc
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 27 04:11:55 2014 +1000

     - (djm) [monitor.c sshd.c] SIGXFSZ needs to be ignored in postauth
       monitor, not preauth; bz#2263

commit 1b215c098b3b37e38aa4e4c91bb908eee41183b1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 27 04:04:40 2014 +1000

     - (djm) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c]
       [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c]
       [regress/unittests/sshkey/common.c]
       [regress/unittests/sshkey/test_file.c]
       [regress/unittests/sshkey/test_fuzz.c]
       [regress/unittests/sshkey/test_sshkey.c] Don't include openssl/ec.h
       on !ECC OpenSSL systems

commit ad013944af0a19e3f612089d0099bb397cf6502d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 26 09:27:28 2014 +1000

     - (djm) [INSTALL] Recommend libcrypto be built -fPIC, mention LibreSSL,
       update OpenSSL version requirement.

commit ed126de8ee04c66640a0ea2697c4aaf36801f100
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 26 08:37:47 2014 +1000

     - (djm) [bufec.c] Skip this file on !ECC OpenSSL

commit 9c1dede005746864a4fdb36a7cdf6c51296ca909
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Aug 24 03:01:06 2014 +1000

     - (djm) [sftp-server.c] Some systems (e.g. Irix) have prctl() but not
       PR_SET_DUMPABLE, so adjust ifdef; reported by Tom Christensen

commit d244a5816fd1312a33404b436e4dd83594f1119e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 23 17:06:49 2014 +1000

     - (djm) [configure.ac] We now require a working vsnprintf everywhere (not
       just for systems that lack asprintf); check for it always and extend
       test to catch more brokenness. Fixes builds on Solaris <= 9

commit 4cec036362a358e398e6a2e6d19d8e5780558634
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 23 03:11:09 2014 +1000

     - (djm) [sshd.c] Ignore SIGXFSZ in preauth monitor child; can explode on
       lastlog writing on platforms with high UIDs; bz#2263

commit 394a60f2598d28b670d934b93942a3370b779b39
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 22 18:06:20 2014 +1000

     - (djm) [configure.ac] double braces to appease autoconf

commit 4d69aeabd6e60afcdc7cca177ca751708ab79a9d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 22 17:48:27 2014 +1000

     - (djm) [openbsd-compat/bsd-snprintf.c] Fix compilation failure (prototype/
       definition mismatch) and warning for broken/missing snprintf case.

commit 0c11f1ac369d2c0aeb0ab0458a7cd04c72fe5e9e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 22 17:36:56 2014 +1000

     - (djm) [sshbuf-getput-crypto.c] Fix compilation when OpenSSL lacks ECC

commit 6d62784b8973340b251fea6b04890f471adf28db
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 22 17:36:19 2014 +1000

     - (djm) [configure.ac] include leading zero characters in OpenSSL version
       number; fixes test for unsupported versions

commit 4f1ff1ed782117f5d5204d4e91156ed5da07cbb7
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 21 15:54:50 2014 +1000

     - (djm) [regress/unittests/test_helper/test_helper.c] Fix for systems that
       don't set __progname. Diagnosed by Tom Christensen.

commit 005a64da0f457410045ef0bfa93c863c2450447d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 21 10:48:41 2014 +1000

     - (djm) [key.h] Fix ifdefs for no-ECC OpenSSL

commit aa6598ebb3343c7380e918388e10e8ca5852b613
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 21 10:47:54 2014 +1000

     - (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too.

commit 54703e3cf63f0c80d4157e5ad7dbc2b363ee2c56
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 20 11:10:51 2014 +1000

     - (djm) [contrib/cygwin/README] Correct build instructions; from Corinna

commit f0935698f0461f24d8d1f1107b476ee5fd4db1cb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 20 11:06:50 2014 +1000

     - (djm) [sshkey.h] Fix compilation when OpenSSL lacks ECC

commit c5089ecaec3b2c02f014f4e67518390702a4ba14
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 20 11:06:20 2014 +1000

     - (djm) [Makefile.in] refer to libtest_helper.a by explicit path rather than
       -L/-l; fixes linking problems on some platforms

commit 2195847e503a382f83ee969b0a8bd3dfe0e55c18
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 20 11:05:03 2014 +1000

     - (djm) [configure.ac] Check OpenSSL version is supported at configure time;
       suggested by Kevin Brott

commit a75aca1bbc989aa9f8b1b08489d37855f3d24d1a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 19 11:36:07 2014 +1000

     - (djm) [INSTALL contrib/caldera/openssh.spec contrib/cygwin/README]
       [contrib/redhat/openssh.spec contrib/suse/openssh.spec] Remove mentions
       of TCP wrappers.

commit 3f022b5a9477abceeb1bbeab04b055f3cc7ca8f6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 19 11:32:34 2014 +1000

     - (djm) [ssh-dss.c] Include openssl/dsa.h for DSA_SIG

commit 88137902632aceb923990e98cf5dc923bb3ef2f5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 19 11:28:11 2014 +1000

     - (djm) [sshbuf.h] Fix compilation on systems without OPENSSL_HAS_ECC.

commit 2f3d1e7fb2eabd3cfbfd8d0f7bdd2f9a1888690b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 19 11:14:36 2014 +1000

     - (djm) [myproposal.h] Make curve25519 KEX dependent on
       HAVE_EVP_SHA256 instead of OPENSSL_HAS_ECC.

commit d4e7d59d01a6c7f59e8c1f94a83c086e9a33d8aa
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 19 11:14:17 2014 +1000

     - (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen

commit 9eaeea2cf2b6af5f166cfa9ad3c7a90711a147a9
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Aug 10 11:35:05 2014 +1000

     - (djm) [README contrib/caldera/openssh.spec]
       [contrib/redhat/openssh.spec contrib/suse/openssh.spec] Update versions

commit f8988fbef0c9801d19fa2f8f4f041690412bec37
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 1 13:31:52 2014 +1000

     - (djm) [regress/multiplex.sh] Use -d (detach stdin) flag to disassociate
       nc from stdin, it's more portable

commit 5b3879fd4b7a4e3d43bab8f40addda39bc1169d0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 1 12:28:31 2014 +1000

     - (djm) [regress/multiplex.sh] Instruct nc not to quit as soon as stdin
       is closed; avoid regress failures when stdin is /dev/null

commit a9c46746d266f8a1b092a72b2150682d1af8ebfc
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 1 12:26:49 2014 +1000

     - (djm) [regress/multiplex.sh] Skip test for non-OpenBSD netcat. We need
       a better solution, but this will have to do for now.

commit 426117b2e965e43f47015942b5be8dd88fe74b88
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 30 12:33:20 2014 +1000

       - schwarze@cvs.openbsd.org 2014/07/28 15:40:08
         [sftp-server.8 sshd_config.5]
         some systems no longer need /dev/log;
         issue noticed by jirib;
         ok deraadt

commit f497794b6962eaf802ab4ac2a7b22ae591cca1d5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 30 12:32:46 2014 +1000

       - dtucker@cvs.openbsd.org 2014/07/25 21:22:03
         [ssh-agent.c]
         Clear buffer used for handling messages.  This prevents keys being
         left in memory after they have been expired or deleted in some cases
         (but note that ssh-agent is setgid so you would still need root to
         access them).  Pointed out by Kevin Burns, ok deraadt

commit a8a0f65c57c8ecba94d65948e9090da54014dfef
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 30 12:32:28 2014 +1000

     - OpenBSD CVS Sync
       - millert@cvs.openbsd.org 2014/07/24 22:57:10
         [ssh.1]
         Mention UNIX-domain socket forwarding too.  OK jmc@ deraadt@

commit 56b840f2b81e14a2f95c203403633a72566736f8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 25 08:11:30 2014 +1000

     - (djm) [regress/multiplex.sh] restore incorrectly deleted line;
       pointed out by Christian Hesse

commit dd417b60d5ca220565d1014e92b7f8f43dc081eb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 23 10:41:21 2014 +1000

       - dtucker@cvs.openbsd.org 2014/07/22 23:35:38
         [regress/unittests/sshkey/testdata/*]
         Regenerate test keys with certs signed with ed25519 instead of ecdsa.
         These can be used in -portable on platforms that don't support ECDSA.

commit 40e50211896369dba8f64f3b5e5fd58b76f5ac3f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 23 10:35:45 2014 +1000

       - dtucker@cvs.openbsd.org 2014/07/22 23:57:40
         [regress/unittests/sshkey/mktestdata.sh]
         Add $OpenBSD tag to make syncs easier

commit 07e644251e809b1d4c062cf85bd1146a7e3f5a8a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 23 10:34:26 2014 +1000

       - dtucker@cvs.openbsd.org 2014/07/22 23:23:22
         [regress/unittests/sshkey/mktestdata.sh]
         Sign test certs with ed25519 instead of ecdsa so that they'll work in
         -portable on platforms that don't have ECDSA in their OpenSSL.  ok djm

commit cea099a7c4eaecb01b001e5453bb4e5c25006c22
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 23 10:04:02 2014 +1000

       - djm@cvs.openbsd.org 2014/07/22 01:32:12
         [regress/multiplex.sh]
         change the test for still-open Unix domain sockets to be robust against
         nc implementations that produce error messages. from -portable
         (Id sync only)

commit 31eb78078d349b32ea41952ecc944b3ad6cb0d45
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 23 09:43:42 2014 +1000

       - guenther@cvs.openbsd.org 2014/07/22 07:13:42
         [umac.c]
         Convert from <sys/endian.h> to the shiney new <endian.h>
         ok dtucker@, who also confirmed that -portable handles this already
         (ID sync only, includes.h pulls in endian.h if available.)

commit 820763efef2d19d965602533036c2b4badc9d465
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 23 09:40:46 2014 +1000

       - dtucker@cvs.openbsd.org 2014/07/22 01:18:50
         [key.c]
         Prevent spam from key_load_private_pem during hostbased auth.  ok djm@

commit c4ee219a66f3190fa96cbd45b4d11015685c6306
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 23 04:27:50 2014 +1000

     - (dtucker) [regress/unittests/sshkey/test_{file,fuzz,sshkey}.c] Wrap ecdsa-
       specific tests inside OPENSSL_HAS_ECC.

commit 04f4824940ea3edd60835416ececbae16438968a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 22 11:31:47 2014 +1000

     - (djm) [regress/multiplex.sh] change the test for still-open Unix
        domain sockets to be robust against nc implementations that produce
        error messages.

commit 5ea4fe00d55453aaa44007330bb4c3181bd9b796
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 22 09:39:19 2014 +1000

     - (djm) [regress/multiplex.sh] ssh mux master lost -N somehow;
       put it back

commit 948a1774a79a85f9deba6d74db95f402dee32c69
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 22 01:07:11 2014 +1000

     - (dtucker) [sshkey.c] ifdef out unused variable when compiling without
       OPENSSL_HAS_ECC.

commit c8f610f6cc57ae129758052439d9baf13699097b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 21 10:23:27 2014 +1000

     - (djm) [regress/multiplex.sh] Not all netcat accept the -N option.

commit 0e4e95566cd95c887f69272499b8f3880b3ec0f5
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 21 09:52:54 2014 +1000

       - millert@cvs.openbsd.org 2014/07/15 15:54:15
         [forwarding.sh multiplex.sh]
         Add support for Unix domain socket forwarding.  A remote TCP port
         may be forwarded to a local Unix domain socket and vice versa or
         both ends may be a Unix domain socket.  This is a reimplementation
         of the streamlocal patches by William Ahern from:
             http://www.25thandclement.com/~william/projects/streamlocal.html
         OK djm@ markus@

commit 93a87ab27ecdc709169fb24411133998f81e2761
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 21 06:30:25 2014 +1000

     - (dtucker) [regress/unittests/sshkey/
       {common,test_file,test_fuzz,test_sshkey}.c] Wrap stdint.h includes in
       ifdefs.

commit 5573171352ea23df2dc6d2fe0324d023b7ba697c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 21 02:24:59 2014 +1000

    - (dtucker) [cipher.c openbsd-compat/openssl-compat.h] Restore the bits
       needed to build AES CTR mode against OpenSSL 0.9.8f and above.  ok djm

commit 74e28682711d005026c7c8f15f96aea9d3c8b5a3
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Jul 18 20:00:11 2014 -0700

     - (tim) [openbsd-compat/port-uw.c] Include misc.h for fwd_opts, used
       in servconf.h.

commit d1a0421f8e5e933fee6fb58ee6b9a22c63c8a613
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 19 07:23:55 2014 +1000

     - (dtucker) [key.c sshkey.c] Put new ecdsa bits inside ifdef OPENSSL_HAS_ECC.

commit f0fe9ea1be62227c130b317769de3d1e736b6dc1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 19 06:33:12 2014 +1000

     - (dtucker) [Makefile.in] Add a t-exec target to run just the executable
       tests.

commit 450bc1180d4b061434a4b733c5c8814fa30b022b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 19 06:23:18 2014 +1000

     - (dtucker) [auth2-gss.c gss-serv-krb5.c] Include misc.h for fwd_opts, used
       in servconf.h.

commit ab2ec586baad122ed169285c31927ccf58bc7b28
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 18 15:04:47 2014 +1000

       - djm@cvs.openbsd.org 2014/07/18 02:46:01
         [ssh-agent.c]
         restore umask around listener socket creation (dropped in streamlocal patch
         merge)

commit 357610d15946381ae90c271837dcdd0cdce7145f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 18 15:04:10 2014 +1000

       - djm@cvs.openbsd.org 2014/07/17 07:22:19
         [mux.c ssh.c]
         reflect stdio-forward ("ssh -W host:port ...") failures in exit status.
         previously we were always returning 0. bz#2255 reported by Brendan
         Germain; ok dtucker

commit dad9a4a0b7c2b5d78605f8df28718f116524134e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 18 15:03:49 2014 +1000

       - djm@cvs.openbsd.org 2014/07/17 00:12:03
         [key.c]
         silence "incorrect passphrase" error spam; reported and ok dtucker@

commit f42f7684ecbeec6ce50e0310f80b3d6da2aaf533
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 18 15:03:27 2014 +1000

       - djm@cvs.openbsd.org 2014/07/17 00:10:18
         [mux.c]
         preserve errno across syscall

commit 1b83320628cb0733e3688b85bfe4d388a7c51909
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 18 15:03:02 2014 +1000

       - djm@cvs.openbsd.org 2014/07/17 00:10:56
         [sandbox-systrace.c]
         ifdef SYS_sendsyslog so this will compile without patching on -stable

commit 6d57656331bcd754d912950e4a18ad259d596e61
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 18 15:02:06 2014 +1000

       - jmc@cvs.openbsd.org 2014/07/16 14:48:57
         [ssh.1]
         add the streamlocal* options to ssh's -o list; millert says they're
         irrelevant for scp/sftp;
    
         ok markus millert

commit 7acefbbcbeab725420ea07397ae35992f505f702
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 18 14:11:24 2014 +1000

       - millert@cvs.openbsd.org 2014/07/15 15:54:14
         [PROTOCOL auth-options.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
         [auth-rsa.c auth.c auth1.c auth2-hostbased.c auth2-kbdint.c auth2-none.c]
         [auth2-passwd.c auth2-pubkey.c auth2.c canohost.c channels.c channels.h]
         [clientloop.c misc.c misc.h monitor.c mux.c packet.c readconf.c]
         [readconf.h servconf.c servconf.h serverloop.c session.c ssh-agent.c]
         [ssh.c ssh_config.5 sshconnect.c sshconnect1.c sshconnect2.c sshd.c]
         [sshd_config.5 sshlogin.c]
         Add support for Unix domain socket forwarding.  A remote TCP port
         may be forwarded to a local Unix domain socket and vice versa or
         both ends may be a Unix domain socket.  This is a reimplementation
         of the streamlocal patches by William Ahern from:
             http://www.25thandclement.com/~william/projects/streamlocal.html
         OK djm@ markus@

commit 6262d760e00714523633bd989d62e273a3dca99a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 17 09:52:07 2014 +1000

       - tedu@cvs.openbsd.org 2014/07/11 13:54:34
         [myproposal.h]
         by popular demand, add back hamc-sha1 to server proposal for better compat
         with many clients still in use. ok deraadt

commit 9d69d937b46ecba17f16d923e538ceda7b705c7a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 17 09:49:37 2014 +1000

       - deraadt@cvs.openbsd.org 2014/07/11 08:09:54
         [sandbox-systrace.c]
         Permit use of SYS_sendsyslog from inside the sandbox.  Clock is ticking,
         update your kernels and sshd soon.. libc will start using sendsyslog()
         in about 4 days.

commit f6293a0b4129826fc2e37e4062f96825df43c326
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 17 09:01:25 2014 +1000

     - (djm) [digest-openssl.c] Preserve array order when disabling digests.
       Reported by Petr Lautrbach.

commit 00f9cd230709c04399ef5ff80492d70a55230694
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 15 10:41:38 2014 +1000

     - (djm) [configure.ac] Delay checks for arc4random* until after libcrypto
       has been located; fixes builds agains libressl-portable

commit 1d0df3249c87019556b83306c28d4769375c2edc
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 11 09:19:04 2014 +1000

     - OpenBSD CVS Sync
       - benno@cvs.openbsd.org 2014/07/09 14:15:56
         [ssh-add.c]
         fix ssh-add crash while loading more than one key
         ok markus@

commit 7a57eb3d105aa4ced15fb47001092c58811e6d9d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 9 13:22:31 2014 +1000

       - djm@cvs.openbsd.org 2014/07/07 08:15:26
         [multiplex.sh]
         remove forced-fatal that I stuck in there to test the new cleanup
         logic and forgot to remove...

commit 612f965239a30fe536b11ece1834d9f470aeb029
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 9 13:22:03 2014 +1000

       - djm@cvs.openbsd.org 2014/07/06 07:42:03
         [multiplex.sh test-exec.sh]
         add a hook to the cleanup() function to kill $SSH_PID if it is set
    
         use it to kill the mux master started in multiplex.sh (it was being left
         around on fatal failures)

commit d0bb950485ba121e43a77caf434115ed6417b46f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 9 13:07:28 2014 +1000

       - djm@cvs.openbsd.org 2014/07/09 03:02:15
         [key.c]
         downgrade more error() to debug() to better match what old authfile.c
         did; suppresses spurious errors with hostbased authentication enabled

commit 0070776a038655c57f57e70cd05e4c38a5de9d84
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 9 13:07:06 2014 +1000

       - djm@cvs.openbsd.org 2014/07/09 01:45:10
         [sftp.c]
         more useful error message when GLOB_NOSPACE occurs;
         bz#2254, patch from Orion Poplawski

commit 079bac2a43c74ef7cf56850afbab3b1932534c50
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 9 13:06:25 2014 +1000

       - djm@cvs.openbsd.org 2014/07/07 08:19:12
         [ssh_config.5]
         mention that ProxyCommand is executed using shell "exec" to avoid
         a lingering process; bz#1977

commit 3a48cc090096cf99b9de592deb5f90e444edebfb
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 6 09:32:49 2014 +1000

       - djm@cvs.openbsd.org 2014/07/05 23:11:48
         [channels.c]
         fix remote-forward cancel regression; ok markus@

commit 48bae3a38cb578713e676708164f6e7151cc64fa
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 6 09:27:06 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 23:18:35
         [authfile.h]
         remove leakmalloc droppings

commit 72e6b5c9ed5e72ca3a6ccc3177941b7c487a0826
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 4 09:00:04 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 22:40:43
         [servconf.c servconf.h session.c sshd.8 sshd_config.5]
         Add a sshd_config PermitUserRC option to control whether ~/.ssh/rc is
         executed, mirroring the no-user-rc authorized_keys option;
         bz#2160; ok markus@

commit 602943d1179a08dfa70af94f62296ea5e3d6ebb8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 4 08:59:41 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 22:33:41
         [channels.c]
         allow explicit ::1 and 127.0.0.1 forwarding bind addresses when
         GatewayPorts=no; allows client to choose address family;
         bz#2222 ok markus@

commit 6b37fbb7921d156b31e2c8f39d9e1b6746c34983
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 4 08:59:24 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 22:23:46
         [sshconnect.c]
         when rekeying, skip file/DNS lookup if it is the same as the key sent
         during initial key exchange. bz#2154 patch from Iain Morgan; ok markus@

commit d2c3cd5f2e47ee24cf7093ce8e948c2e79dfc3fd
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 4 08:59:01 2014 +1000

       - jsing@cvs.openbsd.org 2014/07/03 12:42:16
         [cipher-chachapoly.c]
         Call chacha_ivsetup() immediately before chacha_encrypt_bytes() - this
         makes it easier to verify that chacha_encrypt_bytes() is only called once
         per chacha_ivsetup() call.
         ok djm@

commit 686feb560ec43a06ba04da82b50f3c183c947309
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 21:29:38 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 11:16:55
         [auth.c auth.h auth1.c auth2.c]
         make the "Too many authentication failures" message include the
         user, source address, port and protocol in a format similar to the
         authentication success / failure messages; bz#2199, ok dtucker

commit 0f12341402e18fd9996ec23189b9418d2722453f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 21:28:09 2014 +1000

       - jmc@cvs.openbsd.org 2014/07/03 07:45:27
         [ssh_config.5]
         escape %C since groff thinks it part of an Rs/Re block;

commit 9c38643c5cd47a19db2cc28279dcc28abadc22b3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 21:27:46 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 06:39:19
         [ssh.c ssh_config.5]
         Add a %C escape sequence for LocalCommand and ControlPath that expands
         to a unique identifer based on a has of the tuple of (local host,
         remote user, hostname, port).
    
         Helps avoid exceeding sockaddr_un's miserly pathname limits for mux
         control paths.
    
         bz#2220, based on patch from mancha1 AT zoho.com; ok markus@

commit 49d9bfe2b2f3e90cc158a215dffa7675e57e7830
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 21:26:42 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 05:38:17
         [ssh.1]
         document that -g will only work in the multiplexed case if applied to
         the mux master

commit ef9f13ba4c58057b2166d1f2e790535da402fbe5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 21:26:21 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 05:32:36
         [ssh_config.5]
         mention '%%' escape sequence in HostName directives and how it may
         be used to specify IPv6 link-local addresses

commit e6a407789e5432dd2e53336fb73476cc69048c54
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 21:25:03 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 04:36:45
         [digest.h]
         forward-declare struct sshbuf so consumers don't need to include sshbuf.h

commit 4a1d3d50f02d0a8a4ef95ea4749293cbfb89f919
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 21:24:40 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 03:47:27
         [ssh-keygen.c]
         When hashing or removing hosts using ssh-keygen, don't choke on
         @revoked markers and don't remove @cert-authority markers;
         bz#2241, reported by mlindgren AT runelind.net

commit e5c0d52ceb575c3db8c313e0b1aa3845943d7ba8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 21:24:19 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 03:34:09
         [gss-serv.c session.c ssh-keygen.c]
         standardise on NI_MAXHOST for gethostname() string lengths; about
         1/2 the cases were using it already. Fixes bz#2239 en passant

commit c174a3b7c14e0d178c61219de2aa1110e209950c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 21:23:24 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 03:26:43
         [digest-openssl.c]
         use EVP_Digest() for one-shot hash instead of creating, updating,
         finalising and destroying a context.
         bz#2231, based on patch from Timo Teras

commit d7ca2cd31ecc4d63a055e2dcc4bf35c13f2db4c5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 21:23:01 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 03:15:01
         [ssh-add.c]
         make stdout line-buffered; saves partial output getting lost when
         ssh-add fatal()s part-way through (e.g. when listing keys from an
         agent that supports key types that ssh-add doesn't);
         bz#2234, reported by Phil Pennock

commit b1e967c8d7c7578dd0c172d85b3046cf54ea42ba
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 21:22:40 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 03:11:03
         [ssh-agent.c]
         Only cleanup agent socket in the main agent process and not in any
         subprocesses it may have started (e.g. forked askpass). Fixes
         agent sockets being zapped when askpass processes fatal();
         bz#2236 patch from Dmitry V. Levin

commit 61e28e55c3438d796b02ef878bcd28620d452670
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 21:22:22 2014 +1000

       - djm@cvs.openbsd.org 2014/07/03 01:45:38
         [sshkey.c]
         make Ed25519 keys' title fit properly in the randomart border; bz#2247
         based on patch from Christian Hesse

commit 9eb4cd9a32c32d40d36450b68ed93badc6a94c68
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 13:29:50 2014 +1000

     - (djm) [monitor_fdpass.c] Use sys/poll.h if poll.h doesn't exist;
       bz#2237

commit 8da0fa24934501909408327298097b1629b89eaa
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 3 11:54:19 2014 +1000

     - (djm) [digest-openssl.c configure.ac] Disable RIPEMD160 if libcrypto
       doesn't support it.

commit 81309c857dd0dbc0a1245a16d621c490ad48cfbb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 17:45:55 2014 +1000

     - (djm) [regress/Makefile] fix execution of sshkey unit/fuzz test

commit 82b2482ce68654815ee049b9bf021bb362a35ff2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 17:43:41 2014 +1000

     - (djm) [sshkey.c] Conditionalise inclusion of util.h

commit dd8b1dd7933eb6f5652641b0cdced34a387f2e80
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 17:38:31 2014 +1000

       - djm@cvs.openbsd.org 2014/06/24 01:14:17
         [Makefile.in regress/Makefile regress/unittests/Makefile]
         [regress/unittests/sshkey/Makefile]
         [regress/unittests/sshkey/common.c]
         [regress/unittests/sshkey/common.h]
         [regress/unittests/sshkey/mktestdata.sh]
         [regress/unittests/sshkey/test_file.c]
         [regress/unittests/sshkey/test_fuzz.c]
         [regress/unittests/sshkey/test_sshkey.c]
         [regress/unittests/sshkey/tests.c]
         [regress/unittests/sshkey/testdata/dsa_1]
         [regress/unittests/sshkey/testdata/dsa_1-cert.fp]
         [regress/unittests/sshkey/testdata/dsa_1-cert.pub]
         [regress/unittests/sshkey/testdata/dsa_1.fp]
         [regress/unittests/sshkey/testdata/dsa_1.fp.bb]
         [regress/unittests/sshkey/testdata/dsa_1.param.g]
         [regress/unittests/sshkey/testdata/dsa_1.param.priv]
         [regress/unittests/sshkey/testdata/dsa_1.param.pub]
         [regress/unittests/sshkey/testdata/dsa_1.pub]
         [regress/unittests/sshkey/testdata/dsa_1_pw]
         [regress/unittests/sshkey/testdata/dsa_2]
         [regress/unittests/sshkey/testdata/dsa_2.fp]
         [regress/unittests/sshkey/testdata/dsa_2.fp.bb]
         [regress/unittests/sshkey/testdata/dsa_2.pub]
         [regress/unittests/sshkey/testdata/dsa_n]
         [regress/unittests/sshkey/testdata/dsa_n_pw]
         [regress/unittests/sshkey/testdata/ecdsa_1]
         [regress/unittests/sshkey/testdata/ecdsa_1-cert.fp]
         [regress/unittests/sshkey/testdata/ecdsa_1-cert.pub]
         [regress/unittests/sshkey/testdata/ecdsa_1.fp]
         [regress/unittests/sshkey/testdata/ecdsa_1.fp.bb]
         [regress/unittests/sshkey/testdata/ecdsa_1.param.curve]
         [regress/unittests/sshkey/testdata/ecdsa_1.param.priv]
         [regress/unittests/sshkey/testdata/ecdsa_1.param.pub]
         [regress/unittests/sshkey/testdata/ecdsa_1.pub]
         [regress/unittests/sshkey/testdata/ecdsa_1_pw]
         [regress/unittests/sshkey/testdata/ecdsa_2]
         [regress/unittests/sshkey/testdata/ecdsa_2.fp]
         [regress/unittests/sshkey/testdata/ecdsa_2.fp.bb]
         [regress/unittests/sshkey/testdata/ecdsa_2.param.curve]
         [regress/unittests/sshkey/testdata/ecdsa_2.param.priv]
         [regress/unittests/sshkey/testdata/ecdsa_2.param.pub]
         [regress/unittests/sshkey/testdata/ecdsa_2.pub]
         [regress/unittests/sshkey/testdata/ecdsa_n]
         [regress/unittests/sshkey/testdata/ecdsa_n_pw]
         [regress/unittests/sshkey/testdata/ed25519_1]
         [regress/unittests/sshkey/testdata/ed25519_1-cert.fp]
         [regress/unittests/sshkey/testdata/ed25519_1-cert.pub]
         [regress/unittests/sshkey/testdata/ed25519_1.fp]
         [regress/unittests/sshkey/testdata/ed25519_1.fp.bb]
         [regress/unittests/sshkey/testdata/ed25519_1.pub]
         [regress/unittests/sshkey/testdata/ed25519_1_pw]
         [regress/unittests/sshkey/testdata/ed25519_2]
         [regress/unittests/sshkey/testdata/ed25519_2.fp]
         [regress/unittests/sshkey/testdata/ed25519_2.fp.bb]
         [regress/unittests/sshkey/testdata/ed25519_2.pub]
         [regress/unittests/sshkey/testdata/pw]
         [regress/unittests/sshkey/testdata/rsa1_1]
         [regress/unittests/sshkey/testdata/rsa1_1.fp]
         [regress/unittests/sshkey/testdata/rsa1_1.fp.bb]
         [regress/unittests/sshkey/testdata/rsa1_1.param.n]
         [regress/unittests/sshkey/testdata/rsa1_1.pub]
         [regress/unittests/sshkey/testdata/rsa1_1_pw]
         [regress/unittests/sshkey/testdata/rsa1_2]
         [regress/unittests/sshkey/testdata/rsa1_2.fp]
         [regress/unittests/sshkey/testdata/rsa1_2.fp.bb]
         [regress/unittests/sshkey/testdata/rsa1_2.param.n]
         [regress/unittests/sshkey/testdata/rsa1_2.pub]
         [regress/unittests/sshkey/testdata/rsa_1]
         [regress/unittests/sshkey/testdata/rsa_1-cert.fp]
         [regress/unittests/sshkey/testdata/rsa_1-cert.pub]
         [regress/unittests/sshkey/testdata/rsa_1.fp]
         [regress/unittests/sshkey/testdata/rsa_1.fp.bb]
         [regress/unittests/sshkey/testdata/rsa_1.param.n]
         [regress/unittests/sshkey/testdata/rsa_1.param.p]
         [regress/unittests/sshkey/testdata/rsa_1.param.q]
         [regress/unittests/sshkey/testdata/rsa_1.pub]
         [regress/unittests/sshkey/testdata/rsa_1_pw]
         [regress/unittests/sshkey/testdata/rsa_2]
         [regress/unittests/sshkey/testdata/rsa_2.fp]
         [regress/unittests/sshkey/testdata/rsa_2.fp.bb]
         [regress/unittests/sshkey/testdata/rsa_2.param.n]
         [regress/unittests/sshkey/testdata/rsa_2.param.p]
         [regress/unittests/sshkey/testdata/rsa_2.param.q]
         [regress/unittests/sshkey/testdata/rsa_2.pub]
         [regress/unittests/sshkey/testdata/rsa_n]
         [regress/unittests/sshkey/testdata/rsa_n_pw]
         unit and fuzz tests for new key API

commit c1dc24b71f087f385b92652b9673f52af64e0428
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 17:02:03 2014 +1000

       - djm@cvs.openbsd.org 2014/06/24 01:04:43
         [regress/krl.sh]
         regress test for broken consecutive revoked serial number ranges

commit 43d3ed2dd3feca6d0326c7dc82588d2faa115e92
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 17:01:08 2014 +1000

       - djm@cvs.openbsd.org 2014/05/21 07:04:21
         [regress/integrity.sh]
         when failing because of unexpected output, show the offending output

commit 5a96707ffc8d227c2e7d94fa6b0317f8a152cf4e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 15:38:05 2014 +1000

       - djm@cvs.openbsd.org 2014/04/30 05:32:00
         [regress/Makefile]
         unit tests for new buffer API; including basic fuzz testing
         NB. Id sync only.

commit 3ff92ba756aee48e4ae3e0aeff7293517b3dd185
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 15:33:09 2014 +1000

       - djm@cvs.openbsd.org 2014/06/30 12:54:39
         [key.c]
         suppress spurious error message when loading key with a passphrase;
         reported by kettenis@ ok markus@
       - djm@cvs.openbsd.org 2014/07/02 04:59:06
         [cipher-3des1.c]
         fix ssh protocol 1 on the server that regressed with the sshkey change
         (sometimes fatal() after auth completed), make file return useful status
         codes.
         NB. Id sync only for these two. They were bundled into the sshkey merge
         above, since it was easier to sync the entire file and then apply
         portable-specific changed atop it.

commit ec3d0e24a1e46873d80507f5cd8ee6d0d03ac5dc
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 15:30:00 2014 +1000

       - markus@cvs.openbsd.org 2014/06/27 18:50:39
         [ssh-add.c]
         fix loading of private keys

commit 4b3ed647d5b328cf68e6a8ffbee490d8e0683e82
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 15:29:40 2014 +1000

       - markus@cvs.openbsd.org 2014/06/27 16:41:56
         [channels.c channels.h clientloop.c ssh.c]
         fix remote fwding with same listen port but different listen address
         with gerhard@, ok djm@

commit 9e01ff28664921ce9b6500681333e42fb133b4d0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 15:29:21 2014 +1000

       - deraadt@cvs.openbsd.org 2014/06/25 14:16:09
         [sshbuf.c]
         unblock SIGSEGV before raising it
         ok djm

commit 1845fe6bda0729e52f4c645137f4fc3070b5438a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 15:29:01 2014 +1000

       - djm@cvs.openbsd.org 2014/06/24 02:21:01
         [scp.c]
         when copying local->remote fails during read, don't send uninitialised
         heap to the remote end. Reported by Jann Horn

commit 19439e9a2a0ac0b4b3b1210e89695418beb1c883
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 15:28:40 2014 +1000

       - djm@cvs.openbsd.org 2014/06/24 02:19:48
         [ssh.c]
         don't fatal() when hostname canonicalisation fails with a
         ProxyCommand in use; continue and allow the ProxyCommand to
         connect anyway (e.g. to a host with a name outside the DNS
         behind a bastion)

commit 8668706d0f52654fe64c0ca41a96113aeab8d2b8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 15:28:02 2014 +1000

       - djm@cvs.openbsd.org 2014/06/24 01:13:21
         [Makefile.in auth-bsdauth.c auth-chall.c auth-options.c auth-rsa.c
         [auth2-none.c auth2-pubkey.c authfile.c authfile.h cipher-3des1.c
         [cipher-chachapoly.c cipher-chachapoly.h cipher.c cipher.h
         [digest-libc.c digest-openssl.c digest.h dns.c entropy.c hmac.h
         [hostfile.c key.c key.h krl.c monitor.c packet.c rsa.c rsa.h
         [ssh-add.c ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c
         [ssh-keygen.c ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c
         [ssh-rsa.c sshbuf-misc.c sshbuf.h sshconnect.c sshconnect1.c
         [sshconnect2.c sshd.c sshkey.c sshkey.h
         [openbsd-compat/openssl-compat.c openbsd-compat/openssl-compat.h]
         New key API: refactor key-related functions to be more library-like,
         existing API is offered as a set of wrappers.
    
         with and ok markus@
    
         Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
         Dempsky and Ron Bowes for a detailed review a few months ago.
    
         NB. This commit also removes portable OpenSSH support for OpenSSL
         <0.9.8e.

commit 2cd7929250cf9e9f658d70dcd452f529ba08c942
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 12:48:30 2014 +1000

       - djm@cvs.openbsd.org 2014/06/24 00:52:02
         [krl.c]
         fix bug in KRL generation: multiple consecutive revoked certificate
         serial number ranges could be serialised to an invalid format.
    
         Readers of a broken KRL caused by this bug will fail closed, so no
         should-have-been-revoked key will be accepted.

commit 99db840ee8dbbd2b3fbc6c45d0ee2f6a65e96898
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 12:48:04 2014 +1000

       - naddy@cvs.openbsd.org 2014/06/18 15:42:09
         [sshbuf-getput-crypto.c]
         The ssh_get_bignum functions must accept the same range of bignums
         the corresponding ssh_put_bignum functions create.  This fixes the
         use of 16384-bit RSA keys (bug reported by Eivind Evensen).
         ok djm@

commit 84a89161a9629239b64171ef3e22ef6a3e462d51
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 12:47:48 2014 +1000

       - matthew@cvs.openbsd.org 2014/06/18 02:59:13
         [sandbox-systrace.c]
         Now that we have a dedicated getentropy(2) system call for
         arc4random(3), we can disallow __sysctl(2) in OpenSSH's systrace
         sandbox.
    
         ok djm

commit 51504ceec627c0ad57b9f75585c7b3d277f326be
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 2 12:47:25 2014 +1000

       - deraadt@cvs.openbsd.org 2014/06/13 08:26:29
         [sandbox-systrace.c]
         permit SYS_getentropy
         from matthew

commit a261b8df59117f7dc52abb3a34b35a40c2c9fa88
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jun 18 16:17:28 2014 -0700

     - (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare

commit 316fac6f18f87262a315c79bcf68b9f92c9337e4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 17 23:06:07 2014 +1000

     - (dtucker) [entropy.c openbsd-compat/openssl-compat.{c,h}
       openbsd-compat/regress/{.cvsignore,Makefile.in,opensslvertest.c}]
       Move the OpenSSL header/library version test into its own function and add
       tests for it. Fix it to allow fix version upgrades (but not downgrades).
       Prompted by chl@ via OpenSMTPD (issue #462) and Debian (bug #748150).
       ok djm@ chl@

commit af665bb7b092a59104db1e65577851cf35b86e32
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 16 22:50:55 2014 +1000

     - (dtucker) [defines.h] Fix undef of _PATH_MAILDIR.  From rak at debian via
       OpenSMTPD and chl@

commit f9696566fb41320820f3b257ab564fa321bb3751
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 11:06:04 2014 +1000

     - (dtucker) [configure.ac] Remove tcpwrappers support, support has already
       been removed from sshd.c.

commit 5e2b8894b0b24af4ad0a2f7aa33ebf255df7a8bc
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jun 11 18:31:10 2014 -0700

     - (tim) [regress/unittests/test_helper/test_helper.h] Add includes.h for
       u_intXX_t types.

commit 985ee2cbc3e43bc65827c3c0d4df3faa99160c37
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 12 05:32:29 2014 +1000

     - (dtucker) [regress/unittests/sshbuf/*.c regress/unittests/test_helper/*]
       Wrap stdlib.h include an ifdef for platforms that don't have it.

commit cf5392c2db2bb1dbef9818511d34056404436109
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 12 05:22:49 2014 +1000

     - (dtucker) [defines.h] Add va_copy if we don't already have it, taken from
       openbsd-compat/bsd-asprintf.c.

commit 58538d795e0b662f2f4e5a7193f1204bbe992ddd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 13:39:24 2014 +1000

     - (dtucker) [bufaux.c bufbn.c bufec.c buffer.c] Pull in includes.h for
       compat stuff, specifically whether or not OpenSSL has ECC.

commit eb012ac581fd0abc16ee86ee3a68cf07c8ce4d08
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 13:10:00 2014 +1000

     - (dtucker) [openbsd-compat/arc4random.c] Use explicit_bzero instead of an
       assigment that might get optimized out.  ok djm@

commit b9609fd86c623d6d440e630f5f9a63295f7aea20
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 08:04:02 2014 +1000

     - (dtucker) [sshbuf.h] Only declare ECC functions if building without
       OpenSSL or if OpenSSL has ECC.

commit a54a040f66944c6e8913df8635a01a2327219be9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 07:58:35 2014 +1000

       - dtucker@cvs.openbsd.org 2014/06/10 21:46:11
         [sshbuf.h]
         Group ECC functions together to make things a little easier in -portable.
         "doesn't bother me" deraadt@

commit 9f92c53bad04a89067756be8198d4ec2d8a08875
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 07:57:58 2014 +1000

       - djm@cvs.openbsd.org 2014/06/05 22:17:50
         [sshconnect2.c]
         fix inverted test that caused PKCS#11 keys that were explicitly listed
         not to be preferred. Reported by Dirk-Willem van Gulik

commit 15c254a25394f96643da2ad0f674acdc51e89856
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 07:38:49 2014 +1000

     - (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] ifdef
       ECC variable too.

commit d7af0cc5bf273eeed0897a99420bc26841d07d8f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 07:37:25 2014 +1000

     - (dtucker) [myprosal.h] Don't include curve25519-sha256@libssh.org in
       the proposal if the version of OpenSSL we're using doesn't support ECC.

commit 67508ac2563c33d582be181a3e777c65f549d22f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 06:27:16 2014 +1000

     - (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
       regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] Only do NISTP256
       curve tests if OpenSSL has them.

commit 6482d90a65459a88c18c925368525855832272b3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 27 14:34:42 2014 +1000

     - (djm) [configure.ac openbsd-compat/bsd-cygwin_util.c]
          [openbsd-compat/bsd-cygwin_util.h] On Cygwin, determine privilege
             separation user at runtime, since it may need to be a domain account.
                Patch from Corinna Vinschen.

commit f9eb5e0734f7a7f6e975809eb54684d2a06a7ffc
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 27 14:31:58 2014 +1000

     - (djm) [contrib/cygwin/ssh-host-config] Updated Cygwin ssh-host-config
       from Corinna Vinschen, fixing a number of bugs and preparing for
       Cygwin 1.7.30.

commit eae88744662e6b149f43ef071657727f1a157d95
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 27 14:27:02 2014 +1000

     - (djm) [cipher.c] Fix merge botch.

commit 564b5e253c1d95c26a00e8288f0089a2571661c3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 22 08:23:59 2014 +1000

     - (djm) [Makefile.in] typo in path

commit e84d10302aeaf7a1acb05c451f8718143656856a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 21 17:13:36 2014 +1000

    revert a diff I didn't mean to commit

commit 795b86313f1f1aab9691666c4f2d5dae6e4acd50
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 21 17:12:53 2014 +1000

     - (djm) [misc.c] Use CLOCK_BOOTTIME in preference to CLOCK_MONOTONIC
       when it is available. It takes into account time spent suspended,
       thereby ensuring timeouts (e.g. for expiring agent keys) fire
       correctly. bz#2228 reported by John Haxby

commit 18912775cb97c0b1e75e838d3c7d4b56648137b5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 21 17:06:46 2014 +1000

     - (djm) [commit configure.ac defines.h sshpty.c] don't attempt to use
       vhangup on Linux. It doens't work for non-root users, and for them
       it just messes up the tty settings.

commit 7f1c264d3049cd95234e91970ccb5406e1d15b27
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 18:01:52 2014 +1000

     - (djm) [sshbuf.c] need __predict_false

commit e7429f2be8643e1100380a8a7389d85cc286c8fe
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 18:01:01 2014 +1000

     - (djm) [regress/Makefile Makefile.in]
       [regress/unittests/sshbuf/test_sshbuf.c
       [regress/unittests/sshbuf/test_sshbuf_fixed.c]
       [regress/unittests/sshbuf/test_sshbuf_fuzz.c]
       [regress/unittests/sshbuf/test_sshbuf_getput_basic.c]
       [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c]
       [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c]
       [regress/unittests/sshbuf/test_sshbuf_misc.c]
       [regress/unittests/sshbuf/tests.c]
       [regress/unittests/test_helper/fuzz.c]
       [regress/unittests/test_helper/test_helper.c]
       Hook new unit tests into the build and "make tests"

commit def1de086707b0e6b046fe7e115c60aca0227a99
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 15:17:15 2014 +1000

     - (djm) [regress/unittests/Makefile]
       [regress/unittests/Makefile.inc]
       [regress/unittests/sshbuf/Makefile]
       [regress/unittests/sshbuf/test_sshbuf.c]
       [regress/unittests/sshbuf/test_sshbuf_fixed.c]
       [regress/unittests/sshbuf/test_sshbuf_fuzz.c]
       [regress/unittests/sshbuf/test_sshbuf_getput_basic.c]
       [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c]
       [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c]
       [regress/unittests/sshbuf/test_sshbuf_misc.c]
       [regress/unittests/sshbuf/tests.c]
       [regress/unittests/test_helper/Makefile]
       [regress/unittests/test_helper/fuzz.c]
       [regress/unittests/test_helper/test_helper.c]
       [regress/unittests/test_helper/test_helper.h]
       Import new unit tests from OpenBSD; not yet hooked up to build.

commit 167685756fde8bc213a8df2c8e1848e312db0f46
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 15:08:40 2014 +1000

       - logan@cvs.openbsd.org 2014/05/04 10:40:59
         [connect-privsep.sh]
         Remove the Z flag from the list of malloc options as it
         was removed from malloc.c 10 days ago.
    
         OK from miod@

commit d0b69fe90466920d69c96069312e24b581771bd7
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 15:08:19 2014 +1000

       - dtucker@cvs.openbsd.org 2014/05/03 18:46:14
         [proxy-connect.sh]
         Add tests for with and without compression, with and without privsep.

commit edb1af50441d19fb2dd9ccb4d75bf14473fca584
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 15:07:53 2014 +1000

       - djm@cvs.openbsd.org 2014/04/21 22:15:37
         [dhgex.sh integrity.sh kextype.sh rekey.sh try-ciphers.sh]
         repair regress tests broken by server-side default cipher/kex/mac changes
         by ensuring that the option under test is included in the server's
         algorithm list

commit 54343e95c70994695f8842fb22836321350198d3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 15:07:33 2014 +1000

       - djm@cvs.openbsd.org 2014/03/13 20:44:49
         [login-timeout.sh]
         this test is a sorry mess of race conditions; add another sleep
         to avoid a failure on slow machines (at least until I find a
         better way)

commit e5b9f0f2ee6e133894307e44e862b66426990733
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 14:58:07 2014 +1000

     - (djm) [Makefile.in configure.ac sshbuf-getput-basic.c]
       [sshbuf-getput-crypto.c sshbuf.c] compilation and portability fixes

commit b9c566788a9ebd6a9d466f47a532124f111f0542
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 14:43:37 2014 +1000

     - (djm) [configure.ac] Unconditionally define WITH_OPENSSL until we write
       portability glue to support building without libcrypto

commit 3dc27178b42234b653a32f7a87292d7994045ee3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 14:37:59 2014 +1000

       - logan@cvs.openbsd.org 2014/05/05 07:02:30
         [sftp.c]
         Zap extra whitespace.
    
         OK from djm@ and dtucker@

commit c31a0cd5b31961f01c5b731f62a6cb9d4f767472
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 14:37:39 2014 +1000

       - markus@cvs.openbsd.org 2014/05/03 17:20:34
         [monitor.c packet.c packet.h]
         unbreak compression, by re-init-ing the compression code in the
         post-auth child. the new buffer code is more strict, and requires
         buffer_init() while the old code was happy after a bzero();
         originally from djm@

commit 686c7d9ee6f44b2be4128d7860b6b37adaeba733
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 14:37:03 2014 +1000

       - djm@cvs.openbsd.org 2014/05/02 03:27:54
         [chacha.h cipher-chachapoly.h digest.h hmac.h kex.h kexc25519.c]
         [misc.h poly1305.h ssh-pkcs11.c defines.h]
         revert __bounded change; it causes way more problems for portable than
         it solves; pointed out by dtucker@

commit 294c58a007cfb2f3bddc4fc3217e255857ffb9bf
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 14:35:03 2014 +1000

       - naddy@cvs.openbsd.org 2014/04/30 19:07:48
         [mac.c myproposal.h umac.c]
         UMAC can use our local fallback implementation of AES when OpenSSL isn't
         available.  Glue code straight from Ted Krovetz's original umac.c.
         ok markus@

commit 05e82c3b963c33048128baf72a6f6b3a1c10b4c1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 14:33:43 2014 +1000

       - djm@cvs.openbsd.org 2014/04/30 05:29:56
         [bufaux.c bufbn.c bufec.c buffer.c buffer.h sshbuf-getput-basic.c]
         [sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c sshbuf.h ssherr.c]
         [ssherr.h]
         New buffer API; the first installment of the conversion/replacement
         of OpenSSH's internals to make them usable as a standalone library.
    
         This includes a set of wrappers to make it compatible with the
         existing buffer API so replacement can occur incrementally.
    
         With and ok markus@
    
         Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
         Dempsky and Ron Bowes for a detailed review.

commit 380948180f847a26f2d0c85b4dad3dca2ed2fd8b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 14:25:18 2014 +1000

       - dtucker@cvs.openbsd.org 2014/04/29 20:36:51
         [sftp.c]
         Don't attempt to append a nul quote char to the filename.  Should prevent
         fatal'ing with "el_insertstr failed" when there's a single quote char
         somewhere in the string.  bz#2238, ok markus@

commit d7fd8bedd4619a2ec7fd02aae4c4e1db4431ad9f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 14:24:59 2014 +1000

       - dtucker@cvs.openbsd.org 2014/04/29 19:58:50
         [sftp.c]
         Move nulling of variable next to where it's freed.  ok markus@

commit 1f0311c7c7d10c94ff7f823de9c5b2ed79368b14
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 14:24:09 2014 +1000

       - markus@cvs.openbsd.org 2014/04/29 18:01:49
         [auth.c authfd.c authfile.c bufaux.c cipher.c cipher.h hostfile.c]
         [kex.c key.c mac.c monitor.c monitor_wrap.c myproposal.h packet.c]
         [roaming_client.c ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c]
         [ssh-pkcs11.h ssh.c sshconnect.c sshconnect2.c sshd.c]
         make compiling against OpenSSL optional (make OPENSSL=no);
         reduces algorithms to curve25519, aes-ctr, chacha, ed25519;
         allows us to explore further options; with and ok djm

commit c5893785564498cea73cb60d2cf199490483e080
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:48:49 2014 +1000

       - djm@cvs.openbsd.org 2014/04/29 13:10:30
         [clientloop.c serverloop.c]
         bz#1818 - don't send channel success/failre replies on channels that
         have sent a close already; analysis and patch from Simon Tatham;
         ok markus@

commit 633de33b192d808d87537834c316dc8b75fe1880
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:48:26 2014 +1000

       - djm@cvs.openbsd.org 2014/04/28 03:09:18
         [authfile.c bufaux.c buffer.h channels.c krl.c mux.c packet.c packet.h]
         [ssh-keygen.c]
         buffer_get_string_ptr's return should be const to remind
         callers that futzing with it will futz with the actual buffer
         contents

commit 15271907843e4ae50dcfc83b3594014cf5e9607b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:47:56 2014 +1000

       - djm@cvs.openbsd.org 2014/04/23 12:42:34
         [readconf.c]
         don't record duplicate IdentityFiles

commit 798a02568b13a2e46efebd81f08c8f4bb33a6dc7
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:47:37 2014 +1000

       - jmc@cvs.openbsd.org 2014/04/22 14:16:30
         [sftp.1]
         zap eol whitespace;

commit d875ff78d2b8436807381051de112f0ebf9b9ae1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:47:15 2014 +1000

       - logan@cvs.openbsd.org 2014/04/22 12:42:04
         [sftp.1]
         Document sftp upload resume.
         OK from djm@, with feedback from okan@.

commit b15cd7bb097fd80dc99520f45290ef775da1ef19
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:46:52 2014 +1000

       - logan@cvs.openbsd.org 2014/04/22 10:07:12
         [sftp.c]
         Sort the sftp command list.
         OK from djm@

commit d8accc0aa72656ba63d50937165c5ae49db1dcd6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:46:25 2014 +1000

       - logan@cvs.openbsd.org 2014/04/21 14:36:16
         [sftp-client.c sftp-client.h sftp.c]
         Implement sftp upload resume support.
         OK from djm@, with input from guenther@, mlarkin@ and
         okan@

commit 16cd3928a87d20c77b13592a74b60b08621d3ce6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:45:58 2014 +1000

       - logan@cvs.openbsd.org 2014/04/20 09:24:26
         [dns.c dns.h ssh-keygen.c]
         Add support for SSHFP DNS records for ED25519 key types.
         OK from djm@

commit ec0b67eb3b4e12f296ced1fafa01860c374f7eea
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:45:26 2014 +1000

     - (djm) [rijndael.c rijndael.h] Sync with newly-ressurected versions ine
       OpenBSD

commit f028460d0b2e5a584355321015cde69bf6fd933e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 1 02:24:35 2014 +1000

     - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already
       have it.  Only attempt to use __attribute__(__bounded__) for gcc.

commit b628cc4c3e4a842bab5e4584d18c2bc5fa4d0edf
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:33:58 2014 +1000

       - djm@cvs.openbsd.org 2014/04/20 02:49:32
         [compat.c]
         add a canonical 6.6 + curve25519 bignum fix fake version that I can
         recommend people use ahead of the openssh-6.7 release

commit 888566913933a802f3a329ace123ebcb7154cf78
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:33:19 2014 +1000

       - djm@cvs.openbsd.org 2014/04/20 02:30:25
         [misc.c misc.h umac.c]
         use get/put_u32 to load values rather than *((UINT32 *)p) that breaks on
         strict-alignment architectures; reported by and ok stsp@

commit 16f85cbc7e5139950e6a38317e7c8b368beafa5d
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:29:28 2014 +1000

       - tedu@cvs.openbsd.org 2014/04/19 18:42:19
         [ssh.1]
         delete .xr to hosts.equiv. there's still an unfortunate amount of
         documentation referring to rhosts equivalency in here.

commit 69cb24b7356ec3f0fc5ff04a68f98f2c55c766f4
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:29:06 2014 +1000

       - tedu@cvs.openbsd.org 2014/04/19 18:15:16
         [sshd.8]
         remove some really old rsh references

commit 84c1e7bca8c4ceaccf4d5557e39a833585a3c77e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:27:53 2014 +1000

       - tedu@cvs.openbsd.org 2014/04/19 14:53:48
         [ssh-keysign.c sshd.c]
         Delete futile calls to RAND_seed. ok djm
         NB. Id sync only. This only applies to OpenBSD's libcrypto slashathon

commit 0e6b67423b8662f9ca4c92750309e144fd637ef1
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:27:01 2014 +1000

       - djm@cvs.openbsd.org 2014/04/19 05:54:59
         [compat.c]
         missing wildcard; pointed out by naddy@

commit 9395b28223334826837c15e8c1bb4dfb3b0d2ca5
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:25:30 2014 +1000

       - djm@cvs.openbsd.org 2014/04/18 23:52:25
         [compat.c compat.h sshconnect2.c sshd.c version.h]
         OpenSSH 6.5 and 6.6 have a bug that causes ~0.2% of connections
         using the curve25519-sha256@libssh.org KEX exchange method to fail
         when connecting with something that implements the spec properly.
    
         Disable this KEX method when speaking to one of the affected
         versions.
    
         reported by Aris Adamantiadis; ok markus@

commit 8c492da58f8ceb85cf5f7066f23e26fb813a963d
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:25:09 2014 +1000

       - djm@cvs.openbsd.org 2014/04/16 23:28:12
         [ssh-agent.1]
         remove the identity files from this manpage - ssh-agent doesn't deal
         with them at all and the same information is duplicated in ssh-add.1
         (which does deal with them); prodded by deraadt@

commit adbfdbbdccc70c9bd70d81ae096db115445c6e26
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:24:49 2014 +1000

       - djm@cvs.openbsd.org 2014/04/16 23:22:45
         [bufaux.c]
         skip leading zero bytes in buffer_put_bignum2_from_string();
         reported by jan AT mojzis.com; ok markus@

commit 75c62728dc87af6805696eeb520b9748faa136c8
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:24:31 2014 +1000

       - djm@cvs.openbsd.org 2014/04/12 04:55:53
         [sshd.c]
         avoid crash at exit: check that pmonitor!=NULL before dereferencing;
         bz#2225, patch from kavi AT juniper.net

commit 2a328437fb1b0976f2f4522d8645803d5a5d0967
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:24:01 2014 +1000

       - djm@cvs.openbsd.org 2014/04/01 05:32:57
         [packet.c]
         demote a debug3 to PACKET_DEBUG; ok markus@

commit 7d6a9fb660c808882d064e152d6070ffc3844c3f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:23:43 2014 +1000

       - djm@cvs.openbsd.org 2014/04/01 03:34:10
         [sshconnect.c]
         When using VerifyHostKeyDNS with a DNSSEC resolver, down-convert any
         certificate keys to plain keys and attempt SSHFP resolution.
    
         Prevents a server from skipping SSHFP lookup and forcing a new-hostkey
         dialog by offering only certificate keys.
    
         Reported by mcv21 AT cam.ac.uk

commit fcd62c0b66b8415405ed0af29c236329eb88cc0f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:23:21 2014 +1000

       - djm@cvs.openbsd.org 2014/04/01 02:05:27
         [ssh-keysign.c]
         include fingerprint of key not found
         use arc4random_buf() instead of loop+arc4random()

commit 43b156cf72f900f88065b0a1c1ebd09ab733ca46
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:23:03 2014 +1000

       - jmc@cvs.openbsd.org 2014/03/31 13:39:34
         [ssh-keygen.1]
         the text for the -K option was inserted in the wrong place in -r1.108;
         fix From: Matthew Clarke

commit c1621c84f2dc1279065ab9fde2aa9327af418900
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:22:46 2014 +1000

       - naddy@cvs.openbsd.org 2014/03/28 05:17:11
         [ssh_config.5 sshd_config.5]
         sync available and default algorithms, improve algorithm list formatting
         help from jmc@ and schwarze@, ok deraadt@

commit f2719b7c2b8a3b14d778d8a6d8dc729b5174b054
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:22:18 2014 +1000

       - tedu@cvs.openbsd.org 2014/03/26 19:58:37
         [sshd.8 sshd.c]
         remove libwrap support. ok deraadt djm mfriedl

commit 4f40209aa4060b9c066a2f0d9332ace7b8dfb391
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:21:22 2014 +1000

       - djm@cvs.openbsd.org 2014/03/26 04:55:35
         [chacha.h cipher-chachapoly.h digest.h hmac.h kex.h kexc25519.c
         [misc.h poly1305.h ssh-pkcs11.c]
         use __bounded(...) attribute recently added to sys/cdefs.h instead of
         longform __attribute__(__bounded(...));
    
         for brevity and a warning free compilation with llvm/clang

commit 9235a030ad1b16903fb495d81544e0f7c7449523
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:17:20 2014 +1000

    Three commits in one (since they touch the same heavily-diverged file
    repeatedly):
    
       - markus@cvs.openbsd.org 2014/03/25 09:40:03
         [myproposal.h]
         trimm default proposals.
    
         This commit removes the weaker pre-SHA2 hashes, the broken ciphers
         (arcfour), and the broken modes (CBC) from the default configuration
         (the patch only changes the default, all the modes are still available
         for the config files).
    
         ok djm@, reminded by tedu@ & naddy@ and discussed with many
       - deraadt@cvs.openbsd.org 2014/03/26 17:16:26
         [myproposal.h]
         The current sharing of myproposal[] between both client and server code
         makes the previous diff highly unpallatable.  We want to go in that
         direction for the server, but not for the client.  Sigh.
         Brought up by naddy.
       - markus@cvs.openbsd.org 2014/03/27 23:01:27
         [myproposal.h ssh-keyscan.c sshconnect2.c sshd.c]
         disable weak proposals in sshd, but keep them in ssh; ok djm@

commit 6e1777f592f15f4559728c78204617537b1ac076
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:02:58 2014 +1000

       - tedu@cvs.openbsd.org 2014/03/19 14:42:44
         [scp.1]
         there is no need for rcp anymore
         ok deraadt millert

commit eb1b7c514d2a7b1802ccee8cd50e565a4d419887
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:02:26 2014 +1000

       - tedu@cvs.openbsd.org 2014/03/17 19:44:10
         [ssh.1]
         old descriptions of des and blowfish are old. maybe ok deraadt

commit f0858de6e1324ec730752387074b111b8551081e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:01:30 2014 +1000

       - deraadt@cvs.openbsd.org 2014/03/15 17:28:26
         [ssh-agent.c ssh-keygen.1 ssh-keygen.c]
         Improve usage() and documentation towards the standard form.
         In particular, this line saves a lot of man page reading time.
           usage: ssh-keygen [-q] [-b bits] [-t dsa | ecdsa | ed25519 | rsa | rsa1]
                             [-N new_passphrase] [-C comment] [-f output_keyfile]
         ok schwarze jmc

commit 94bfe0fbd6e91a56b5b0ab94ac955d2a67d101aa
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:00:51 2014 +1000

       - naddy@cvs.openbsd.org 2014/03/12 13:06:59
         [ssh-keyscan.1]
         scan for Ed25519 keys by default too

commit 3819519288b2b3928c6882f5883b0f55148f4fc0
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:00:28 2014 +1000

       - djm@cvs.openbsd.org 2014/03/12 04:51:12
         [authfile.c]
         correct test that kdf name is not "none" or "bcrypt"

commit 8f9cd709c7cf0655d414306a0ed28306b33802be
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 13:00:11 2014 +1000

       - djm@cvs.openbsd.org 2014/03/12 04:50:32
         [auth-bsdauth.c ssh-keygen.c]
         don't count on things that accept arguments by reference to clear
         things for us on error; most things do, but it's unsafe form.

commit 1c7ef4be83f6dec84509a312518b9df00ab491d9
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 12:59:46 2014 +1000

       - djm@cvs.openbsd.org 2014/03/12 04:44:58
         [ssh-keyscan.c]
         scan for Ed25519 keys by default too

commit c10bf4d051c97939b30a1616c0499310057d07da
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 20 12:58:04 2014 +1000

       - djm@cvs.openbsd.org 2014/03/03 22:22:30
         [session.c]
         ignore enviornment variables with embedded '=' or '\0' characters;
         spotted by Jann Horn; ok deraadt@
         Id sync only - portable already has this.

commit c2e49062faccbcd7135c40d1c78c5c329c58fc2e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 1 14:42:46 2014 +1100

     - (djm) Use full release (e.g. 6.5p1) in debug output rather than just
        version. From des@des.no

commit 14928b7492abec82afa4c2b778fc03f78cd419b6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 1 14:38:07 2014 +1100

     - (djm) On platforms that support it, use prctl() to prevent sftp-server
        from accessing /proc/self/{mem,maps}; patch from jann AT thejh.net

commit 48abc47e60048461fe9117e108a7e99ea1ac2bb8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 17 14:45:56 2014 +1100

     - (djm) [sandbox-seccomp-filter.c] Soft-fail stat() syscalls. Add XXX to
       remind myself to add sandbox violation logging via the log socket.

commit 9c36698ca2f554ec221dc7ef29c7a89e97c88705
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Mar 14 12:45:01 2014 -0700

    20140314
     - (tim) [opensshd.init.in] Add support for ed25519

commit 19158b2447e35838d69b2b735fb640d1e86061ea
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 13 13:14:21 2014 +1100

     - (djm) Release OpenSSH 6.6

commit 8569eba5d7f7348ce3955eeeb399f66f25c52ece
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 4 09:35:17 2014 +1100

       - djm@cvs.openbsd.org 2014/03/03 22:22:30
         [session.c]
         ignore enviornment variables with embedded '=' or '\0' characters;
         spotted by Jann Horn; ok deraadt@

commit 2476c31b96e89aec7d4e73cb6fbfb9a4290de3a7
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 2 04:01:00 2014 +1100

     - (djm) [regress/Makefile] Disable dhgex regress test; it breaks when
       no moduli file exists at the expected location.

commit c83fdf30e9db865575b2521b1fe46315cf4c70ae
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 28 10:34:03 2014 +1100

     - (djm) [regress/host-expand.sh] Add RCS Id

commit 834aeac3555e53f7d29a6fcf3db010dfb99681c7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 28 10:25:16 2014 +1100

       - djm@cvs.openbsd.org 2014/02/27 21:21:25
         [agent-ptrace.sh agent.sh]
         keep return values that are printed in error messages;
         from portable
         (Id sync only)

commit 4f7f1a9a0de24410c30952c7e16d433240422182
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 28 10:24:11 2014 +1100

       - djm@cvs.openbsd.org 2014/02/27 20:04:16
         [login-timeout.sh]
         remove any existing LoginGraceTime from sshd_config before adding
         a specific one for the test back in

commit d705d987c27f68080c8798eeb5262adbdd6b4ffd
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 28 10:23:26 2014 +1100

       - djm@cvs.openbsd.org 2014/01/26 10:49:17
         [scp-ssh-wrapper.sh scp.sh]
         make sure $SCP is tested on the remote end rather than whichever one
         happens to be in $PATH; from portable
         (Id sync only)

commit 624a3ca376e3955a4b9d936c9e899e241b65d357
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 28 10:22:37 2014 +1100

       - djm@cvs.openbsd.org 2014/01/26 10:22:10
         [regress/cert-hostkey.sh]
         automatically generate revoked keys from listed keys rather than
         manually specifying each type; from portable
         (Id sync only)

commit b84392328425e4b9a71f8bde5fe6a4a4c48d3ec4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 28 10:21:26 2014 +1100

       - dtucker@cvs.openbsd.org 2014/01/25 04:35:32
         [regress/Makefile regress/dhgex.sh]
         Add a test for DH GEX sizes

commit 1e2aa3d90472293ea19008f02336d6d68aa05793
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 28 10:19:51 2014 +1100

       - dtucker@cvs.openbsd.org 2014/01/20 00:00:30
         [sftp-chroot.sh]
         append to rather than truncating the log file

commit f483cc16fe7314e24a37aa3a4422b03c013c3213
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 28 10:19:11 2014 +1100

       - dtucker@cvs.openbsd.org 2014/01/19 23:43:02
         [regress/sftp-chroot.sh]
         Don't use -q on sftp as it suppresses logging, instead redirect the
         output to the regress logfile.

commit 6486f16f1c0ebd6f39286f6ab5e08286d90a994a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 28 10:03:52 2014 +1100

     - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Crank version numbers

commit 92cf5adea194140380e6af6ec32751f9ad540794
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 28 10:01:53 2014 +1100

       - djm@cvs.openbsd.org 2014/02/27 22:57:40
         [version.h]
         openssh-6.6

commit fc5d6759aba71eb205b296b5f148010ffc828583
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 28 10:01:28 2014 +1100

       - djm@cvs.openbsd.org 2014/02/27 22:47:07
         [sshd_config.5]
         bz#2184 clarify behaviour of a keyword that appears in multiple
         matching Match blocks; ok dtucker@

commit 172ec7e0af1a5f1d682f6a2dca335c6c186153d5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 28 10:00:57 2014 +1100

       - djm@cvs.openbsd.org 2014/02/27 08:25:09
         [bufbn.c]
         off by one in range check

commit f9a9aaba437c2787e40cf7cc928281950e161678
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 28 10:00:27 2014 +1100

       - djm@cvs.openbsd.org 2014/02/27 00:41:49
         [bufbn.c]
         fix unsigned overflow that could lead to reading a short ssh protocol
         1 bignum value; found by Ben Hawkes; ok deraadt@

commit fb3423b612713d9cde67c8a75f6f51188d6a3de3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 27 10:20:07 2014 +1100

       - markus@cvs.openbsd.org 2014/02/26 21:53:37
         [sshd.c]
         ssh_gssapi_prepare_supported_oids needs GSSAPI

commit 1348129a34f0f7728c34d86c100a32dcc8d1f922
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 27 10:18:32 2014 +1100

       - djm@cvs.openbsd.org 2014/02/26 20:29:29
         [channels.c]
         don't assume that the socks4 username is \0 terminated;
         spotted by Ben Hawkes; ok markus@

commit e6a74aeeacd01d885262ff8e50eb28faee8c8039
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 27 10:17:49 2014 +1100

       - djm@cvs.openbsd.org 2014/02/26 20:28:44
         [auth2-gss.c gss-serv.c ssh-gss.h sshd.c]
         bz#2107 - cache OIDs of supported GSSAPI mechanisms before privsep
         sandboxing, as running this code in the sandbox can cause violations;
         ok markus@

commit 08b57c67f3609340ff703fe2782d7058acf2529e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 27 10:17:13 2014 +1100

       - djm@cvs.openbsd.org 2014/02/26 20:18:37
         [ssh.c]
         bz#2205: avoid early hostname lookups unless canonicalisation is enabled;
         ok dtucker@ markus@

commit 13f97b2286142fd0b8eab94e4ce84fe124eeb752
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 15:57:55 2014 +1100

       - djm@cvs.openbsd.org 2014/02/23 20:11:36
         [readconf.c readconf.h ssh.c ssh_config.5]
         reparse ssh_config and ~/.ssh/config if hostname canonicalisation changes
         the hostname. This allows users to write configurations that always
         refer to canonical hostnames, e.g.
    
         CanonicalizeHostname yes
         CanonicalDomains int.example.org example.org
         CanonicalizeFallbackLocal no
    
         Host *.int.example.org
             Compression off
         Host *.example.org
             User djm
    
         ok markus@

commit bee3a234f3d1ad4244952bcff1b4b7c525330dc2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 15:57:22 2014 +1100

       - djm@cvs.openbsd.org 2014/02/23 20:03:42
         [ssh-ed25519.c]
         check for unsigned overflow; not reachable in OpenSSH but others might
         copy our code...

commit 0628780abe61e7e50cba48cdafb1837f49ff23b2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 15:56:45 2014 +1100

       - djm@cvs.openbsd.org 2014/02/22 01:32:19
         [readconf.c]
         when processing Match blocks, skip 'exec' clauses if previous predicates
         failed to match; ok markus@

commit 0890dc8191bb201eb01c3429feec0300a9d3a930
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 15:56:07 2014 +1100

       - djm@cvs.openbsd.org 2014/02/15 23:05:36
         [channels.c]
         avoid spurious "getsockname failed: Bad file descriptor" errors in ssh -W;
         bz#2200, debian#738692 via Colin Watson; ok dtucker@

commit d3cf67e1117c25d151d0f86396e77ee3a827045a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 15:55:36 2014 +1100

       - djm@cvs.openbsd.org 2014/02/07 06:55:54
         [cipher.c mac.c]
         remove some logging that makes ssh debugging output very verbose;
         ok markus

commit 03ae081aeaa118361c81ece76eb7cc1aaa2b40c5
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Feb 21 09:09:34 2014 -0800

    20140221
     - (tim) [configure.ac]  Fix cut-and-paste error. Patch from Bryan Drewery.

commit 4a20959d2e3c90e9d66897c0b4032c785672d815
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 13 16:38:32 2014 +1100

     - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}]  Add compat
       code for older OpenSSL versions that don't have EVP_MD_CTX_copy_ex.

commit d1a7a9c0fd1ac2e3314cceb2891959fd2cd9eabb
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 7 09:24:33 2014 +1100

       - djm@cvs.openbsd.org 2014/02/06 22:21:01
         [sshconnect.c]
         in ssh_create_socket(), only do the getaddrinfo for BindAddress when
         BindAddress is actually specified. Fixes regression in 6.5 for
         UsePrivilegedPort=yes; patch from Corinna Vinschen

commit 6ce35b6cc4ead1bf98abec34cb2e2d6ca0abb15e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 7 09:24:14 2014 +1100

       - naddy@cvs.openbsd.org 2014/02/05 20:13:25
         [ssh-keygen.1 ssh-keygen.c]
         tweak synopsis: calling ssh-keygen without any arguments is fine; ok jmc@
         while here, fix ordering in usage(); requested by jmc@

commit 6434cb2cfbbf0a46375d2d22f2ff9927feb5e478
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 6 11:17:50 2014 +1100

     - (djm) [sandbox-seccomp-filter.c] Not all Linux architectures define
        __NR_shutdown; some go via the socketcall(2) multiplexer.

commit 8d36f9ac71eff2e9f5770c0518b73d875f270647
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 6 10:44:13 2014 +1100

     - (dtucker) [openbsd-compat/bsd-poll.c] Don't bother checking for non-NULL
       before freeing since free(NULL) is a no-op.  ok djm.

commit a0959da3680b4ce8cf911caf3293a6d90f88eeb7
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 5 10:33:45 2014 +1100

     - (djm) [sandbox-capsicum.c] Don't fatal if Capsicum is offered by
       headers/libc but not supported by the kernel. Patch from Loganaden
       Velvindron @ AfriNIC

commit 9c449bc183b256c84d8f740727b0bc54d247b15e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:38:28 2014 +1100

     - (djm) [regress/setuid-allowed.c] Missing string.h for strerror()

commit bf7e0f03be661b6f5b3bfe325135ce19391f9c4d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:37:50 2014 +1100

     - (djm) [openbsd-compat/Makefile.in] Add missing explicit_bzero.o

commit eb6d870a0ea8661299bb2ea8f013d3ace04e2024
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:26:34 2014 +1100

       - djm@cvs.openbsd.org 2014/02/04 00:24:29
         [ssh.c]
         delay lowercasing of hostname until right before hostname
         canonicalisation to unbreak case-sensitive matching of ssh_config;
         reported by Ike Devolder; ok markus@

commit d56b44d2dfa093883a5c4e91be3f72d99946b170
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:26:04 2014 +1100

       - djm@cvs.openbsd.org 2014/02/04 00:24:29
         [ssh.c]
         delay lowercasing of hostname until right before hostname
         canonicalisation to unbreak case-sensitive matching of ssh_config;
         reported by Ike Devolder; ok markus@

commit db3c595ea74ea9ccd5aa644d7e1f8dc675710731
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:25:45 2014 +1100

       - djm@cvs.openbsd.org 2014/02/02 03:44:31
         [digest-libc.c digest-openssl.c]
         convert memset of potentially-private data to explicit_bzero()

commit aae07e2e2000dd318418fd7fd4597760904cae32
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:20:40 2014 +1100

       - djm@cvs.openbsd.org 2014/02/03 23:28:00
         [ssh-ecdsa.c]
         fix memory leak; ECDSA_SIG_new() allocates 'r' and 's' for us, unlike
         DSA_SIG_new. Reported by Batz Spear; ok markus@

commit a5103f413bde6f31bff85d6e1fd29799c647d765
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:20:14 2014 +1100

       - djm@cvs.openbsd.org 2014/02/02 03:44:32
         [auth1.c auth2-chall.c auth2-passwd.c authfile.c bufaux.c bufbn.c]
         [buffer.c cipher-3des1.c cipher.c clientloop.c gss-serv.c kex.c]
         [kexdhc.c kexdhs.c kexecdhc.c kexgexc.c kexecdhs.c kexgexs.c key.c]
         [monitor.c monitor_wrap.c packet.c readpass.c rsa.c serverloop.c]
         [ssh-add.c ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c]
         [ssh-keygen.c ssh-rsa.c sshconnect.c sshconnect1.c sshconnect2.c]
         [sshd.c]
         convert memset of potentially-private data to explicit_bzero()

commit 1d2c4564265ee827147af246a16f3777741411ed
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:18:20 2014 +1100

       - tedu@cvs.openbsd.org 2014/01/31 16:39:19
         [auth2-chall.c authfd.c authfile.c bufaux.c bufec.c canohost.c]
         [channels.c cipher-chachapoly.c clientloop.c configure.ac hostfile.c]
         [kexc25519.c krl.c monitor.c sandbox-systrace.c session.c]
         [sftp-client.c ssh-keygen.c ssh.c sshconnect2.c sshd.c sshlogin.c]
         [openbsd-compat/explicit_bzero.c openbsd-compat/openbsd-compat.h]
         replace most bzero with explicit_bzero, except a few that cna be memset
         ok djm dtucker

commit 3928de067c286683a95fbdbdb5fdb3c78a0e5efd
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:13:54 2014 +1100

       - djm@cvs.openbsd.org 2014/01/30 22:26:14
         [sandbox-systrace.c]
         allow shutdown(2) syscall in sandbox - it may be called by packet_close()
         from portable
         (Id sync only; change is already in portable)

commit e1e480aee8a9af6cfbe7188667b7b940d6b57f9f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:13:17 2014 +1100

       - jmc@cvs.openbsd.org 2014/01/29 14:04:51
         [sshd_config.5]
         document kbdinteractiveauthentication;
         requested From: Ross L Richardson
    
         dtucker/markus helped explain its workings;

commit 7cc194f70d4a5ec9a82d19422eaf18db4a6624c6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:12:56 2014 +1100

       - djm@cvs.openbsd.org 2014/01/29 06:18:35
         [Makefile.in auth.h auth2-jpake.c auth2.c jpake.c jpake.h monitor.c]
         [monitor.h monitor_wrap.c monitor_wrap.h readconf.c readconf.h]
         [schnorr.c schnorr.h servconf.c servconf.h ssh2.h sshconnect2.c]
         remove experimental, never-enabled JPAKE code; ok markus@

commit b0f26544cf6f4feeb1a4f6db09fca834f5c9867d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:10:01 2014 +1100

       - djm@cvs.openbsd.org 2014/01/29 00:19:26
         [sshd.c]
         use kill(0, ...) instead of killpg(0, ...); on most operating systems
         they are equivalent, but SUSv2 describes the latter as having undefined
         behaviour; from portable; ok dtucker
         (Id sync only; change is already in portable)

commit f8f35bc471500348bb262039fb1fc43175d251b0
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:09:12 2014 +1100

       - jmc@cvs.openbsd.org 2014/01/28 14:13:39
         [ssh-keyscan.1]
         kill some bad Pa;
         From: Jan Stary

commit 0ba85d696ae9daf66002c2e4ab0d6bb111e1a787
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:08:38 2014 +1100

    ignore a few more regress droppings

commit ec93d15170b7a6ddf63fd654bd0f6a752acc19dd
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:07:13 2014 +1100

       - markus@cvs.openbsd.org 2014/01/27 20:13:46
         [digest.c digest-openssl.c digest-libc.c Makefile.in]
         rename digest.c to digest-openssl.c and add libc variant; ok djm@

commit 4a1c7aa640fb97d3472d51b215b6a0ec0fd025c7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:03:36 2014 +1100

       - markus@cvs.openbsd.org 2014/01/27 19:18:54
         [auth-rsa.c cipher.c ssh-agent.c sshconnect1.c sshd.c]
         replace openssl MD5 with our ssh_digest_*; ok djm@

commit 4e8d937af79ce4e253f77ec93489d098b25becc3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 4 11:02:42 2014 +1100

       - markus@cvs.openbsd.org 2014/01/27 18:58:14
         [Makefile.in digest.c digest.h hostfile.c kex.h mac.c hmac.c hmac.h]
         replace openssl HMAC with an implementation based on our ssh_digest_*
         ok and feedback djm@

commit 69d0d09f76bab5aec86fbf78489169f63bd16475
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Jan 31 14:25:18 2014 -0800

     - (tim) [Makefile.in] build regress/setuid-allow.

commit 0eeafcd76b972a3d159f3118227c149a4d7817fe
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 31 14:18:51 2014 +1100

     - (dtucker) [readconf.c] Include <arpa/inet.h> for the hton macros.  Fixes
       build with HP-UX's compiler.  Patch from Kevin Brott.

commit 7e5cec6070673e9f9785ffc749837ada22fbe99f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 31 09:25:34 2014 +1100

     - (djm) [sandbox-seccomp-filter.c sandbox-systrace.c] Allow shutdown(2)
       syscall from sandboxes; it may be called by packet_close.

commit cdb6c90811caa5df2df856be9b0b16db020fe31d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 30 12:50:17 2014 +1100

     - (djm) Release openssh-6.5p1

commit 996ea80b1884b676a901439f1f2681eb6ff68501
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 30 12:49:55 2014 +1100

    trim entries prior to openssh-6.0p1

commit f5bbd3b657b6340551c8a95f74a70857ff8fac79
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 30 11:26:46 2014 +1100

     - (djm) [configure.ac atomicio.c] Kludge around NetBSD offering
       different symbols for 'read' when various compiler flags are
       in use, causing atomicio.c comparisons against it to break and
       read/write operations to hang; ok dtucker

commit c2868192ddc4e1420a50389e18c05db20b0b1f32
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 30 10:21:19 2014 +1100

     - (djm) [configure.ac] Only check for width-specified integer types
       in headers that actually exist. patch from Tom G. Christensen;
       ok dtucker@

commit c161fc90fc86e2035710570238a9e1ca7a68d2a5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 29 21:01:33 2014 +1100

     - (djm) [configure.ac] Fix broken shell test '==' vs '='; patch from
       Tom G. Christensen

commit 6f917ad376481995ab7d29fb53b08ec8d507eb9e
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jan 28 10:26:25 2014 -0800

     - (tim) [regress/agent.sh regress/agent-ptrace.sh] Assign $? to a variable
       when used as an error message inside an if statement so we display the
       correct into. agent.sh patch from Petr Lautrbach.

commit ab16ef4152914d44ce6f76e48167d26d22f66a06
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 28 15:08:12 2014 +1100

     - (djm) [sshd.c] Use kill(0, ...) instead of killpg(0, ...); the
       latter being specified to have undefined behaviour in SUSv3;
       ok dtucker

commit ab0394905884dc6e58c3721211c6b38fb8fc2ca8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 28 15:07:10 2014 +1100

     - (djm) [configure.ac] Search for inet_ntop in libnsl and libresovl;
       ok dtucker

commit 4ab20a82d4d4168d62318923f62382f6ef242fcd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 27 17:35:04 2014 +1100

     - (dtucker) [Makefile.in] Remove trailing backslash which some make
       implementations (eg older Solaris) do not cope with.

commit e7e8b3cfe9f8665faaf0e68b33df5bbb431bd129
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 27 17:32:50 2014 +1100

    Welcome to 2014

commit 5b447c0aac0dd444251e276f6bb3bbbe1c05331c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 26 09:46:53 2014 +1100

     - (djm) [configure.ac] correct AC_DEFINE for previous.

commit 2035b2236d3b1f76c749c642a43e03c85eae76e6
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 26 09:39:53 2014 +1100

      - (djm) [configure.ac sandbox-capsicum.c sandbox-rlimit.c] Disable
        RLIMIT_NOFILE pseudo-sandbox on FreeBSD. In some configurations,
        libc will attempt to open additional file descriptors for crypto
        offload and crash if they cannot be opened.

commit a92ac7410475fbb00383c7402aa954dc0a75ae19
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 26 09:38:03 2014 +1100

       - markus@cvs.openbsd.org 2014/01/25 20:35:37
         [kex.c]
         dh_need needs to be set to max(seclen, blocksize, ivlen, mac_len)
         ok dtucker@, noted by mancha

commit 76eea4ab4e658670ca6e76dd1e6d17f262208b57
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 26 09:37:25 2014 +1100

       - dtucker@cvs.openbsd.org 2014/01/25 10:12:50
         [cipher.c cipher.h kex.c kex.h kexgexc.c]
         Add a special case for the DH group size for 3des-cbc, which has an
         effective strength much lower than the key size.  This causes problems
         with some cryptlib implementations, which don't support group sizes larger
         than 4k but also don't use the largest group size it does support as
         specified in the RFC.  Based on a patch from Petr Lautrbach at Redhat,
         reduced by me with input from Markus.  ok djm@ markus@

commit 603b8f47f1cd9ed95a2017447db8e60ca6704594
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 25 13:16:59 2014 +1100

     - (djm) [configure.ac] autoconf sets finds to 'yes' not '1', so test
       against the correct thing.

commit c96d85376d779b6ac61525b5440010d344d2f23f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 25 13:12:28 2014 +1100

     - (djm) [configure.ac] Do not attempt to use capsicum sandbox unless
       sys/capability.h exists and cap_rights_limit is in libc. Fixes
       build on FreeBSD9x which provides the header but not the libc
       support.

commit f62ecef9939cb3dbeb10602fd705d4db3976d822
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 25 12:34:38 2014 +1100

     - (djm) [configure.ac] Fix detection of capsicum sandbox on FreeBSD

commit b0e0f760b861676a3fe5c40133b270713d5321a9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 24 14:27:04 2014 +1100

     - (djm) [Makefile.in regress/scp-ssh-wrapper.sh regress/scp.sh] Make
       the scp regress test actually test the built scp rather than the one
       in $PATH. ok dtucker@

commit 42a092530159637da9cb7f9e1b5f4679e34a85e6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 23 23:14:39 2014 +1100

     - (dtucker) [configure.ac] NetBSD's (and FreeBSD's) strnvis is gratuitously
       incompatible with OpenBSD's despite post-dating it by more than a decade.
       Declare it as broken, and document FreeBSD's as the same.  ok djm@

commit 617da33c20cb59f9ea6c99c881d92493371ef7b8
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jan 22 19:16:10 2014 -0800

     - (tim) [session.c] Improve error reporting on set_id().

commit 5c2ff5e31f57d303ebb414d84a934c02728fa568
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 22 21:30:12 2014 +1100

     - (djm) [configure.ac aclocal.m4] More tests to detect fallout from
       platform hardening options: include some long long int arithmatic
       to detect missing support functions for -ftrapv in libgcc and
       equivalents, actually test linking when -ftrapv is supplied and
       set either both -pie/-fPIE or neither. feedback and ok dtucker@

commit 852472a54b8a0dc3e53786b313baaa86850a4273
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 22 16:31:18 2014 +1100

     - (djm) [configure.ac] Unless specifically requested, only attempt
       to build Position Independent Executables on gcc >= 4.x; ok dtucker

commit ee87838786cef0194db36ae0675b3e7c4e8ec661
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 22 16:30:15 2014 +1100

     - (djm) [openbsd-compat/setproctitle.c] Don't fail to compile if a
       platform that is expected to use the reuse-argv style setproctitle
       hack surprises us by providing a setproctitle in libc; ok dtucker

commit 5c96a154c7940fa67b1f11c421e390dbbc159f27
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 21 13:10:26 2014 +1100

     - (djm) [aclocal.m4] Flesh out the code run in the OSSH_CHECK_CFLAG_COMPILE
       and OSSH_CHECK_LDFLAG_LINK tests to give them a better chance of
       detecting toolchain-related problems; ok dtucker

commit 9464ba6fb34bb42eb3501ec3c5143662e75674bf
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Jan 20 17:59:28 2014 -0800

     - (tim) [platform.c session.c] Fix bug affecting SVR5 platforms introduced
       with sftp chroot support. Move set_id call after chroot.

commit a6d573caa14d490e6c42fb991bcb5c6860ec704b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 21 12:50:46 2014 +1100

     - (dtucker) [aclocal.m4] Differentiate between compile-time and link-time
       tests in the configure output.  ok djm.

commit 096118dc73ab14810b3c12785c0b5acb01ad6123
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 21 12:48:51 2014 +1100

     - (dtucker) [configure.ac] Make PIE a configure-time option which defaults
       to on platforms where it's known to be reliably detected and off elsewhere.
       Works around platforms such as FreeBSD 9.1 where it does not interop with
       -ftrapv (it seems to work but fails when trying to link ssh).  ok djm@

commit f9df7f6f477792254eab33cdef71a6d66488cb88
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 20 20:07:15 2014 +1100

     - (djm) [regress/cert-hostkey.sh] Fix regress failure on platforms that
        skip one or more key types (e.g. RHEL/CentOS 6.5); ok dtucker@

commit c74e70eb52ccc0082bd5a70b5798bb01c114d138
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 20 13:18:09 2014 +1100

    - (dtucker) [gss-serv-krb5.c] Fall back to krb5_cc_gen_new if the Kerberos
       implementation does not have krb5_cc_new_unique, similar to what we do
       in auth-krb5.c.

commit 3510979e83b6a18ec8773c64c3fa04aa08b2e783
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 20 12:41:53 2014 +1100

       - djm@cvs.openbsd.org 2014/01/20 00:08:48
         [digest.c]
         memleak; found by Loganaden Velvindron @ AfriNIC; ok markus@

commit 7eee358d7a6580479bee5cd7e52810ebfd03e5b2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 19 22:37:02 2014 +1100

       - dtucker@cvs.openbsd.org 2014/01/19 11:21:51
         [addrmatch.c]
         Cast the sizeof to socklen_t so it'll work even if the supplied len is
         negative.  Suggested by and ok djm, ok deraadt.

commit b7e01c09b56ab26e8fac56bbce0fd25e36d12bb0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 19 22:36:13 2014 +1100

       - djm@cvs.openbsd.org 2014/01/19 04:48:08
         [ssh_config.5]
         fix inverted meaning of 'no' and 'yes' for CanonicalizeFallbackLocal

commit 7b1ded04adce42efa25ada7c3a39818d3109b724
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 19 15:30:02 2014 +1100

       - dtucker@cvs.openbsd.org 2014/01/19 04:17:29
         [canohost.c addrmatch.c]
         Cast socklen_t when comparing to size_t and use socklen_t to iterate over
         the ip options, both to prevent signed/unsigned comparison warnings.
         Patch from vinschen at redhat via portable openssh, begrudging ok deraadt.

commit 293ee3c9f0796d99ebb033735f0e315f2e0180bf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 19 15:28:01 2014 +1100

       - dtucker@cvs.openbsd.org 2014/01/18 09:36:26
         [session.c]
         explicitly define USE_PIPES to 1 to prevent redefinition warnings in
         portable on platforms that use pipes for everything.  From redhat @
         redhat.

commit 2aca159d05f9e7880d1d8f1ce49a218840057f53
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 19 15:25:34 2014 +1100

       - dtucker@cvs.openbsd.org 2014/01/17 06:23:24
         [sftp-server.c]
         fix log message statvfs.  ok djm

commit 841f7da89ae8b367bb502d61c5c41916c6e7ae4c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 18 22:12:15 2014 +1100

     - (dtucker) [sandbox-capsicum.c] Correct some error messages and make the
       return value check for cap_enter() consistent with the other uses in
       FreeBSD.  From by Loganaden Velvindron @ AfriNIC via bz#2140.

commit fdce3731660699b2429e93e822f2ccbaccd163ae
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 18 21:12:42 2014 +1100

     - (dtucker) [configure.ac] On Cygwin the getopt variables (like optargs,
       optind) are defined in getopt.h already.  Unfortunately they are defined as
       "declspec(dllimport)" for historical reasons, because the GNU linker didn't
       allow auto-import on PE/COFF targets way back when.  The problem is the
       dllexport attributes collide with the definitions in the various source
       files in OpenSSH, which obviousy define the variables without
       declspec(dllimport).  The least intrusive way to get rid of these warnings
       is to disable warnings for GCC compiler attributes when building on Cygwin.
       Patch from vinschen at redhat.com.

commit 1411c9263f46e1ee49d0d302bf7258ebe69ce827
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 18 21:03:59 2014 +1100

     - (dtucker) [openbsd-compat/bsd-cygwin_util.h] Add missing function
       declarations that stopped being included when we stopped including
       <windows.h> from openbsd-compat/bsd-cygwin_util.h.  Patch from vinschen at
       redhat.com.

commit 89c532d843c95a085777c66365067d64d1937eb9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 18 20:43:49 2014 +1100

     - (dtucker) [uidswap.c] Prevent unused variable warnings on Cygwin.  Patch
       from vinschen at redhat.com

commit 355f861022be7b23d3009fae8f3c9f6f7fc685f7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 18 00:12:38 2014 +1100

     - (dtucker) [defines.h] Move our definitions of uintXX_t types down to after
       they're defined if we have to define them ourselves.  Fixes builds on old
       AIX.

commit a3357661ee1d5d553294f36e4940e8285c7f1332
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 18 00:03:57 2014 +1100

     - (dtucker) [readconf.c] Wrap paths.h inside an ifdef.  Allows building on
       Solaris.

commit 9edcbff46ff01c8d5dee9c1aa843f09e9ad8a80e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 21:54:32 2014 +1100

     - (dtucker) [configure.ac] Have --without-toolchain-hardening not turn off
       stack-protector since that has a separate flag that's been around a while.

commit 6d725687c490d4ba957a1bbc0ba0a2956c09fa69
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 19:17:34 2014 +1100

     - (dtucker) [configure.ac] Also look in inttypes.h for uintXX_t types.

commit 5055699c7f7c7ef21703a443ec73117da392f6ae
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 18:48:22 2014 +1100

     - (dtucker) [openbsd-compat/bsd-statvfs.h] Only start including headers if we
       need them to cut down on the name collisions.

commit a5cf1e220def07290260e4125e74f41ac75cf88d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 18:10:58 2014 +1100

     - (dtucker) [configure.ac openbsd-compat/bsd-statvfs.c
       openbsd-compat/bsd-statvfs.h] Implement enough of statvfs on top of statfs
       to be useful (and for the regression tests to pass) on platforms that
       have statfs and fstatfs.  ok djm@

commit 1357d71d7b6d269969520aaa3e84d312ec971d5b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 18:00:40 2014 +1100

     - (dtucker) Fix typo in #ifndef.

commit d23a91ffb289d3553a58b7a60cec39fba9f0f506
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 17:32:30 2014 +1100

     - (dtucker) [configure.ac digest.c openbsd-compat/openssl-compat.c
       openbsd-compat/openssl-compat.h]  Add compatibility layer for older
       openssl versions.  ok djm@

commit 868ea1ea1c1bfdbee5dbad78f81999c5983ecf31
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 17 16:47:04 2014 +1100

     - (djm) [Makefile.in configure.ac sandbox-capsicum.c sandbox-darwin.c]
       [sandbox-null.c sandbox-rlimit.c sandbox-seccomp-filter.c]
       [sandbox-systrace.c ssh-sandbox.h sshd.c] Support preauth sandboxing
       using the Capsicum API introduced in FreeBSD 10. Patch by Dag-Erling
       Smorgrav, updated by Loganaden Velvindron @ AfriNIC; ok dtucker@

commit a9d186a8b50d18869a10e9203abf71c83ddb1f79
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 16:30:49 2014 +1100

       - dtucker@cvs.openbsd.org 2014/01/17 05:26:41
         [digest.c]
         remove unused includes.  ok djm@

commit 5f1c57a7a7eb39c0e4fee3367712337dbcaef024
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 16:29:45 2014 +1100

       - djm@cvs.openbsd.org 2014/01/17 00:21:06
         [sftp-client.c]
         signed/unsigned comparison warning fix; from portable (Id sync only)

commit c548722361d89fb12c108528f96b306a26477b18
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 15:12:16 2014 +1100

     - (dtucker) [configure.ac] Split AC_CHECK_FUNCS for OpenSSL functions into
       separate lines and alphabetize for easier diffing of changes.

commit acad351a5b1c37de9130c9c1710445cc45a7f6b9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 14:20:05 2014 +1100

     - (dtucker) [defines.h] Add typedefs for uintXX_t types for platforms that
       don't have them.

commit c3ed065ce8417aaa46490836648c173a5010f226
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 14:18:45 2014 +1100

     - (dtucker) [openbsd-compat/bcrypt_pbkdf.c] Wrap stdlib.h include inside
       #ifdef HAVE_STDINT_H.

commit f45f78ae437062c7d9506c5f475b7215f486be44
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 12:43:43 2014 +1100

     - (dtucker) [blocks.c fe25519.c ge25519.c hash.c sc25519.c verify.c] Include
       includes.h to pull in all of the compatibility stuff.

commit 99df369d0340caac145d57f700d830147ff18b87
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 12:42:17 2014 +1100

     - (dtucker) [poly1305.c] Wrap stdlib.h include inside #ifdef HAVE_STDINT_H.

commit ac413b62ea1957e80c711acbe0c11b908273fc01
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 12:31:33 2014 +1100

     - (dtucker) [crypto_api.h] Wrap stdlib.h include inside #ifdef HAVE_STDINT_H.

commit 1c4a011e9c939e74815346a560843e1862c300b8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 12:23:23 2014 +1100

     - (dtucker) [loginrec.c] Cast to the types specfied in the format
        specification to prevent warnings.

commit c3d483f9a8275be1113535a1e0d0e384f605f3c4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 17 11:20:26 2014 +1100

     - (djm) [sftp-client.c] signed/unsigned comparison fix

commit fd994379dd972417d0491767f7cd9b5bf23f4975
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 17 09:53:24 2014 +1100

     - (dtucker) [aclocal.m4 configure.ac] Add some additional compiler/toolchain
       hardening flags including -fstack-protector-strong.  These default to on
       if the toolchain supports them, but there is a configure-time knob
       (--without-hardening) to disable them if necessary.  ok djm@

commit 366224d21768ee8ec28cfbcc5fbade1b32582d58
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 16 18:51:44 2014 +1100

     - (djm) [README] update release notes URL.

commit 2ae77e64f8fa82cbf25c9755e8e847709b978b40
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 16 18:51:07 2014 +1100

     - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Crank RPM spec version numbers.

commit 0fa29e6d777c73a1b4ddd3b996b06ee20022ae8a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 16 18:42:31 2014 +1100

       - djm@cvs.openbsd.org 2014/01/16 07:32:00
         [version.h]
         openssh-6.5

commit 52c371cd6d2598cc73d4e633811b3012119c47e2
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 16 18:42:10 2014 +1100

       - djm@cvs.openbsd.org 2014/01/16 07:31:09
         [sftp-client.c]
         needless and incorrect cast to size_t can break resumption of
         large download; patch from tobias@

commit 91b580e4bec55118bf96ab3cdbe5a50839e75d0a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 12 19:21:22 2014 +1100

       - djm@cvs.openbsd.org 2014/01/12 08:13:13
         [bufaux.c buffer.h kex.c kex.h kexc25519.c kexc25519c.c kexc25519s.c]
         [kexdhc.c kexdhs.c kexecdhc.c kexecdhs.c kexgexc.c kexgexs.c]
         avoid use of OpenSSL BIGNUM type and functions for KEX with
         Curve25519 by adding a buffer_put_bignum2_from_string() that stores
         a string using the bignum encoding rules. Will make it easier to
         build a reduced-feature OpenSSH without OpenSSL in the future;
         ok markus@

commit af5d4481f4c7c8c3c746e68b961bb85ef907800e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 12 19:20:47 2014 +1100

       - djm@cvs.openbsd.org 2014/01/10 05:59:19
         [sshd_config]
         the /etc/ssh/ssh_host_ed25519_key is loaded by default too

commit 58cd63bc63038acddfb4051ed14e11179d8f4941
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 10 10:59:24 2014 +1100

       - djm@cvs.openbsd.org 2014/01/09 23:26:48
         [sshconnect.c sshd.c]
         ban clients/servers that suffer from SSH_BUG_DERIVEKEY, they are ancient,
         deranged and might make some attacks on KEX easier; ok markus@

commit b3051d01e505c9c2dc00faab472a0d06fa6b0e65
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 10 10:58:53 2014 +1100

       - djm@cvs.openbsd.org 2014/01/09 23:20:00
         [digest.c digest.h hostfile.c kex.c kex.h kexc25519.c kexc25519c.c]
         [kexc25519s.c kexdh.c kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c]
         [kexgexs.c key.c key.h roaming_client.c roaming_common.c schnorr.c]
         [schnorr.h ssh-dss.c ssh-ecdsa.c ssh-rsa.c sshconnect2.c]
         Introduce digest API and use it to perform all hashing operations
         rather than calling OpenSSL EVP_Digest* directly. Will make it easier
         to build a reduced-feature OpenSSH without OpenSSL in future;
         feedback, ok markus@

commit e00e413dd16eb747fb2c15a099971d91c13cf70f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 10 10:40:45 2014 +1100

       - guenther@cvs.openbsd.org 2014/01/09 03:26:00
         [sftp-common.c]
         When formating the time for "ls -l"-style output, show dates in the future
         with the year, and rearrange a comparison to avoid a potentional signed
         arithmetic overflow that would give the wrong result.
    
         ok djm@

commit 3e49853650448883685cfa32fa382d0ba6d51d48
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 10 10:37:05 2014 +1100

       - tedu@cvs.openbsd.org 2014/01/04 17:50:55
         [mac.c monitor_mm.c monitor_mm.h xmalloc.c]
         use standard types and formats for size_t like variables. ok dtucker

commit a9c1e500ef609795cbc662848edb1a1dca279c81
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 8 16:13:12 2014 +1100

     - (djm) [regress/.cvsignore] Ignore regress test droppings; ok dtucker@

commit 324541e5264e1489ca0babfaf2b39612eb80dfb3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 31 12:25:40 2013 +1100

       - djm@cvs.openbsd.org 2013/12/30 23:52:28
         [auth2-hostbased.c auth2-pubkey.c compat.c compat.h ssh-rsa.c]
         [sshconnect.c sshconnect2.c sshd.c]
         refuse RSA keys from old proprietary clients/servers that use the
         obsolete RSA+MD5 signature scheme. it will still be possible to connect
         with these clients/servers but only DSA keys will be accepted, and we'll
         deprecate them entirely in a future release. ok markus@

commit 9f4c8e797ea002a883307ca906f1f1f815010e78
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:57:46 2013 +1100

     - (djm) [regress/Makefile] Add some generated files for cleaning

commit 106bf1ca3c7a5fdc34f9fd7a1fe651ca53085bc5
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:54:03 2013 +1100

       - djm@cvs.openbsd.org 2013/12/29 05:57:02
         [sshconnect.c]
         when showing other hostkeys, don't forget Ed25519 keys

commit 0fa47cfb32c239117632cab41e4db7d3e6de5e91
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:53:39 2013 +1100

       - djm@cvs.openbsd.org 2013/12/29 05:42:16
         [ssh.c]
         don't forget to load Ed25519 certs too

commit b9a95490daa04cc307589897f95bfaff324ad2c9
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:50:15 2013 +1100

       - djm@cvs.openbsd.org 2013/12/29 04:35:50
         [authfile.c]
         don't refuse to load Ed25519 certificates

commit f72cdde6e6fabc51d2a62f4e75b8b926d9d7ee89
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:49:55 2013 +1100

       - djm@cvs.openbsd.org 2013/12/29 04:29:25
         [authfd.c]
         allow deletion of ed25519 keys from the agent

commit 29ace1cb68cc378a464c72c0fd67aa5f9acd6b5b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:49:31 2013 +1100

       - djm@cvs.openbsd.org 2013/12/29 04:20:04
         [key.c]
         to make sure we don't omit any key types as valid CA keys again,
         factor the valid key type check into a key_type_is_valid_ca()
         function

commit 9de4fcdc5a9cff48d49a3e2f6194d3fb2d7ae34d
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:49:13 2013 +1100

       - djm@cvs.openbsd.org 2013/12/29 02:49:52
         [key.c]
         correct comment for key_drop_cert()

commit 5baeacf8a80f054af40731c6f92435f9164b8e02
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:48:55 2013 +1100

       - djm@cvs.openbsd.org 2013/12/29 02:37:04
         [key.c]
         correct comment for key_to_certified()

commit 83f2fe26cb19330712c952eddbd3c0b621674adc
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:48:38 2013 +1100

       - djm@cvs.openbsd.org 2013/12/29 02:28:10
         [key.c]
         allow ed25519 keys to appear as certificate authorities

commit 06122e9a74bb488b0fe0a8f64e1135de870f9cc0
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:48:15 2013 +1100

       - djm@cvs.openbsd.org 2013/12/27 22:37:18
         [ssh-rsa.c]
         correct comment

commit 3e19295c3a253c8dc8660cf45baad7f45fccb969
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:47:50 2013 +1100

       - djm@cvs.openbsd.org 2013/12/27 22:30:17
         [ssh-dss.c ssh-ecdsa.c ssh-rsa.c]
         make the original RSA and DSA signing/verification code look more like
         the ECDSA/Ed25519 ones: use key_type_plain() when checking the key type
         rather than tediously listing all variants, use __func__ for debug/
         error messages

commit 137977180be6254639e2c90245763e6965f8d815
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:47:14 2013 +1100

       - tedu@cvs.openbsd.org 2013/12/21 07:10:47
         [ssh-keygen.1]
         small typo

commit 339a48fe7ffb3186d22bbaa9efbbc3a053e602fd
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:46:49 2013 +1100

       - djm@cvs.openbsd.org 2013/12/19 22:57:13
         [poly1305.c poly1305.h]
         use full name for author, with his permission

commit 0b36c83148976c7c8268f4f41497359e2fb26251
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:45:51 2013 +1100

       - djm@cvs.openbsd.org 2013/12/19 01:19:41
         [ssh-agent.c]
         bz#2186: don't crash (NULL deref) when deleting PKCS#11 keys from an agent
         that has a mix of normal and PKCS#11 keys; fix from jay AT slushpupie.com;
         ok dtucker

commit 4def184e9b6c36be6d965a9705632fc4c0c2a8af
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:45:26 2013 +1100

       - djm@cvs.openbsd.org 2013/12/19 01:04:36
         [channels.c]
         bz#2147: fix multiple remote forwardings with dynamically assigned
         listen ports. In the s->c message to open the channel we were sending
         zero (the magic number to request a dynamic port) instead of the actual
         listen port. The client therefore had no way of discriminating between
         them.
    
         Diagnosis and fix by ronf AT timeheart.net

commit bf25d114e23a803f8feca8926281b1aaedb6191b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:44:56 2013 +1100

       - djm@cvs.openbsd.org 2013/12/19 00:27:57
         [auth-options.c]
         simplify freeing of source-address certificate restriction

commit bb3dafe7024a5b4e851252e65ee35d45b965e4a8
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:44:29 2013 +1100

       - dtucker@cvs.openbsd.org 2013/12/19 00:19:12
         [serverloop.c]
         Cast client_alive_interval to u_int64_t before assinging to
         max_time_milliseconds to avoid potential integer overflow in the timeout.
         bz#2170, patch from Loganaden Velvindron, ok djm@

commit ef275ead3dcadde4db1efe7a0aa02b5e618ed40c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:44:07 2013 +1100

       - djm@cvs.openbsd.org 2013/12/19 00:10:30
         [ssh-add.c]
         skip requesting smartcard PIN when removing keys from agent; bz#2187
         patch from jay AT slushpupie.com; ok dtucker

commit 7d97fd9a1cae778c3eacf16e09f5da3689d616c6
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 29 17:40:18 2013 +1100

     - (djm) [loginrec.c] Check for username truncation when looking up lastlog
       entries

commit 77244afe3b6d013b485e0952eaab89b9db83380f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Dec 21 17:02:39 2013 +1100

    20131221
     - (dtucker) [regress/keytype.sh] Actually test ecdsa key types.

commit 53f8e784dc431a82d31c9b0e95b144507f9330e9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Dec 19 11:31:44 2013 +1100

     - (dtucker) [auth-pam.c] bz#2163: check return value from pam_get_item().
       Patch from Loganaden Velvindron.

commit 1fcec9d4f265e38af248c4c845986ca8c174bd68
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Dec 19 11:00:12 2013 +1100

     - (dtucker) [configure.ac] bz#2178: Don't try to use BSM on Solaris versions
       greater than 11 either rather than just 11.  Patch from Tomas Kuthan.

commit 6674eb9683afd1ea4eb35670b5e66815543a759e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 18 17:50:39 2013 +1100

       - markus@cvs.openbsd.org 2013/12/17 10:36:38
         [crypto_api.h]
         I've assempled the header file by cut&pasting from generated headers
         and the source files.

commit d58a5964426ee014384d67d775d16712e93057f3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 18 17:50:13 2013 +1100

       - djm@cvs.openbsd.org 2013/12/15 21:42:35
         [cipher-chachapoly.c]
         add some comments and constify a constant

commit 059321d19af24d87420de3193f79dfab23556078
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 18 17:49:48 2013 +1100

       - pascal@cvs.openbsd.org 2013/12/15 18:17:26
         [ssh-add.c]
         Make ssh-add also add .ssh/id_ed25519; fixes lie in manual page.
         ok markus@

commit 155b5a5bf158767f989215479ded2a57f331e1c6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 18 17:48:32 2013 +1100

       - markus@cvs.openbsd.org 2013/12/09 11:08:17
         [crypto_api.h]
         remove unused defines

commit 8a56dc2b6b48b05590810e7f4c3567508410000c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 18 17:48:11 2013 +1100

       - markus@cvs.openbsd.org 2013/12/09 11:03:45
         [blocks.c ed25519.c fe25519.c fe25519.h ge25519.c ge25519.h]
         [ge25519_base.data hash.c sc25519.c sc25519.h verify.c]
         Add Authors for the public domain ed25519/nacl code.
         see also http://nacl.cr.yp.to/features.html
            All of the NaCl software is in the public domain.
         and http://ed25519.cr.yp.to/software.html
            The Ed25519 software is in the public domain.

commit 6575c3acf31fca117352f31f37b16ae46e664837
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 18 17:47:02 2013 +1100

       - dtucker@cvs.openbsd.org 2013/12/08 09:53:27
         [sshd_config.5]
         Use a literal for the default value of KEXAlgorithms.  ok deraadt jmc

commit 8ba0ead6985ea14999265136b14ffd5aeec516f9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 18 17:46:27 2013 +1100

       - naddy@cvs.openbsd.org 2013/12/07 11:58:46
         [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8 ssh.1]
         [ssh_config.5 sshd.8 sshd_config.5]
         add missing mentions of ed25519; ok djm@

commit 4f752cf71cf44bf4bc777541156c2bf56daf9ce9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 18 17:45:35 2013 +1100

       - djm@cvs.openbsd.org 2013/12/07 08:08:26
         [ssh-keygen.1]
         document -a and -o wrt new key format

commit 6d6fcd14e23a9053198342bb379815b15e504084
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 8 15:53:28 2013 +1100

     - (djm) [Makefile.in regress/Makefile regress/agent-ptrace.sh]
       [regress/setuid-allowed.c] Check that ssh-agent is not on a no-setuid
       filesystem before running agent-ptrace.sh; ok dtucker

commit 7e6e42fb532c7dafd7078ef5e9e2d3e47fcf6752
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 8 08:23:08 2013 +1100

     - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna
        Vinschen

commit da3ca351b49d52ae85db2e3998265dc3c6617068
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 21:43:46 2013 +1100

     - (djm) [Makefile.in] PATHSUBS and keygen bits for Ed25519; from
        Loganaden Velvindron @ AfriNIC in bz#2179

commit eb401585bb8336cbf81fe4fc58eb9f7cac3ab874
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 17:07:15 2013 +1100

     - (djm) [regress/cert-hostkey.sh] Fix merge botch

commit f54542af3ad07532188b10136ae302314ec69ed6
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 16:32:44 2013 +1100

       - markus@cvs.openbsd.org 2013/12/06 13:52:46
         [regress/Makefile regress/agent.sh regress/cert-hostkey.sh]
         [regress/cert-userkey.sh regress/keytype.sh]
         test ed25519 support; from djm@

commit f104da263de995f66b6861b4f3368264ee483d7f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 12:37:53 2013 +1100

     - (djm) [ed25519.c ssh-ed25519.c openbsd-compat/Makefile.in]
        [openbsd-compat/bcrypt_pbkdf.c] Make ed25519/new key format compile on
           Linux

commit 1ff130dac9b7aea0628f4ad30683431fe35e0020
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 11:51:51 2013 +1100

     - [configure.ac openbsd-compat/Makefile.in openbsd-compat/bcrypt_pbkdf.c]
       [openbsd-compat/blf.h openbsd-compat/blowfish.c]
       [openbsd-compat/openbsd-compat.h] Start at supporting bcrypt_pbkdf in
       portable.

commit 4260828a2958ebe8c96f66d8301dac53f4cde556
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 11:38:03 2013 +1100

     - [authfile.c] Conditionalise inclusion of util.h

commit a913442bac8a26fd296a3add51293f8f6f9b3b4c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 11:35:36 2013 +1100

     - [Makefile.in] Add ed25519 sources

commit ca570a519cb846da61d002c7f46fa92e39c83e45
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 11:29:09 2013 +1100

       - djm@cvs.openbsd.org 2013/12/07 00:19:15
         [key.c]
         set k->cert = NULL after freeing it

commit 3cccc0e155229a2f2d86b6df40bd4559b4f960ff
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 11:27:47 2013 +1100

     - [blocks.c ed25519.c fe25519.c fe25519.h ge25519.c ge25519.h]
       [ge25519_base.data hash.c sc25519.c sc25519.h verify.c] Fix RCS idents

commit a7827c11b3f0380b7e593664bd62013ff9c131db
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 11:24:30 2013 +1100

       - jmc@cvs.openbsd.org 2013/12/06 15:29:07
         [sshd.8]
         missing comma;

commit 5be9d9e3cbd9c66f24745d25bf2e809c1d158ee0
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 11:24:01 2013 +1100

       - markus@cvs.openbsd.org 2013/12/06 13:39:49
         [authfd.c authfile.c key.c key.h myproposal.h pathnames.h readconf.c]
         [servconf.c ssh-agent.c ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c]
         [ssh-keysign.c ssh.c ssh_config.5 sshd.8 sshd.c verify.c ssh-ed25519.c]
         [sc25519.h sc25519.c hash.c ge25519_base.data ge25519.h ge25519.c]
         [fe25519.h fe25519.c ed25519.c crypto_api.h blocks.c]
         support ed25519 keys (hostkeys and user identities) using the public
         domain ed25519 reference code from SUPERCOP, see
         http://ed25519.cr.yp.to/software.html
         feedback, help & ok djm@

commit bcd00abd8451f36142ae2ee10cc657202149201e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 10:41:55 2013 +1100

       - markus@cvs.openbsd.org 2013/12/06 13:34:54
         [authfile.c authfile.h cipher.c cipher.h key.c packet.c ssh-agent.c]
         [ssh-keygen.c PROTOCOL.key] new private key format, bcrypt as KDF by
         default; details in PROTOCOL.key; feedback and lots help from djm;
         ok djm@

commit f0e9060d236c0e38bec2fa1c6579fb0a2ea6458d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 10:40:26 2013 +1100

       - markus@cvs.openbsd.org 2013/12/06 13:30:08
         [authfd.c key.c key.h ssh-agent.c]
         move private key (de)serialization to key.c; ok djm

commit 0f8536da23a6ef26e6495177c0d8a4242b710289
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 10:31:37 2013 +1100

       - djm@cvs.openbsd.org 2013/12/06 03:40:51
         [ssh-keygen.c]
         remove duplicated character ('g') in getopt() string;
         document the (few) remaining option characters so we don't have to
         rummage next time.

commit 393920745fd328d3fe07f739a3cf7e1e6db45b60
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 7 10:31:08 2013 +1100

       - djm@cvs.openbsd.org 2013/12/05 22:59:45
         [sftp-client.c]
         fix memory leak in error path in do_readdir(); pointed out by
         Loganaden Velvindron @ AfriNIC in bz#2163

commit 534b2ccadea5e5e9a8b27226e6faac3ed5552e97
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 14:07:27 2013 +1100

       - djm@cvs.openbsd.org 2013/12/05 01:16:41
         [servconf.c servconf.h]
         bz#2161 - fix AuthorizedKeysCommand inside a Match block and
         rearrange things so the same error is harder to make next time;
         with and ok dtucker@

commit 8369c8e61a3408ec6bb75755fad4ffce29b5fdbe
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Dec 5 11:00:16 2013 +1100

     - (dtucker) [configure.ac] bz#2173: use pkg-config --libs to include correct
       -L location for libedit.  Patch from Serge van den Boom.

commit 9275df3e0a2a3bc3897f7d664ea86a425c8a092d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 10:26:32 2013 +1100

       - djm@cvs.openbsd.org 2013/12/04 04:20:01
         [sftp-client.c]
         bz#2171: don't leak local_fd on error; from Loganaden Velvindron @
         AfriNIC

commit 960f6a2b5254e4da082d8aa3700302ed12dc769a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 10:26:14 2013 +1100

       - djm@cvs.openbsd.org 2013/12/02 03:13:14
         [cipher.c]
         correct bzero of chacha20+poly1305 key context. bz#2177 from
         Loganaden Velvindron @ AfriNIC
    
         Also make it a memset for consistency with the rest of cipher.c

commit f7e8a8796d661c9d6692ab837e1effd4f5ada1c2
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 10:25:51 2013 +1100

       - djm@cvs.openbsd.org 2013/12/02 03:09:22
         [key.c]
         make key_to_blob() return a NULL blob on failure; part of
         bz#2175 from Loganaden Velvindron @ AfriNIC

commit f1e44ea9d9a6d4c1a95a0024132e603bd1778c9c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 10:23:21 2013 +1100

       - djm@cvs.openbsd.org 2013/12/02 02:56:17
         [ssh-pkcs11-helper.c]
         use-after-free; bz#2175 patch from Loganaden Velvindron @ AfriNIC

commit 114e540b15d57618f9ebf624264298f80bbd8c77
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 10:22:57 2013 +1100

       - djm@cvs.openbsd.org 2013/12/02 02:50:27
         [PROTOCOL.chacha20poly1305]
         typo; from Jon Cave

commit e4870c090629e32f2cb649dc16d575eeb693f4a8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 10:22:39 2013 +1100

       - djm@cvs.openbsd.org 2013/12/01 23:19:05
         [PROTOCOL]
         mention curve25519-sha256@libssh.org key exchange algorithm

commit 1d2f8804a6d33a4e908b876b2e1266b8260ec76b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 10:22:03 2013 +1100

       - deraadt@cvs.openbsd.org 2013/11/26 19:15:09
         [pkcs11.h]
         cleanup 1 << 31 idioms.  Resurrection of this issue pointed out by
         Eitan Adler ok markus for ssh, implies same change in kerberosV

commit bdb352a54f82df94a548e3874b22f2d6ae90328d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 10:20:52 2013 +1100

       - jmc@cvs.openbsd.org 2013/11/26 12:14:54
         [ssh.1 ssh.c]
         - put -Q in the right place
         - Ar was a poor choice for the arguments to -Q. i've chosen an
           admittedly equally poor Cm, at least consistent with the rest
           of the docs. also no need for multiple instances
         - zap a now redundant Nm
         - usage() sync

commit d937dc084a087090f1cf5395822c3ac958d33759
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 10:19:54 2013 +1100

       - deraadt@cvs.openbsd.org 2013/11/25 18:04:21
         [ssh.1 ssh.c]
         improve -Q usage and such.  One usage change is that the option is now
         case-sensitive
         ok dtucker markus djm

commit dec0393f7ee8aabc7d9d0fc2c5fddb4bc649112e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 10:18:43 2013 +1100

       - jmc@cvs.openbsd.org 2013/11/21 08:05:09
         [ssh_config.5 sshd_config.5]
         no need for .Pp before displays;

commit 8a073cf57940aabf85e49799f89f5d5e9b072c1b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 21 14:26:18 2013 +1100

       - djm@cvs.openbsd.org 2013/11/21 03:18:51
         [regress/cipher-speed.sh regress/integrity.sh regress/rekey.sh]
         [regress/try-ciphers.sh]
         use new "ssh -Q cipher-auth" query to obtain lists of authenticated
         encryption ciphers instead of specifying them manually; ensures that
         the new chacha20poly1305@openssh.com mode is tested;
    
         ok markus@ and naddy@ as part of the diff to add
         chacha20poly1305@openssh.com

commit ea61b2179f63d48968dd2c9617621002bb658bfe
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 21 14:25:15 2013 +1100

       - djm@cvs.openbsd.org 2013/11/21 03:16:47
         [regress/modpipe.c]
         use unsigned long long instead of u_int64_t here to avoid warnings
         on some systems portable OpenSSH is built on.

commit 36aba25b0409d2db6afc84d54bc47a2532d38424
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 21 14:24:42 2013 +1100

       - djm@cvs.openbsd.org 2013/11/21 03:15:46
         [regress/krl.sh]
         add some reminders for additional tests that I'd like to implement

commit fa7a20bc289f09b334808d988746bc260a2f60c9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 21 14:24:08 2013 +1100

       - naddy@cvs.openbsd.org 2013/11/18 05:09:32
         [regress/forward-control.sh]
         bump timeout to 10 seconds to allow slow machines (e.g. Alpha PC164)
         to successfully run this; ok djm@
         (ID sync only; our timeouts are already longer)

commit 0fde8acdad78a4d20cadae974376cc0165f645ee
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 21 14:12:23 2013 +1100

       - djm@cvs.openbsd.org 2013/11/21 00:45:44
         [Makefile.in PROTOCOL PROTOCOL.chacha20poly1305 authfile.c chacha.c]
         [chacha.h cipher-chachapoly.c cipher-chachapoly.h cipher.c cipher.h]
         [dh.c myproposal.h packet.c poly1305.c poly1305.h servconf.c ssh.1]
         [ssh.c ssh_config.5 sshd_config.5] Add a new protocol 2 transport
         cipher "chacha20-poly1305@openssh.com" that combines Daniel
         Bernstein's ChaCha20 stream cipher and Poly1305 MAC to build an
         authenticated encryption mode.
    
         Inspired by and similar to Adam Langley's proposal for TLS:
         http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-03
         but differs in layout used for the MAC calculation and the use of a
         second ChaCha20 instance to separately encrypt packet lengths.
         Details are in the PROTOCOL.chacha20poly1305 file.
    
         Feedback markus@, naddy@; manpage bits Loganden Velvindron @ AfriNIC
         ok markus@ naddy@

commit fdb2306acdc3eb2bc46b6dfdaaf6005c650af22a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 21 13:57:15 2013 +1100

       - deraadt@cvs.openbsd.org 2013/11/20 20:54:10
         [canohost.c clientloop.c match.c readconf.c sftp.c]
         unsigned casts for ctype macros where neccessary
         ok guenther millert markus

commit e00167307e4d3692695441e9bd712f25950cb894
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 21 13:56:49 2013 +1100

       - deraadt@cvs.openbsd.org 2013/11/20 20:53:10
         [scp.c]
         unsigned casts for ctype macros where neccessary
         ok guenther millert markus

commit 23e00aa6ba9eee0e0c218f2026bf405ad4625832
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 21 13:56:28 2013 +1100

       - djm@cvs.openbsd.org 2013/11/20 02:19:01
         [sshd.c]
         delay closure of in/out fds until after "Bad protocol version
         identification..." message, as get_remote_ipaddr/get_remote_port
         require them open.

commit 867e6934be6521f87f04a5ab86702e2d1b314245
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 21 13:56:06 2013 +1100

       - markus@cvs.openbsd.org 2013/11/13 13:48:20
         [ssh-pkcs11.c]
         add missing braces found by pedro

commit 0600c7020f4fe68a780bd7cf21ff541a8d4b568a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 21 13:55:43 2013 +1100

       - dtucker@cvs.openbsd.org 2013/11/08 11:15:19
         [bufaux.c bufbn.c buffer.c sftp-client.c sftp-common.c sftp-glob.c]
         [uidswap.c] Include stdlib.h for free() as per the man page.

commit b6a75b0b93b8faa6f79c3a395ab6c71f3f880b80
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Nov 10 20:25:22 2013 +1100

     - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by
       querying the ones that are compiled in.

commit 2c89430119367eb1bc96ea5ee55de83357e4c926
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Nov 10 12:38:42 2013 +1100

     - (dtucker) [key.c] Check for the correct defines for NID_secp521r1.

commit dd5264db5f641dbd03186f9e5e83e4b14b3d0003
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 9 22:32:51 2013 +1100

     - (dtucker) [configure.ac] Add missing "test".

commit 95cb2d4eb08117be061f3ff076adef3e9a5372c3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 9 22:02:31 2013 +1100

     - (dtucker) [configure.ac] Fix brackets in NID_secp521r1 test.

commit 37bcef51b3d9d496caecea6394814d2f49a1357f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 9 18:39:25 2013 +1100

     - (dtucker) [configure.ac kex.c key.c myproposal.h] Test for the presence of
       NID_X9_62_prime256v1, NID_secp384r1 and NID_secp521r1 and test that the
       latter actually works before using it.  Fedora (at least) has NID_secp521r1
       that doesn't work (see https://bugzilla.redhat.com/show_bug.cgi?id=1021897).

commit 6e2fe81f926d995bae4be4a6b5b3c88c1c525187
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 9 16:55:03 2013 +1100

       - dtucker@cvs.openbsd.org 2013/11/09 05:41:34
         [regress/test-exec.sh regress/rekey.sh]
         Use smaller test data files to speed up tests.  Grow test datafiles
         where necessary for a specific test.

commit aff7ef1bb8b7c1eeb1f4812129091c5adbf51848
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 9 00:19:22 2013 +1100

     - (dtucker) [contrib/cygwin/ssh-host-config] Simplify host key generation:
       rather than testing and generating each key, call ssh-keygen -A.
       Patch from vinschen at redhat.com.

commit 882abfd3fb3c98cfe70b4fc79224770468b570a5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 9 00:17:41 2013 +1100

     - (dtucker) [Makefile.in configure.ac] Set MALLOC_OPTIONS per platform
       and pass in TEST_ENV.  Unknown options cause stderr to get polluted
       and the stderr-data test to fail.

commit 8c333ec23bdf7da917aa20ac6803a2cdd79182c5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 8 21:12:58 2013 +1100

     - (dtucker) [openbsd-compat/bsd-poll.c] Add headers to prevent compile
       warnings.

commit d94240b2f6b376b6e9de187e4a0cd4b89dfc48cb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 8 21:10:04 2013 +1100

     - (dtucker) [myproposal.h] Conditionally enable CURVE25519_SHA256.

commit 1c8ce34909886288a3932dce770deec5449f7bb5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 8 19:50:32 2013 +1100

     - (dtucker) [kex.c] Only enable CURVE25519_SHA256 if we actually have
       EVP_sha256.

commit ccdb9bec46bcc88549b26a94aa0bae2b9f51031c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 8 18:54:38 2013 +1100

     - (dtucker) [openbsd-compat/openbsd-compat.h] Add null implementation of
       arc4random_stir for platforms that have arc4random but don't have
       arc4random_stir (right now this is only OpenBSD -current).

commit 3420a50169b52cc8d2775d51316f9f866c73398f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 8 16:48:13 2013 +1100

     - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Update version numbers following release.

commit 3ac4a234df842fd8c94d9cb0ad198e1fe84b895b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 8 12:39:49 2013 +1100

       - djm@cvs.openbsd.org 2013/11/08 01:38:11
         [version.h]
         openssh-6.4

commit 6c81fee693038de7d4a5559043350391db2a2761
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 8 12:19:55 2013 +1100

       - djm@cvs.openbsd.org 2013/11/08 00:39:15
         [auth-options.c auth2-chall.c authfd.c channels.c cipher-3des1.c]
         [clientloop.c gss-genr.c monitor_mm.c packet.c schnorr.c umac.c]
         [sftp-client.c sftp-glob.c]
         use calloc for all structure allocations; from markus@

commit 690d989008e18af3603a5e03f1276c9bad090370
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 8 12:16:49 2013 +1100

       - dtucker@cvs.openbsd.org 2013/11/07 11:58:27
         [cipher.c cipher.h kex.c kex.h mac.c mac.h servconf.c ssh.c]
         Output the effective values of Ciphers, MACs and KexAlgorithms when
         the default has not been overridden.  ok markus@

commit 08998c5fb9c7c1d248caa73b76e02ca0482e6d85
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 8 12:11:46 2013 +1100

        - dtucker@cvs.openbsd.org 2013/11/08 01:06:14
          [regress/rekey.sh]
          Rekey less frequently during tests to speed them up

commit 4bf7e50e533aa956366df7402c132f202e841a48
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 7 22:33:48 2013 +1100

     - (dtucker) [Makefile.in configure.ac] Remove TEST_SSH_SHA256 environment
       variable.  It's no longer used now that we get the supported MACs from
       ssh -Q.

commit 6e9d6f411288374d1dee4b7debbfa90bc7e73035
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 7 15:32:37 2013 +1100

       - dtucker@cvs.openbsd.org 2013/11/07 04:26:56
         [regress/kextype.sh]
         trailing space

commit 74cbc22529f3e5de756e1b7677b7624efb28f62c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 7 15:26:12 2013 +1100

       - dtucker@cvs.openbsd.org 2013/11/07 03:55:41
         [regress/kextype.sh]
         Use ssh -Q to get kex types instead of a static list.

commit a955041c930e63405159ff7d25ef14272f36eab3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 7 15:21:19 2013 +1100

       - dtucker@cvs.openbsd.org 2013/11/07 02:48:38
         [regress/integrity.sh regress/cipher-speed.sh regress/try-ciphers.sh]
         Use ssh -Q instead of hardcoding lists of ciphers or MACs.

commit 06595d639577577bc15d359e037a31eb83563269
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 7 15:08:02 2013 +1100

       - dtucker@cvs.openbsd.org 2013/11/07 01:12:51
         [regress/rekey.sh]
         Factor out the data transfer rekey tests

commit 651dc8b2592202dac6b16ee3b82ce5b331be7da3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 7 15:04:44 2013 +1100

       - dtucker@cvs.openbsd.org 2013/11/07 00:12:05
         [regress/rekey.sh]
         Test rekeying for every Cipher, MAC and KEX, plus test every KEX with
         the GCM ciphers.

commit 234557762ba1096a867ca6ebdec07efebddb5153
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 7 15:00:51 2013 +1100

       - dtucker@cvs.openbsd.org 2013/11/04 12:27:42
         [regress/rekey.sh]
         Test rekeying with all KexAlgorithms.

commit bbfb9b0f386aab0c3e19d11f136199ef1b9ad0ef
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 7 14:56:43 2013 +1100

       - markus@cvs.openbsd.org 2013/11/02 22:39:53
         [regress/kextype.sh]
         add curve25519-sha256@libssh.org

commit aa19548a98c0f89283ebd7354abd746ca6bc4fdf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 7 14:50:09 2013 +1100

       - djm@cvs.openbsd.org 2013/10/09 23:44:14
         [regress/Makefile] (ID sync only)
         regression test for sftp request white/blacklisting and readonly mode.

commit c8908aabff252f5da772d4e679479c2b7d18cac1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 7 13:38:35 2013 +1100

       - djm@cvs.openbsd.org 2013/11/06 23:05:59
         [ssh-pkcs11.c]
         from portable: s/true/true_val/ to avoid name collisions on dump platforms
         RCSID sync only

commit 49c145c5e89b9d7d48e84328d6347d5ad640b567
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 7 13:35:39 2013 +1100

       - markus@cvs.openbsd.org 2013/11/06 16:52:11
         [monitor_wrap.c]
         fix rekeying for AES-GCM modes; ok deraadt

commit 67a8800f290b39fd60e379988c700656ae3f2539
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 7 13:32:51 2013 +1100

       - markus@cvs.openbsd.org 2013/11/04 11:51:16
         [monitor.c]
         fix rekeying for KEX_C25519_SHA256; noted by dtucker@
         RCSID sync only; I thought this was a merge botch and fixed it already

commit df8b030b15fcec7baf38ec7944f309f9ca8cc9a7
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 7 13:28:16 2013 +1100

     - (djm) [configure.ac defines.h] Skip arc4random_stir() calls on platforms
       that lack it but have arc4random_uniform()

commit a6fd1d3c38a562709374a70fa76423859160aa90
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 7 12:03:26 2013 +1100

     - (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these

commit c98319750b0bbdd0d1794420ec97d65dd9244613
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 7 12:00:23 2013 +1100

     - (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff

commit 61c5c2319e84a58210810d39b062c8b8e3321160
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 7 11:34:14 2013 +1100

     - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5)
       that got lost in recent merge.

commit 094003f5454a9f5a607674b2739824a7e91835f4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 4 22:59:27 2013 +1100

     - (djm) [kexc25519.c kexc25519c.c kexc25519s.c] Import missed files from
       KEX/curve25519 change

commit ca67a7eaf8766499ba67801d0be8cdaa550b9a50
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 4 09:05:17 2013 +1100

       - djm@cvs.openbsd.org 2013/11/03 10:37:19
         [roaming_common.c]
         fix a couple of function definitions foo() -> foo(void)
         (-Wold-style-definition)

commit 0bd8f1519d51af8d4229be81e8f2f4903a1d440b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 4 08:55:43 2013 +1100

       - markus@cvs.openbsd.org 2013/11/02 22:39:19
         [ssh_config.5 sshd_config.5]
         the default kex is now curve25519-sha256@libssh.org

commit 4c3ba0767fbe4a8a2a748df4035aaf86651f6b30
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 4 08:40:13 2013 +1100

       - markus@cvs.openbsd.org 2013/11/02 22:34:01
         [auth-options.c]
         no need to include monitor_wrap.h and ssh-gss.h

commit 660621b2106b987b874c2f120218bec249d0f6ba
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 4 08:37:51 2013 +1100

       - markus@cvs.openbsd.org 2013/11/02 22:24:24
         [kexdhs.c kexecdhs.c]
         no need to include ssh-gss.h

commit abdca986decfbbc008c895195b85e879ed460ada
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 4 08:30:05 2013 +1100

       - markus@cvs.openbsd.org 2013/11/02 22:10:15
         [kexdhs.c kexecdhs.c]
         no need to include monitor_wrap.h

commit 1e1242604eb0fd510fe93f81245c529237ffc513
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 4 08:26:52 2013 +1100

       - markus@cvs.openbsd.org 2013/11/02 21:59:15
         [kex.c kex.h myproposal.h ssh-keyscan.c sshconnect2.c sshd.c]
         use curve25519 for default key exchange (curve25519-sha256@libssh.org);
         initial patch from Aris Adamantiadis; ok djm@

commit d2252c79191d069372ed6effce7c7a2de93448cd
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 4 07:41:48 2013 +1100

       - markus@cvs.openbsd.org 2013/11/02 20:03:54
         [ssh-pkcs11.c]
         support pkcs#11 tokes that only provide x509 zerts instead of raw pubkeys;
         fixes bz#1908; based on patch from Laurent Barbe; ok djm

commit 007e3b357e880caa974d5adf9669298ba0751c78
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Nov 3 18:43:55 2013 +1100

     - (dtucker) [configure.ac defines.h] Add typedefs for intmax_t and uintmax_t
       for platforms that don't have them.

commit 710f3747352fb93a63e5b69b12379da37f5b3fa9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Nov 3 17:20:34 2013 +1100

     - (dtucker) [openbsd-compat/setproctitle.c] Handle error case form the 2nd
       vsnprintf.  From eric at openbsd via chl@.

commit d52770452308e5c2e99f4da6edaaa77ef078b610
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Nov 3 16:30:46 2013 +1100

     - (dtucker) [openbsd-compat/bsd-misc.c] Include time.h for nanosleep.
       From OpenSMTPD where it prevents "implicit declaration" warnings (it's
       a no-op in OpenSSH).  From chl at openbsd.

commit 63857c9340d3482746a5622ffdacc756751f6448
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 30 22:31:06 2013 +1100

       - jmc@cvs.openbsd.org 2013/10/29 18:49:32
         [sshd_config.5]
         pty(4), not pty(7);

commit 5ff30c6b68adeee767dd29bf2369763c6a13c0b3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 30 22:21:50 2013 +1100

       - djm@cvs.openbsd.org 2013/10/29 09:48:02
         [servconf.c servconf.h session.c sshd_config sshd_config.5]
         shd_config PermitTTY to disallow TTY allocation, mirroring the
         longstanding no-pty authorized_keys option;
         bz#2070, patch from Teran McKinney; ok markus@

commit 4a3a9d4bbf8048473f5cc202cd8db7164d5e6b8d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 30 22:19:47 2013 +1100

       - djm@cvs.openbsd.org 2013/10/29 09:42:11
         [key.c key.h]
         fix potential stack exhaustion caused by nested certificates;
         report by Mateusz Kocielski; ok dtucker@ markus@

commit 28631ceaa7acd9bc500f924614431542893c6a21
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 26 10:07:56 2013 +1100

       - djm@cvs.openbsd.org 2013/10/25 23:04:51
         [ssh.c]
         fix crash when using ProxyCommand caused by previous commit - was calling
         freeaddrinfo(NULL); spotted by sthen@ and Tim Ruehsen, patch by sthen@

commit 26506ad29350c5681815745cc90b3952a84cf118
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 26 10:05:46 2013 +1100

     - (djm) [ssh-keygen.c ssh-keysign.c sshconnect1.c sshd.c] Remove
       unnecessary arc4random_stir() calls. The only ones left are to ensure
       that the PRNG gets a different state after fork() for platforms that
       have broken the API.

commit bd43e8872325e9bbb3319c89da593614709f317c
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Oct 24 12:22:49 2013 -0700

     - (tim) [regress/sftp-perm.sh] We need a shell that understands "! somecmd"

commit a90c0338083ee0e4064c4bdf61f497293a699be0
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 24 21:03:17 2013 +1100

       - djm@cvs.openbsd.org 2013/10/24 08:19:36
         [ssh.c]
         fix bug introduced in hostname canonicalisation commit: don't try to
         resolve hostnames when a ProxyCommand is set unless the user has forced
         canonicalisation; spotted by Iain Morgan

commit cf31f3863425453ffcda540fbefa9df80088c8d1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 24 21:02:56 2013 +1100

       - dtucker@cvs.openbsd.org 2013/10/24 00:51:48
         [readconf.c servconf.c ssh_config.5 sshd_config.5]
         Disallow empty Match statements and add "Match all" which matches
         everything.  ok djm, man page help jmc@

commit 4bedd4032a09ce87322ae5ea80f193f109e5c607
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 24 21:02:26 2013 +1100

       - dtucker@cvs.openbsd.org 2013/10/24 00:49:49
         [moduli.c]
         Periodically print progress and, if possible, expected time to completion
         when screening moduli for DH groups.  ok deraadt djm

commit 5ecb41629860687b145be63b8877fabb6bae5eda
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 24 21:02:02 2013 +1100

       - djm@cvs.openbsd.org 2013/10/23 23:35:32
         [sshd.c]
         include local address and port in "Connection from ..." message (only
         shown at loglevel>=verbose)

commit 03bf2e61ad6ac59a362a1f11b105586cb755c147
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 24 21:01:26 2013 +1100

       - dtucker@cvs.openbsd.org 2013/10/23 05:40:58
         [servconf.c]
         fix comment

commit 8f1873191478847773906af961c8984d02a49dd6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 24 10:53:02 2013 +1100

     - (djm) [auth-krb5.c] bz#2032 - use local username in krb5_kuserok check
       rather than full client name which may be of form user@REALM;
       patch from Miguel Sanders; ok dtucker@

commit 5b01b0dcb417eb615df77e7ce1b59319bf04342c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 23 16:31:31 2013 +1100

       - djm@cvs.openbsd.org 2013/10/23 04:16:22
         [ssh-keygen.c]
         Make code match documentation: relative-specified certificate expiry time
         should be relative to current time and not the validity start time.
         Reported by Petr Lautrbach; ok deraadt@

commit eff5cada589f25793dbe63a76aba9da39837a148
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 23 16:31:10 2013 +1100

       - djm@cvs.openbsd.org 2013/10/23 03:05:19
         [readconf.c ssh.c]
         comment

commit 084bcd24e9fe874020e4df4e073e7408e1b17fb7
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 23 16:30:51 2013 +1100

       - djm@cvs.openbsd.org 2013/10/23 03:03:07
         [readconf.c]
         Hostname may have %h sequences that should be expanded prior to Match
         evaluation; spotted by Iain Morgan

commit 8e5a67f46916def40b2758bb7755350dd2eee843
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 23 16:30:25 2013 +1100

       - jmc@cvs.openbsd.org 2013/10/20 18:00:13
         [ssh_config.5]
         tweak the "exec" description, as worded by djm;

commit c0049bd0bca02890cd792babc594771c563f91f2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 23 16:29:59 2013 +1100

       - djm@cvs.openbsd.org 2013/10/20 09:51:26
         [scp.1 sftp.1]
         add canonicalisation options to -o lists

commit 8a04be795fc28514a09e55a54b2e67968f2e1b3a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 23 16:29:40 2013 +1100

       - djm@cvs.openbsd.org 2013/10/20 06:19:28
         [readconf.c ssh_config.5]
         rename "command" subclause of the recently-added "Match" keyword to
         "exec"; it's shorter, clearer in intent and we might want to add the
         ability to match against the command being executed at the remote end in
         the future.

commit 5c86ebdf83b636b6741db4b03569ef4a53b89a58
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 23 16:29:12 2013 +1100

       - djm@cvs.openbsd.org 2013/10/20 04:39:28
         [ssh_config.5]
         document % expansions performed by "Match command ..."

commit 4502f88774edc56194707167443f94026d3c7cfa
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 18 10:17:36 2013 +1100

       - djm@cvs.openbsd.org 2013/10/17 22:08:04
         [sshd.c]
         include remote port in bad banner message; bz#2162

commit 1edcbf65ebd2febeaf10a836468f35e519eed7ca
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 18 10:17:17 2013 +1100

       - jmc@cvs.openbsd.org 2013/10/17 07:35:48
         [sftp.1 sftp.c]
         tweak previous;

commit a176e1823013dd8533a20235b3a5131f0626f46b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 18 09:05:41 2013 +1100

       - djm@cvs.openbsd.org 2013/10/09 23:44:14
         [regress/Makefile regress/sftp-perm.sh]
         regression test for sftp request white/blacklisting and readonly mode.

commit e3ea09494dcfe7ba76536e95765c8328ecfc18fb
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 17 11:57:23 2013 +1100

       - djm@cvs.openbsd.org 2013/10/17 00:46:49
         [ssh.c]
         rearrange check to reduce diff against -portable
         (Id sync only)

commit f29238e67471a7f1088a99c3c3dbafce76b790cf
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 17 11:48:52 2013 +1100

       - djm@cvs.openbsd.org 2013/10/17 00:30:13
         [PROTOCOL sftp-client.c sftp-client.h sftp-server.c sftp.1 sftp.c]
         fsync@openssh.com protocol extension for sftp-server
         client support to allow calling fsync() faster successful transfer
         patch mostly by imorgan AT nas.nasa.gov; bz#1798
         "fine" markus@ "grumble OK" deraadt@ "doesn't sound bad to me" millert@

commit 51682faa599550a69d8120e5e2bdbdc0625ef4be
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 17 11:48:31 2013 +1100

       - djm@cvs.openbsd.org 2013/10/16 22:58:01
         [ssh.c ssh_config.5]
         one I missed in previous: s/isation/ization/

commit 3850559be93f1a442ae9ed370e8c389889dd5f72
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 17 11:48:13 2013 +1100

       - djm@cvs.openbsd.org 2013/10/16 22:49:39
         [readconf.c readconf.h ssh.1 ssh.c ssh_config.5]
         s/canonicalise/canonicalize/ for consistency with existing spelling,
         e.g. authorized_keys; pointed out by naddy@

commit 607af3434b75acc7199a5d99d5a9c11068c01f27
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 17 11:47:51 2013 +1100

       - jmc@cvs.openbsd.org 2013/10/16 06:42:25
         [ssh_config.5]
         tweak previous;

commit 0faf747e2f77f0f7083bcd59cbed30c4b5448444
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 17 11:47:23 2013 +1100

       - djm@cvs.openbsd.org 2013/10/16 02:31:47
         [readconf.c readconf.h roaming_client.c ssh.1 ssh.c ssh_config.5]
         [sshconnect.c sshconnect.h]
         Implement client-side hostname canonicalisation to allow an explicit
         search path of domain suffixes to use to convert unqualified host names
         to fully-qualified ones for host key matching.
         This is particularly useful for host certificates, which would otherwise
         need to list unqualified names alongside fully-qualified ones (and this
         causes a number of problems).
         "looks fine" markus@

commit d77b81f856e078714ec6b0f86f61c20249b7ead4
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 17 11:39:00 2013 +1100

       - jmc@cvs.openbsd.org 2013/10/15 14:10:25
         [ssh.1 ssh_config.5]
         tweak previous;

commit dcd39f29ce3308dc74a0ff27a9056205a932ce05
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 17 11:31:40 2013 +1100

     - [ssh.c] g/c unused variable.

commit 5359a628ce3763408da25d83271a8eddec597a0c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 15 12:20:37 2013 +1100

     - [ssh.c] g/c unused variable.

commit 386feab0c4736b054585ee8ee372865d5cde8d69
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 15 12:14:49 2013 +1100

       - djm@cvs.openbsd.org 2013/10/14 23:31:01
         [ssh.c]
         whitespace at EOL; pointed out by markus@

commit e9fc72edd6c313b670558cd5219601c38a949b67
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 15 12:14:12 2013 +1100

       - djm@cvs.openbsd.org 2013/10/14 23:28:23
         [canohost.c misc.c misc.h readconf.c sftp-server.c ssh.c]
         refactor client config code a little:
         add multistate option partsing to readconf.c, similar to servconf.c's
         existing code.
         move checking of options that accept "none" as an argument to readconf.c
         add a lowercase() function and use it instead of explicit tolower() in
         loops
         part of a larger diff that was ok markus@

commit 194fd904d8597a274b93e075b2047afdf5a175d4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 15 12:13:05 2013 +1100

       - djm@cvs.openbsd.org 2013/10/14 22:22:05
         [readconf.c readconf.h ssh-keysign.c ssh.c ssh_config.5]
         add a "Match" keyword to ssh_config that allows matching on hostname,
         user and result of arbitrary commands. "nice work" markus@

commit 71df752de2a04f423b1cd18d961a79f4fbccbcee
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 15 12:12:02 2013 +1100

       - djm@cvs.openbsd.org 2013/10/14 21:20:52
         [session.c session.h]
         Add logging of session starts in a useful format; ok markus@ feedback and
         ok dtucker@

commit 6efab27109b82820e8d32a5d811adb7bfc354f65
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 15 12:07:05 2013 +1100

       - jmc@cvs.openbsd.org 2013/10/14 14:18:56
         [sftp-server.8 sftp-server.c]
         tweak previous;
         ok djm

commit 61c7de8a94156f6d7e9718ded9be8c65bb902b66
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 15 12:06:45 2013 +1100

       - djm@cvs.openbsd.org 2013/10/11 02:53:45
         [sftp-client.h]
         obsolete comment

commit 2f93d0556e4892208c9b072624caa8cc5ddd839d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 15 12:06:27 2013 +1100

       - djm@cvs.openbsd.org 2013/10/11 02:52:23
         [sftp-client.c]
         missed one arg reorder

commit bda5c8445713ae592d969a5105ed1a65da22bc96
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 15 12:05:58 2013 +1100

       - djm@cvs.openbsd.org 2013/10/11 02:45:36
         [sftp-client.c]
         rename flag arguments to be more clear and consistent.
         reorder some internal function arguments to make adding additional flags
         easier.
         no functional change

commit 61ee4d68ca0fcc793a826fc7ec70f3b8ffd12ab6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 15 11:56:47 2013 +1100

       - djm@cvs.openbsd.org 2013/10/10 01:43:03
         [sshd.c]
         bz#2139: fix re-exec fallback by ensuring that startup_pipe is correctly
         updated; ok dtucker@

commit 73600e51af9ee734a19767e0c084bbbc5eb5b8da
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 15 11:56:25 2013 +1100

       - djm@cvs.openbsd.org 2013/10/10 00:53:25
         [sftp-server.c]
         add -Q, -P and -p to usage() before jmc@ catches me

commit 6eaeebf27d92f39a38c772aa3f20c2250af2dd29
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 15 11:55:57 2013 +1100

       - djm@cvs.openbsd.org 2013/10/09 23:42:17
         [sftp-server.8 sftp-server.c]
         Add ability to whitelist and/or blacklist sftp protocol requests by name.
         Refactor dispatch loop and consolidate read-only mode checks.
         Make global variables static, since sftp-server is linked into sshd(8).
         ok dtucker@

commit df62d71e64d29d1054e7a53d1a801075ef70335f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 10 10:32:39 2013 +1100

       - dtucker@cvs.openbsd.org 2013/10/08 11:42:13
         [dh.c dh.h]
         Increase the size of the Diffie-Hellman groups requested for a each
         symmetric key size.  New values from NIST Special Publication 800-57 with
         the upper limit specified by RFC4419.  Pointed out by Peter Backes, ok
         djm@.

commit e6e52f8c5dc89a6767702e65bb595aaf7bc8991c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 10 10:28:07 2013 +1100

       - djm@cvs.openbsd.org 2013/09/19 01:26:29
         [sshconnect.c]
         bz#1211: make BindAddress work with UsePrivilegedPort=yes; patch from
         swp AT swp.pp.ru; ok dtucker@

commit 71152bc9911bc34a98810b2398dac20df3fe8de3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 10 10:27:21 2013 +1100

       - djm@cvs.openbsd.org 2013/09/19 01:24:46
         [channels.c]
         bz#1297 - tell the client (via packet_send_debug) when their preferred
         listen address has been overridden by the server's GatewayPorts;
         ok dtucker@

commit b59aaf3c4f3f449a4b86d8528668bd979be9aa5f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 10 10:26:21 2013 +1100

       - djm@cvs.openbsd.org 2013/09/19 00:49:12
         [sftp-client.c]
         fix swapped pflag and printflag in sftp upload_dir; from Iain Morgan

commit 5d80e4522d6238bdefe9d0c634f0e6d35a241e41
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 10 10:25:09 2013 +1100

       - djm@cvs.openbsd.org 2013/09/19 00:24:52
         [progressmeter.c]
         store the initial file offset so the progress meter doesn't freak out
         when resuming sftp transfers. bz#2137; patch from Iain Morgan; ok dtucker@

commit ad92df7e5ed26fea85adfb3f95352d6cd8e86344
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 10 10:24:11 2013 +1100

       - sthen@cvs.openbsd.org 2013/09/16 11:35:43
         [ssh_config]
         Remove gssapi config parts from ssh_config, as was already done for
         sshd_config.  Req by/ok ajacoutot@
         ID SYNC ONLY for portable; kerberos/gssapi is still pretty popular

commit 720711960b130d36dfdd3d50eb25ef482bdd000e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 9 10:44:47 2013 +1100

     - (djm) [openbsd-compat/Makefile.in openbsd-compat/arc4random.c]
       [openbsd-compat/bsd-arc4random.c] Replace old RC4-based arc4random
       implementation with recent OpenBSD's ChaCha-based PRNG. ok dtucker@,
       tested tim@

commit 9159310087a218e28940a592896808b8eb76a039
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 9 10:42:32 2013 +1100

     - (djm) [openbsd-compat/arc4random.c openbsd-compat/chacha_private.h] Pull
       in OpenBSD implementation of arc4random, shortly to replace the existing
       bsd-arc4random.c

commit 67f1d557a68d6fa8966a327d7b6dee3408cf0e72
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 9 09:33:08 2013 +1100

    correct incorrect years in datestamps; from des

commit f2bf36c3eb4d969f85ec8aa342e9aecb61cc8bb1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 22 19:02:40 2013 +1000

     - (dtucker) [platform.c platform.h sshd.c] bz#2156: restore Linux oom_adj
       setting when handling SIGHUP to maintain behaviour over retart.  Patch
       from Matthew Ife.

commit e90a06ae570fd259a2f5ced873c7f17390f535a5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Sep 18 15:09:38 2013 +1000

     - (dtucker) [sshd_config] Trailing whitespace; from jstjohn at purdue edu.

commit 13840e0103946982cee2a05c40697be7e57dca41
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 14 09:49:43 2013 +1000

       - djm@cvs.openbsd.org 2013/09/13 06:54:34
         [channels.c]
         avoid unaligned access in code that reused a buffer to send a
         struct in_addr in a reply; simpler just use use buffer_put_int();
         from portable; spotted by and ok dtucker@

commit 70182522a47d283513a010338cd028cb80dac2ab
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 14 09:49:19 2013 +1000

       - djm@cvs.openbsd.org 2013/09/12 01:41:12
         [clientloop.c]
         fix connection crash when sending break (~B) on ControlPersist'd session;
         ok dtucker@

commit ff9d6c2a4171ee32e8fe28fc3b86eb33bd5c845b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 14 09:48:55 2013 +1000

       - sthen@cvs.openbsd.org 2013/09/07 13:53:11
         [sshd_config]
         Remove commented-out kerberos/gssapi config options from sample config,
         kerberos support is currently not enabled in ssh in OpenBSD. Discussed with
         various people; ok deraadt@
         ID SYNC ONLY for portable; kerberos/gssapi is still pretty popular

commit 8bab5e7b5ff6721d926b5ebf05a3a24489889c58
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 14 09:47:00 2013 +1000

       - deraadt@cvs.openbsd.org 2013/09/02 22:00:34
         [ssh-keygen.c sshconnect1.c sshd.c]
         All the instances of arc4random_stir() are bogus, since arc4random()
         does this itself, inside itself, and has for a very long time..  Actually,
         this was probably reducing the entropy available.
         ok djm
         ID SYNC ONLY for portable; we don't trust other arc4random implementations
         to do this right.

commit 61353b3208d548fab863e0e0ac5d2400ee5bb340
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 14 09:45:32 2013 +1000

       - djm@cvs.openbsd.org 2013/08/31 00:13:54
         [sftp.c]
         make ^w match ksh behaviour (delete previous word instead of entire line)

commit 660854859cad31d234edb9353fb7ca2780df8128
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 14 09:45:03 2013 +1000

       - mikeb@cvs.openbsd.org 2013/08/28 12:34:27
         [ssh-keygen.c]
         improve batch processing a bit by making use of the quite flag a bit
         more often and exit with a non zero code if asked to find a hostname
         in a known_hosts file and it wasn't there;
         originally from reyk@,  ok djm

commit 045bda5cb8acf0eb9d71c275ee1247e3154fc9e5
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 14 09:44:37 2013 +1000

       - djm@cvs.openbsd.org 2013/08/22 19:02:21
         [sshd.c]
         Stir PRNG after post-accept fork. The child gets a different PRNG state
         anyway via rexec and explicit privsep reseeds, but it's good to be sure.
         ok markus@

commit ed4af412da60a084891b20412433a27966613fb8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 14 09:40:51 2013 +1000

    add marker for 6.3p1 release at the point of the last included change

commit 43968a8e66a0aa1afefb11665bf96f86b113f5d9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 28 14:00:54 2013 +1000

     - (djm) [openbsd-compat/bsd-snprintf.c] #ifdef noytet for intmax_t bits
       until we have configure support.

commit 04be8b9e53f8388c94b531ebc5d1bd6e10e930d1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 28 12:49:43 2013 +1000

     - (djm) [openbsd-compat/bsd-snprintf.c] teach our local snprintf code the
       'j' (intmax_t/uintmax_t) and 'z' (size_t/ssize_t) conversions in case we
       start to use them in the future.

commit f2f6c315a920a256937e1b6a3702757f3195a592
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:44:58 2013 +1000

       - jmc@cvs.openbsd.org 2013/08/20 06:56:07
         [ssh.1 ssh_config.5]
         some proxyusefdpass tweaks;

commit 1262b6638f7d01ab110fd373dd90d915c882fe1a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:44:24 2013 +1000

       - djm@cvs.openbsd.org 2013/08/20 00:11:38
         [readconf.c readconf.h ssh_config.5 sshconnect.c]
         Add a ssh_config ProxyUseFDPass option that supports the use of
         ProxyCommands that establish a connection and then pass a connected
         file descriptor back to ssh(1). This allows the ProxyCommand to exit
         rather than have to shuffle data back and forth and enables ssh to use
         getpeername, etc. to obtain address information just like it does with
         regular directly-connected sockets. ok markus@

commit b7727df37efde4dbe4f5a33b19cbf42022aabf66
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:43:49 2013 +1000

       - jmc@cvs.openbsd.org 2013/08/14 08:39:27
         [scp.1 ssh.1]
         some Bx/Ox conversion;
         From: Jan Stary

commit d5d9d7b1fdacf0551de4c747728bd159be40590a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:43:27 2013 +1000

       - djm@cvs.openbsd.org 2013/08/13 18:33:08
         [ssh-keygen.c]
         another of the same typo

commit d234afb0b3a8de1be78cbeafed5fc86912594c3c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:42:58 2013 +1000

       - djm@cvs.openbsd.org 2013/08/13 18:32:08
         [ssh-keygen.c]
         typo in error message; from Stephan Rickauer

commit e0ee727b8281a7c2ae20630ce83f6b200b404059
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:42:35 2013 +1000

       - djm@cvs.openbsd.org 2013/08/09 03:56:42
         [sftp.c]
         enable ctrl-left-arrow and ctrl-right-arrow to move forward/back a word;
         matching ksh's relatively recent change.

commit fec029f1dc2c338f3fae3fa82aabc988dc07868c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:42:12 2013 +1000

       - djm@cvs.openbsd.org 2013/08/09 03:39:13
         [sftp-client.c]
         two problems found by a to-be-committed regress test: 1) msg_id was not
         being initialised so was starting at a random value from the heap
         (harmless, but confusing). 2) some error conditions were not being
         propagated back to the caller

commit 036d30743fc914089f9849ca52d615891d47e616
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:41:46 2013 +1000

       - djm@cvs.openbsd.org 2013/08/09 03:37:25
         [sftp.c]
         do getopt parsing for all sftp commands (with an empty optstring for
         commands without arguments) to ensure consistent behaviour

commit c7dba12bf95eb1d69711881a153cc286c1987663
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:41:15 2013 +1000

       - djm@cvs.openbsd.org 2013/08/08 05:04:03
         [sftp-client.c sftp-client.h sftp.c]
         add a "-l" flag for the rename command to force it to use the silly
         standard SSH_FXP_RENAME command instead of the POSIX-rename- like
         posix-rename@openssh.com extension.
    
         intended for use in regress tests, so no documentation.

commit 034f27a0c09e69fe3589045b41f03f6e345b63f5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:40:44 2013 +1000

       - djm@cvs.openbsd.org 2013/08/08 04:52:04
         [sftp.c]
         fix two year old regression: symlinking a file would incorrectly
         canonicalise the target path. bz#2129 report from delphij AT freebsd.org

commit c6895c5c67492144dd28589e5788f783be9152ed
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:40:21 2013 +1000

       - jmc@cvs.openbsd.org 2013/08/07 06:24:51
         [sftp.1 sftp.c]
         sort -a;

commit a6d6c1f38ac9b4a5e1bd4df889e1020a8370ed55
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:40:01 2013 +1000

       - djm@cvs.openbsd.org 2013/08/06 23:06:01
         [servconf.c]
         add cast to avoid format warning; from portable

commit eec840673bce3f69ad269672fba7ed8ff05f154f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:39:39 2013 +1000

       - djm@cvs.openbsd.org 2013/08/06 23:05:01
         [sftp.1]
         document top-level -a option (the -a option to 'get' was already
         documented)

commit 02e878070d0eddad4e11f2c82644b275418eb112
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 21 02:38:51 2013 +1000

       - djm@cvs.openbsd.org 2013/08/06 23:03:49
         [sftp.c]
         fix some whitespace at EOL
         make list of commands an enum rather than a long list of defines
         add -a to usage()

commit acd2060f750c16d48b87b92a10b5a833227baf9d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 8 17:02:12 2013 +1000

     - (dtucker) [regress/Makefile regress/test-exec.sh] Roll back the -nt
       removal.  The "make clean" removes modpipe which is built by the top-level
       directory before running the tests.  Spotted by tim@

commit 9542de4547beebf707f3640082d471f1a85534c9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 8 12:50:06 2013 +1000

     - (dtucker) [misc.c] Remove define added for fallback testing that was
       mistakenly included in the previous commit.

commit 94396b7f06f512a0acb230640d7f703fb802a9ee
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 8 11:52:37 2013 +1000

     - (dtucker) [misc.c] Fall back to time(2) at runtime if clock_gettime(
       CLOCK_MONOTONIC...) fails.  Some older versions of RHEL have the
       CLOCK_MONOTONIC define but don't actually support it.  Found and tested
       by Kevin Brott, ok djm.

commit a5a3cbfa0fb8ef011d3e7b38910a13f6ebbb8818
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 8 10:58:49 2013 +1000

     - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt
       since some platforms (eg really old FreeBSD) don't have it.  Instead,
       run "make clean" before a complete regress run.  ok djm.

commit f3ab2c5f9cf4aed44971eded3ac9eeb1344b2be5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 4 21:48:41 2013 +1000

     - (dtucker) [auth-krb5.c configure.ac openbsd-compat/bsd-misc.h] Add support
       for building with older Heimdal versions.  ok djm.

commit ab3575c055adfbce70fa7405345cf0f80b07c827
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 1 14:34:16 2013 +1000

     - (djm) [sshlogin.h] Fix prototype merge botch from 2006; bz#2134

commit c192a4c4f6da907dc0e67a3ca61d806f9a92c931
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 1 14:29:20 2013 +1000

     - (djm) [channels.c channels.h] bz#2135: On Solaris, isatty() on a non-
       blocking connecting socket will clear any stored errno that might
       otherwise have been retrievable via getsockopt(). A hack to limit writes
       to TTYs on AIX was triggering this. Since only AIX needs the hack, wrap
       it in an #ifdef. Diagnosis and patch from Ivo Raisr.

commit 81f7cf1ec5bc2fd202eda05abc2e5361c54633c5
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jul 25 18:41:40 2013 -0700

    more correct comment for last commit

commit 0553ad76ffdff35fb31b9e6df935a71a1cc6daa2
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jul 25 16:03:16 2013 -0700

     - (tim) [regress/forwarding.sh] Fix for building outside read only source tree.

commit ed899eb597a8901ff7322cba809660515ec0d601
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jul 25 15:40:00 2013 -0700

     - (tim) [sftp-client.c] Use of a gcc extension trips up native compilers on
       Solaris and UnixWare. Feedback and OK djm@

commit e9e936d33b4b1d77ffbaace9438cb2f1469c1dc7
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 25 12:34:00 2013 +1000

     - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
        [contrib/suse/openssh.spec] Update version numbers

commit d1e26cf391de31128b4edde118bff5fed98a90ea
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 25 12:11:18 2013 +1000

       - djm@cvs.openbsd.org 2013/06/21 02:26:26
         [regress/sftp-cmds.sh regress/test-exec.sh]
         unbreak sftp-cmds for renamed test data (s/ls/data/)

commit 78d47b7c5b182e44552913de2b4b7e0363c8e3cc
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 25 12:08:46 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/10 21:56:43
         [regress/forwarding.sh]
         Add test for forward config parsing

commit fea440639e04cea9f2605375a41d654390369402
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 25 12:08:07 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/30 20:12:32
         [regress/test-exec.sh]
         use ssh and sshd as testdata since it needs to be >256k for the rekey test

commit 53435b2d8773a5d7c78359e9f7bf9df2d93b9ef5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 25 11:57:15 2013 +1000

       - djm@cvs.openbsd.org 2013/07/25 00:57:37
         [version.h]
         openssh-6.3 for release

commit 0d032419ee6e1968fc1cb187af63bf3b77b506ea
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 25 11:56:52 2013 +1000

       - djm@cvs.openbsd.org 2013/07/25 00:56:52
         [sftp-client.c sftp-client.h sftp.1 sftp.c]
         sftp support for resuming partial downloads; patch mostly by Loganaden
         Velvindron/AfriNIC with some tweaks by me; feedback and ok dtucker@

commit 98e27dcf581647b5bbe9780e8f59685d942d8ea3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 25 11:55:52 2013 +1000

       - djm@cvs.openbsd.org 2013/07/25 00:29:10
         [ssh.c]
         daemonise backgrounded (ControlPersist'ed) multiplexing master to ensure
         it is fully detached from its controlling terminal. based on debugging

commit 94c9cd34d1590ea1d4bf76919a15b5688fa90ed1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 25 11:55:39 2013 +1000

       - djm@cvs.openbsd.org 2013/07/22 12:20:02
         [umac.h]
         oops, forgot to commit corresponding header change;
         spotted by jsg and jasper

commit c331dbd22297ab9bf351abee659893d139c9f28a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 25 11:55:20 2013 +1000

       - djm@cvs.openbsd.org 2013/07/22 05:00:17
         [umac.c]
         make MAC key, data to be hashed and nonce for final hash const;
         checked with -Wcast-qual

commit c8669a8cd24952b3f16a44eac63d2b6ce8a6343a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 25 11:52:48 2013 +1000

       - djm@cvs.openbsd.org 2013/07/20 22:20:42
         [krl.c]
         fix verification error in (as-yet usused) KRL signature checking path

commit 63ddc899d28cf60045b560891894b9fbf6f822e9
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 20 13:35:45 2013 +1000

       - djm@cvs.openbsd.org 2013/07/20 01:55:13
         [auth-krb5.c gss-serv-krb5.c gss-serv.c]
         fix kerberos/GSSAPI deprecation warnings and linking; "looks okay" millert@

commit 1f0e86f23fcebb026371c0888402a981df2a61c4
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 20 13:22:49 2013 +1000

       - djm@cvs.openbsd.org 2013/07/20 01:50:20
         [ssh-agent.c]
         call cleanup_handler on SIGINT when in debug mode to ensure sockets
         are cleaned up on manual exit; bz#2120

commit 3009d3cbb89316b1294fb5cedb54770b5d114d04
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 20 13:22:31 2013 +1000

       - djm@cvs.openbsd.org 2013/07/20 01:44:37
         [ssh-keygen.c ssh.c]
         More useful error message on missing current user in /etc/passwd

commit 32ecfa0f7920db31471ca8c1f4adc20ae38ed9d6
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 20 13:22:13 2013 +1000

       - djm@cvs.openbsd.org 2013/07/20 01:43:46
         [umac.c]
         use a union to ensure correct alignment; ok deraadt

commit 85b45e09188e7a7fc8f0a900a4c6a0f04a5720a7
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 20 13:21:52 2013 +1000

       - markus@cvs.openbsd.org 2013/07/19 07:37:48
         [auth.h kex.h kexdhs.c kexecdhs.c kexgexs.c monitor.c servconf.c]
         [servconf.h session.c sshd.c sshd_config.5]
         add ssh-agent(1) support to sshd(8); allows encrypted hostkeys,
         or hostkeys on smartcards; most of the work by Zev Weiss; bz #1974
         ok djm@

commit d93340cbb6bc0fc0dbd4427e0cec6d994a494dd9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:14:34 2013 +1000

       - djm@cvs.openbsd.org 2013/07/18 01:12:26
         [ssh.1]
         be more exact wrt perms for ~/.ssh/config; bz#2078

commit bf836e535dc3a8050c1756423539bac127ee5098
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:14:13 2013 +1000

       - schwarze@cvs.openbsd.org 2013/07/16 00:07:52
         [scp.1 sftp-server.8 ssh-keyscan.1 ssh-keysign.8 ssh-pkcs11-helper.8]
         use .Mt for email addresses; from Jan Stary <hans at stare dot cz>; ok jmc@

commit 649fe025a409d0ce88c60a068f3f211193c35873
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:13:55 2013 +1000

       - djm@cvs.openbsd.org 2013/07/12 05:48:55
         [ssh.c]
         set TCP nodelay for connections started with -N; bz#2124 ok dtucker@

commit 5bb8833e809d827496dffca0dc2c223052c93931
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:13:37 2013 +1000

       - djm@cvs.openbsd.org 2013/07/12 05:42:03
         [ssh-keygen.c]
         do_print_resource_record() can never be called with a NULL filename, so
         don't attempt (and bungle) asking for one if it has not been specified
         bz#2127 ok dtucker@

commit 7313fc9222785d0c54a7ffcaf2067f4db02c8d72
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:13:19 2013 +1000

       - djm@cvs.openbsd.org 2013/07/12 00:43:50
         [misc.c]
         in ssh_gai_strerror() don't fallback to strerror for EAI_SYSTEM when
         errno == 0. Avoids confusing error message in some broken resolver
         cases. bz#2122 patch from plautrba AT redhat.com; ok dtucker

commit 746d1a6c524d2e90ebe98cc29e42573a3e1c3c1b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:13:02 2013 +1000

       - djm@cvs.openbsd.org 2013/07/12 00:20:00
         [sftp.c ssh-keygen.c ssh-pkcs11.c]
         fix pointer-signedness warnings from clang/llvm-3.3; "seems nice" deraadt@

commit ce98654674648fb7d58f73edf6aa398656a2dba4
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:12:44 2013 +1000

       - djm@cvs.openbsd.org 2013/07/12 00:19:59
         [auth-options.c auth-rsa.c bufaux.c buffer.h channels.c hostfile.c]
         [hostfile.h mux.c packet.c packet.h roaming_common.c serverloop.c]
         fix pointer-signedness warnings from clang/llvm-3.3; "seems nice" deraadt@

commit 0d02c3e10e1ed16d6396748375a133d348127a2a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:12:06 2013 +1000

       - markus@cvs.openbsd.org 2013/07/02 12:31:43
         [dh.c]
         remove extra whitespace

commit fecfd118d6c90df4fcd3cec7b14e4d3ce69a41d5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:11:50 2013 +1000

       - jmc@cvs.openbsd.org 2013/06/27 14:05:37
         [ssh-keygen.1 ssh.1 ssh_config.5 sshd.8 sshd_config.5]
         do not use Sx for sections outwith the man page - ingo informs me that
         stuff like html will render with broken links;
    
         issue reported by Eric S. Raymond, via djm

commit bc35d92e78fd53c3f32cbdbdf89d8b1919788c50
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:11:25 2013 +1000

       - djm@cvs.openbsd.org 2013/06/22 06:31:57
         [scp.c]
         improved time_t overflow check suggested by guenther@

commit 8158441d01ab84f33a7e70e27f87c02cbf67e709
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:11:07 2013 +1000

       - djm@cvs.openbsd.org 2013/06/21 05:43:10
         [scp.c]
         make this -Wsign-compare clean after time_t conversion

commit bbeb1dac550bad8e6aff9bd27113c6bd5ebb7413
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:10:49 2013 +1000

       - djm@cvs.openbsd.org 2013/06/21 05:42:32
         [dh.c]
         sprinkle in some error() to explain moduli(5) parse failures

commit 7f2b438ca0b7c3b9684a03d7bf3eaf379da16de9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:10:29 2013 +1000

       - djm@cvs.openbsd.org 2013/06/21 00:37:49
         [ssh_config.5]
         explicitly mention that IdentitiesOnly can be used with IdentityFile
         to control which keys are offered from an agent.

commit 20bdcd72365e8b3d51261993928cc47c5f0d7c8a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:10:09 2013 +1000

       - djm@cvs.openbsd.org 2013/06/21 00:34:49
         [auth-rsa.c auth.h auth2-hostbased.c auth2-pubkey.c monitor.c]
         for hostbased authentication, print the client host and user on
         the auth success/failure line; bz#2064, ok dtucker@

commit 3071070b39e6d1722151c754cdc2b26640eaf45e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:09:44 2013 +1000

       - markus@cvs.openbsd.org 2013/06/20 19:15:06
         [krl.c]
         don't leak the rdata blob on errors; ok djm@

commit 044bd2a7ddb0b6f6b716c87e57261572e2b89028
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:09:25 2013 +1000

       - guenther@cvs.openbsd.org 2013/06/17 04:48:42
         [scp.c]
         Handle time_t values as long long's when formatting them and when
         parsing them from remote servers.
         Improve error checking in parsing of 'T' lines.
    
         ok dtucker@ deraadt@

commit 9a6615542108118582f64b7161ca0e12176e3712
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 18 16:09:04 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/10 19:19:44
         [readconf.c]
         revert 1.203 while we investigate crashes reported by okan@

commit b7482cff46e7e76bfb3cda86c365a08f58d4fca0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 2 20:06:46 2013 +1000

     - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config
       contrib/cygwin/ssh-user-config] Modernizes and improve readability of
       the Cygwin README file (which hasn't been updated for ages), drop
       unsupported OSes from the ssh-host-config help text, and drop an
       unneeded option from ssh-user-config.  Patch from vinschen at redhat com.

commit b8ae92d08b91beaef34232c6ef34b9941473fdd6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 11 12:10:02 2013 +1000

     - (dtucker) [myproposal.h] Make the conditional algorithm support consistent
       and add some comments so it's clear what goes where.

commit 97b62f41adcb0dcbeff142d0540793a7ea17c910
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 11 11:47:24 2013 +1000

     - (dtucker) [myproposal.h] Do not advertise AES GSM ciphers if we don't have
       the required OpenSSL support.  Patch from naddy at freebsd.

commit 6d8bd57448b45b42809da32857d7804444349ee7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 11 11:26:10 2013 +1000

     - (dtucker) [Makefile.in configure.ac fixalgorithms] Remove unsupported
       algorithms (Ciphers, MACs and HostKeyAlgorithms) from man pages.

commit 36187093ea0b2d2240c043417b8949611687e105
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 10 13:07:11 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/07 15:37:52
         [channels.c channels.h clientloop.c]
         Add an "ABANDONED" channel state and use for mux sessions that are
         disconnected via the ~. escape sequence.  Channels in this state will
         be able to close if the server responds, but do not count as active channels.
         This means that if you ~. all of the mux clients when using ControlPersist
         on a broken network, the backgrounded mux master will exit when the
         Control Persist time expires rather than hanging around indefinitely.
         bz#1917, also reported and tested by tedu@.  ok djm@ markus@.

commit ae133d4b31af05bb232d797419f498f3ae7e9f2d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 6 08:30:20 2013 +1000

     - (dtucker) [configure.ac sftp.c openbsd-compat/openbsd-compat.h] Cater for
        platforms that don't have multibyte character support (specifically,
        mblen).

commit 408eaf3ab716096f8faf30f091bd54a2c7a17a09
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 6 08:22:46 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/05 22:00:28
         [readconf.c]
         plug another memleak.  bz#1967, from Zhenbo Xu, detected by Melton, ok djm

commit e52a260f16888ca75390f97de4606943e61785e8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 6 08:22:05 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/05 12:52:38
         [sshconnect2.c]
         Fix memory leaks found by Zhenbo Xu and the Melton tool.  bz#1967, ok djm

commit 0cca17fa1819d3a0ba06a6db41ab3eaa8d769587
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 6 08:21:14 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/05 02:27:50
         [sshd.c]
         When running sshd -D, close stderr unless we have explicitly requesting
         logging to stderr. From james.hunt at ubuntu.com via bz#1976, djm's patch
         so, err, ok dtucker.

commit 746e9067bd9b3501876e1c86f38f3c510a12f895
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 6 08:20:13 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/05 02:07:29
         [mux.c]
         fix leaks in mux error paths, from Zhenbo Xu, found by Melton. bz#1967,
         ok djm

commit ea64721275a81c4788af36294d94bf4f74012e06
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 6 08:19:09 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/04 20:42:36
         [sftp.c]
         Make sftp's libedit interface marginally multibyte aware by building up
         the quoted string by character instead of by byte.  Prevents failures
         when linked against a libedit built with wide character support (bz#1990).
         "looks ok" djm

commit 194454d7a8f8cb8ac55f2b9d0199ef9445788bee
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 6 08:16:04 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/04 19:12:23
         [scp.c]
         use MAXPATHLEN for buffer size instead of fixed value.  ok markus

commit 4ac66af091cf6db5a42c18e43738ca9c41e338e5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 6 08:12:37 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/03 00:03:18
         [mac.c]
         force the MAC output to be 64-bit aligned so umac won't see unaligned
         accesses on strict-alignment architectures.  bz#2101, patch from
         tomas.kuthan at oracle.com, ok djm@

commit ea8342c248ad6c0a4fe1a70de133f954973bd2b2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 6 08:11:40 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/02 23:36:29
         [clientloop.h clientloop.c mux.c]
         No need for the mux cleanup callback to be visible so restore it to static
         and call it through the detach_user function pointer.  ok djm@

commit 5d12b8f05d79ba89d0807910a664fa80f6f3bf8c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 6 08:09:10 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/02 21:01:51
         [channels.h]
         typo in comment

commit dc62edbf121c41e8b5270904091039450206d98a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 6 05:12:35 2013 +1000

     - (dtucker) [Makefile.in] append $CFLAGS to compiler options when building
       modpipe in case there's anything in there we need.

commit 2a22873cd869679415104bc9f6bb154811ee604c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 6 01:59:13 2013 +1000

     - (dtucker) [regress/forwarding.sh] For (as yet unknown) reason, the
       forwarding test is extremely slow copying data on some machines so switch
       back to copying the much smaller ls binary until we can figure out why
       this is.

commit b4e00949f01176cd4fae3e0cef5ffa8dea379042
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 5 22:48:44 2013 +1000

     - (dtucker) [contrib/ssh-copy-id] bz#2117: Use portable operator in test.
       Patch from cjwatson at debian.

commit 2ea9eb77a7fcab3190564ef5a6a5377a600aa391
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 5 15:04:00 2013 +1000

     - (dtucker) Enable sha256 kex methods based on the presence of the necessary
       functions, not from the openssl version.

commit 16cac190ebb9b5612cccea63a7c22ac33bc9a07a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 4 12:55:24 2013 +1000

     - (dtucker) [configure.ac] Some other platforms need sys/types.h before
       sys/socket.h.

commit 0b43ffe143a5843703c3755fa040b8684fb04134
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 3 09:30:44 2013 +1000

     - (dtucker) [configure.ac] Some platforms need sys/types.h before sys/un.h.

commit 3f3064c82238c486706471d300217d73dd0f125e
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jun 2 15:13:09 2013 -0700

     - (tim) [regress/sftp-chroot.sh] skip if no sudo. ok dtucker

commit 01ec0af301f60fefdd0079647f13ef9abadd2db5
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jun 2 14:31:27 2013 -0700

     - (tim) [aclocal.m4] Enhance OSSH_CHECK_CFLAG_COMPILE to check stderr.
       feedback and ok dtucker

commit 5ab9b63468100757479534edeb53f788a61fe08b
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jun 2 14:05:48 2013 -0700

     - (tim) [configure.ac regress/Makefile] With rev 1.47 of test-exec.sh we
       need a shell that can handle "[ file1 -nt file2 ]". Rather than keep
       dealing with shell portability issues in regression tests, we let
       configure find us a capable shell on those platforms with an old /bin/sh.

commit 898ac935e56a7ac5d8b686c590fdb8b7aca27e59
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 3 02:03:25 2013 +1000

     - (dtucker) [configure.ac] bz#2111: don't try to use lastlog on Android.
       Patch from Nathan Osman.

commit ef4901c3eb98c7ab1342c3cd8f2638da1f4b0678
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 3 01:59:13 2013 +1000

     - (dtucker) [configure.ac]  sys/un.h needs sys/socket.h on some platforms
       to prevent noise from configure. Patch from Nathan Osman.

commit 073f795bc1c7728c320e5982c0d417376b0907f5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 23:47:11 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/02 13:35:58
         [ssh-agent.c]
         Make parent_alive_interval time_t to avoid signed/unsigned comparison

commit 00e1abb1ebe13ab24e812f68715f46e65e7c5271
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 23:46:24 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/02 13:33:05
         [progressmeter.c]
         Add misc.h for monotime prototype. (id sync only)

commit 86211d1738695e63b2a68f0c3a4f60e1a9d9bda3
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Jun 1 18:38:23 2013 -0700

    20130602
     - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy
       linking regress/modpipe.

commit e9887d1c37940b9d6c72d55cfad7a40de4c6e28d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 09:17:09 2013 +1000

     - (dtucker) [sandbox-seccomp-filter.c] Allow clock_gettimeofday.

commit 65cf74079a2d563c4ede649116a13ca78c8cc2a4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 09:11:19 2013 +1000

    fix typo

commit c9a1991b95a4c9f04f9dcef299a8110d2ec80d3e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 08:37:05 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/01 22:34:50
         [sftp-client.c]
         Update progressmeter when data is acked, not when it's sent.  bz#2108, from
         Debian via Colin Watson, ok djm@

commit a710891659202c82545e84725d4e5cd77aef567c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 08:18:31 2013 +1000

     - (dtucker) [configure.ac misc.c] Look for clock_gettime in librt and fall
       back to time(NULL) if we can't find it anywhere.

commit f60845fde29cead9d75e812db1c04916b4c58ffd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 08:07:31 2013 +1000

     - (dtucker) [M auth-chall.c auth-krb5.c auth-pam.c cipher-aes.c cipher-ctr.c
       groupaccess.c loginrec.c monitor.c monitor_wrap.c session.c sshd.c
       sshlogin.c uidswap.c openbsd-compat/bsd-cygwin_util.c
       openbsd-compat/getrrsetbyname-ldns.c openbsd-compat/port-aix.c
       openbsd-compat/port-linux.c] Replace portable-specific instances of xfree
       with the equivalent calls to free.

commit 12f6533215c0a36ab29d11ff52a853fce45573b4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 08:01:24 2013 +1000

    Remove stray '+' accidentally introduced in sync

commit 3750fce6ac6b287f62584ac55a4406df95c71b92
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 07:52:21 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/01 20:59:25
         [scp.c sftp-client.c]
         Replace S_IWRITE, which isn't standardized, with S_IWUSR, which is.  Patch
         from Nathan Osman via bz#2113.  ok deraadt.
    
    (note: corrected bug number from 2085)

commit b759c9c2efebe7b416ab81093ca8eb17836b6933
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 07:46:16 2013 +1000

       - dtucker@cvs.openbsd.org 2013/06/01 13:15:52
         [ssh-agent.c clientloop.c misc.h packet.c progressmeter.c misc.c
         channels.c sandbox-systrace.c]
         Use clock_gettime(CLOCK_MONOTONIC ...) for ssh timers so that things like
         keepalives and rekeying will work properly over clock steps.  Suggested by
         markus@, "looks good" djm@.

commit 55119253c64808b0d3b2ab5d2bc67ee9dac3430b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 07:43:59 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/31 12:28:10
         [ssh-agent.c]
         Use time_t where appropriate.  ok djm

commit 0acca3797d53d958d240c69a5f222f2aa8444858
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 07:41:51 2013 +1000

       - djm@cvs.openbsd.org 2013/05/19 02:42:42
         [auth.h auth.c key.c monitor.c auth-rsa.c auth2.c auth1.c key.h]
         Standardise logging of supplemental information during userauth. Keys
         and ruser is now logged in the auth success/failure message alongside
         the local username, remote host/port and protocol in use. Certificates
         contents and CA are logged too.
         Pushing all logging onto a single line simplifies log analysis as it is
         no longer necessary to relate information scattered across multiple log
         entries. "I like it" markus@

commit 74836ae0fabcc1a76b9d9eacd1629c88a054b2d0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 07:32:00 2013 +1000

       - djm@cvs.openbsd.org 2013/05/19 02:38:28
         [auth2-pubkey.c]
         fix failure to recognise cert-authority keys if a key of a different type
         appeared in authorized_keys before it; ok markus@

commit a627d42e51ffa71e014d7b2d2c07118122fd3ec3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 07:31:17 2013 +1000

       - djm@cvs.openbsd.org 2013/05/17 00:13:13
         [xmalloc.h cipher.c sftp-glob.c ssh-keyscan.c ssh.c sftp-common.c
         ssh-ecdsa.c auth2-chall.c compat.c readconf.c kexgexs.c monitor.c
         gss-genr.c cipher-3des1.c kex.c monitor_wrap.c ssh-pkcs11-client.c
         auth-options.c rsa.c auth2-pubkey.c sftp.c hostfile.c auth2.c
         servconf.c auth.c authfile.c xmalloc.c uuencode.c sftp-client.c
         auth2-gss.c sftp-server.c bufaux.c mac.c session.c jpake.c kexgexc.c
         sshconnect.c auth-chall.c auth2-passwd.c sshconnect1.c buffer.c
         kexecdhs.c kexdhs.c ssh-rsa.c auth1.c ssh-pkcs11.c auth2-kbdint.c
         kexdhc.c sshd.c umac.c ssh-dss.c auth2-jpake.c bufbn.c clientloop.c
         monitor_mm.c scp.c roaming_client.c serverloop.c key.c auth-rsa.c
         ssh-pkcs11-helper.c ssh-keysign.c ssh-keygen.c match.c channels.c
         sshconnect2.c addrmatch.c mux.c canohost.c kexecdhc.c schnorr.c
         ssh-add.c misc.c auth2-hostbased.c ssh-agent.c bufec.c groupaccess.c
         dns.c packet.c readpass.c authfd.c moduli.c]
         bye, bye xfree(); ok markus@

commit c7aad0058c957afeb26a3f703e8cb0eddeb62365
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 07:18:47 2013 +1000

     - (dtucker) [configure.ac defines.h] Test for fd_mask, howmany and NFDBITS
       rather than trying to enumerate the plaforms that don't have them.
       Based on a patch from Nathan Osman, with help from tim@.

commit c0c3373216801797053e123b5f62d35bf41b3611
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 2 06:28:03 2013 +1000

     - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
       using openssl's DES_crpyt function on platorms that don't have a native
       one, eg Android.  Based on a patch from Nathan Osman.

commit efdf5342143a887013a1daae583167dadf6752a7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 30 08:29:08 2013 +1000

      - (dtucker) [configure.ac openbsd-compat/bsd-misc.h] bz#2087: Add a null
        implementation of endgrent for platforms that don't have it (eg Android).
        Loosely based on a patch from Nathan Osman, ok djm

commit 9b42d327380e5cd04efde6fb70e1535fecedf0d7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 20:48:59 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/17 10:35:43
         [regress/scp.sh]
         use a file extention that's not special on some platforms.  from portable
         (id sync only)

commit 0a404b0ed79ba45ccaf7ed5528a8f5004c3698cb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 20:47:29 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/17 10:34:30
         [regress/portnum.sh]
         use a more portable negated if structure.  from portable (id sync only)

commit 62ee222e6f3f5ee288434f58b5136ae3d56f5164
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 20:46:00 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/17 10:33:09
         [regress/agent-getpeereid.sh]
         don't redirect stdout from sudo.  from portable (id sync only)

commit 00478d30cb4bcc18dc1ced8144d16b03cdf790f6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 20:45:06 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/17 10:30:07
         [regress/test-exec.sh]
         wait a bit longer for startup and use case for absolute path.
         from portable (id sync only)

commit 98989eb95eef0aefed7e9fb4e65c2f625be946f6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 20:44:09 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/17 10:28:11
         [regress/sftp.sh]
         only compare copied data if sftp succeeds.  from portable (id sync only)

commit 438f60eb9a5f7cd40bb242cfec865e4fde71b07c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 20:43:13 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/17 10:26:26
         [regress/sftp-badcmds.sh]
         remove unused BATCH variable. (id sync only)

commit 1466bd25a8d1ff7ae455a795d2d7d52dc17d2938
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 20:42:05 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/17 10:24:48
         [localcommand.sh]
         use backticks for portability. (id sync only)

commit 05b5e518c9969d63471f2ccfd85b1de6e724d30b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 20:41:07 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/17 10:23:52
         [regress/login-timeout.sh regress/reexec.sh regress/test-exec.sh]
         Use SUDO when cat'ing pid files and running the sshd log wrapper so that
         it works with a restrictive umask and the pid files are not world readable.
         Changes from -portable.  (id sync only)

commit dd669173f93ea8c8397e0af758eaf13ab4f1c591
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 20:39:57 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/17 10:16:26
         [regress/try-ciphers.sh]
         use expr for math to keep diffs vs portable down
         (id sync only)

commit 044f32f4c6fd342f9f5949bb0ca77624c0db4494
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 20:12:57 2013 +1000

     - (dtucker) [regress/cfgmatch.sh] Remove unneeded sleep renderd obsolete by
       rev 1.6 which calls wait.

commit 9cc8ff7b63f175661c8807006f6d2649d56ac402
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 20:01:52 2013 +1000

     - (dtucker) [regress/runtests.sh] Remove obsolete test driver script.

commit f8d5b3451726530a864b172c556c311370c244e1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 19:53:25 2013 +1000

     - (dtucker) [regress/stderr-after-eof.sh regress/test-exec.sh] Move the md5
       helper function to the portable part of test-exec.sh.

commit 6f66981ed3c6bb83b937959f329323975e356c33
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 19:28:51 2013 +1000

     - (dtucker) [regress/test-exec.sh] Move the portable-specific functions
       together and add a couple of missing lines from openbsd.

commit 5f1a89a3b67264f4aa83e057cd4f74fd60b9ffa4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 19:17:58 2013 +1000

     - (dtucker) [regress/integrity.sh regress/krl.sh regress/test-exec.sh]
       Move the jot helper function to portable-specific part of test-exec.sh.

commit 96457a54d05dea81f34ecb4e059d2f8b98382b85
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 19:03:38 2013 +1000

     - (dtucker) [regress/agent-getpeereid.sh] Resync spaces with openbsd.

commit 7f193236594e8328ad133ea05eded31f837b45b5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 19:02:28 2013 +1000

     - (dtucker) [regress/cfgmatch.sh] Resync config file setup with openbsd.

commit 8654dd2d737800d09e7730b3dfc2a54411f4cf90
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 16:03:48 2013 +1000

     - (dtucker) [openbsd-compat/getopt.h] Remove unneeded bits.

commit 59d928d3b47e8298f4a8b4b3fb37fb8c8ce1b098
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 15:32:29 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/17 04:29:14
         [regress/sftp.sh regress/putty-ciphers.sh regress/cipher-speed.sh
         regress/test-exec.sh regress/sftp-batch.sh regress/dynamic-forward.sh
         regress/putty-transfer.sh regress/conch-ciphers.sh regress/sftp-cmds.sh
         regress/scp.sh regress/ssh-com-sftp.sh regress/rekey.sh
         regress/putty-kex.sh regress/stderr-data.sh regress/stderr-after-eof.sh
         regress/sftp-badcmds.sh regress/reexec.sh regress/ssh-com-client.sh
         regress/sftp-chroot.sh regress/forwarding.sh regress/transfer.sh
         regress/multiplex.sh]
         Move the setting of DATA and COPY into test-exec.sh

commit 34035be27b7ddd84706fe95c39d37cba7d5c9572
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 14:47:51 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/17 01:32:11
         [regress/integrity.sh]
         don't print output from ssh before getting it (it's available in ssh.log)

commit b8b96b0aa634d440feba4331c80ae4de9dda2081
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 14:46:20 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/17 01:16:09
         [regress/agent-timeout.sh]
         Pull back some portability changes from -portable:
          - TIMEOUT is a read-only variable in some shells
          - not all greps have -q so redirect to /dev/null instead.
         (ID sync only)

commit a40d97ff46831c9081a6a4472036689360847fb1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 14:44:53 2013 +1000

    sync missing ID

commit 56347efe796a0506e846621ae65562b978e45f1d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 13:28:36 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/17 00:37:40
         [regress/agent.sh regress/keytype.sh regress/cfgmatch.sh
         regress/forcecommand.sh regress/proto-version.sh regress/test-exec.sh
         regress/cipher-speed.sh regress/cert-hostkey.sh regress/cert-userkey.sh
         regress/ssh-com.sh]
         replace 'echo -n' with 'printf' since it's more portable
         also remove "echon" hack.

commit 91af05c5167fe0aa5bd41d2e4a83757d9f627c18
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 13:16:59 2013 +1000

     - (dtucker) [regress/integrity.sh].  Force fixed Diffie-Hellman key exchange
       methods.  When the openssl version doesn't support ECDH then next one on
       the list is DH group exchange, but that causes a bit more traffic which can
       mean that the tests flip bits in the initial exchange rather than the MACed
       traffic and we get different errors to what the tests look for.

commit 6e1e60c3c2e16c32bb7ca0876caaa6182a4e4b2c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 11:23:41 2013 +1000

     - (dtucker) [regress/bsd.regress.mk] Remove unused file.  We've never used it
       in portable and it's long gone in openbsd.

commit 982b0cbc4c2b5ea14725f4b339393cdf343dd0fe
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 09:45:12 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/16 05:48:31
         [regress/rekey.sh]
         add tests for RekeyLimit parsing

commit 14490fe7b0f45b1b19f8a3dc10eb3d214f27f5bd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 09:44:20 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/16 04:26:10
         [regress/rekey.sh]
         add server-side rekey test

commit c31c8729c15f83fba14ef9da0d66bda6215ff69a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 09:43:33 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/16 03:33:30
         [regress/rekey.sh]
         test rekeying when there's no data being transferred

commit a8a62fcc46c19997797846197a6256ed9a777a47
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 09:42:34 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/16 02:10:35
         [rekey.sh]
         Add test for time-based rekeying

commit 5e95173715d516e6014485e2b6def1fb3db84036
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 09:41:33 2013 +1000

       - djm@cvs.openbsd.org 2013/05/10 03:46:14
         [modpipe.c]
         sync some portability changes from portable OpenSSH (id sync only)

commit a4df65b9fc68a555a7d8781700475fb03ed6e694
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 09:37:31 2013 +1000

       - dtucker@cvs.openbsd.org 2013/04/22 07:28:53
         [multiplex.sh]
         Add tests for -Oforward and -Ocancel for local and remote forwards

commit 40aaff7e4bcb05b05e3d24938b6d34885be817da
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 09:36:20 2013 +1000

       - dtucker@cvs.openbsd.org 2013/04/22 07:23:08
         [multiplex.sh]
         Write mux master logs to regress.log instead of ssh.log to keep separate

commit f3568fc62b73b50a0a3c8447e4a00f4892cab25e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 09:35:26 2013 +1000

       - djm@cvs.openbsd.org 2013/04/18 02:46:12
         [Makefile regress/sftp-chroot.sh]
         test sshd ChrootDirectory+internal-sftp; feedback & ok dtucker@

commit dfea3bcdd7c980c2335402464b7dd8d8721e426d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 09:31:39 2013 +1000

       - dtucker@cvs.openbsd.org 2013/04/07 02:16:03
         [regress/Makefile regress/rekey.sh regress/integrity.sh
         regress/sshd-log-wrapper.sh regress/forwarding.sh regress/test-exec.sh]
         use -E option for ssh and sshd to write debuging logs to ssh{,d}.log and
         save the output from any failing tests.  If a test fails the debug output
         from ssh and sshd for the failing tests (and only the failing tests) should
         be available in failed-ssh{,d}.log.

commit 75129025a2d504b630d1718fef0da002f5662f63
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 09:19:10 2013 +1000

       - dtucker@cvs.openbsd.org 2013/04/06 06:00:22
         [regress/rekey.sh regress/test-exec.sh regress/integrity.sh
         regress/multiplex.sh Makefile regress/cfgmatch.sh]
         Split the regress log into 3 parts: the debug output from ssh, the debug
         log from sshd and the output from the client command (ssh, scp or sftp).
         Somewhat functional now, will become more useful when ssh/sshd -E is added.

commit 7c8b1e72331293b4707dc6f7f68a69e975a3fa70
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 09:10:20 2013 +1000

       - dtucker@cvs.openbsd.org 2013/03/23 11:09:43
         [test-exec.sh]
         Only regenerate host keys if they don't exist or if ssh-keygen has changed
         since they were.  Reduces test runtime by 5-30% depending on machine
         speed.

commit 712de4d1100963b11bc618472f95ce36bf7e2ae3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 17 09:07:12 2013 +1000

      - djm@cvs.openbsd.org 2013/03/07 00:20:34
         [regress/proxy-connect.sh]
         repeat test with a style appended to the username

commit 09c0f0325b2f538de9a1073e03b8ef26dece4c16
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:48:57 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/16 10:44:06
         [servconf.c]
         remove another now-unused variable

commit 9113d0c2381202412c912a20c8083ab7d6824ec9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:48:14 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/16 10:43:34
         [servconf.c readconf.c]
         remove now-unused variables

commit e194ba4111ffd47cd1f4c8be1ddc8a4cb673d005
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:47:31 2013 +1000

     - (dtucker) [configure.ac readconf.c servconf.c
         openbsd-compat/openbsd-compat.h] Add compat bits for scan_scaled.

commit b7ee8521448100e5b268111ff90feb017e657e44
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:33:10 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/16 09:12:31
         [readconf.c servconf.c]
         switch RekeyLimit traffic volume parsing to scan_scaled.  ok djm@

commit dbee308253931f8c1aeebf781d7e7730ff6a0dc1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:32:29 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/16 09:08:41
         [log.c scp.c sshd.c serverloop.c schnorr.c sftp.c]
         Fix some "unused result" warnings found via clang and -portable.
         ok markus@

commit 64d22946d664dad8165f1fae9e78b53831ed728d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:31:29 2013 +1000

       - jmc@cvs.openbsd.org 2013/05/16 06:30:06
         [sshd_config.5]
         oops! avoid Xr to self;

commit 63e0df2b936770baadc8844617b99e5174b476d0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:30:31 2013 +1000

       - jmc@cvs.openbsd.org 2013/05/16 06:28:45
         [ssh_config.5]
         put IgnoreUnknown in the right place;

commit 0763698f71efef8b3f8460c5700758359219eb7c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:30:03 2013 +1000

       - djm@cvs.openbsd.org 2013/05/16 04:27:50
         [ssh_config.5 readconf.h readconf.c]
         add the ability to ignore specific unrecognised ssh_config options;
         bz#866; ok markus@

commit 5f96f3b4bee11ae2b9b32ff9b881c3693e210f96
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:29:28 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/16 04:09:14
         [sshd_config.5 servconf.c servconf.h packet.c serverloop.c monitor.c sshd_config
         sshd.c] Add RekeyLimit to sshd with the same syntax as the client allowing
         rekeying based on traffic volume or time.  ok djm@, help & ok jmc@ for the man
         page.

commit c53c2af173cf67fd1c26f98e7900299b1b65b6ec
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:28:16 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/16 02:00:34
         [ssh_config sshconnect2.c packet.c readconf.h readconf.c clientloop.c
         ssh_config.5 packet.h]
         Add an optional second argument to RekeyLimit in the client to allow
         rekeying based on elapsed time in addition to amount of traffic.
         with djm@ jmc@, ok djm

commit 64c6fceecd27e1739040b42de8f3759454260b39
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:27:14 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/10 10:13:50
         [ssh-pkcs11-helper.c]
         remove unused extern optarg.  ok markus@

commit caf00109346e4ab6bb495b0e22bc5b1e7ee22f26
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:26:18 2013 +1000

       - djm@cvs.openbsd.org 2013/05/10 04:08:01
         [key.c]
         memleak in cert_free(), wasn't actually freeing the struct;
         bz#2096 from shm AT digitalsun.pl

commit 7e831edbf7a1b0b9aeeb08328b9fceafaad1bf22
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:25:40 2013 +1000

    add missing attribution

commit 54da6be320495604ddf65d10ac4cc8cf7849c533
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:25:04 2013 +1000

       - djm@cvs.openbsd.org 2013/05/10 03:40:07
         [sshconnect2.c]
         fix bzero(ptr_to_struct, sizeof(ptr_to_struct)); bz#2100 from

commit 5d8b702d95c0dfc338726fecfbb709695afd1377
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:24:23 2013 +1000

       - dtucker@cvs.openbsd.org 2013/05/06 07:35:12
         [sftp-server.8]
         Reference the version of the sftp draft we actually implement.  ok djm@

commit 026d9db3fbe311b5a7e98d62472cb666aa559648
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:23:52 2013 +1000

       - tedu@cvs.openbsd.org 2013/04/24 16:01:46
         [misc.c]
         remove extra parens noticed by nicm

commit 2ca51bf140ef2c2409fd220778529dc17c11d8fa
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 16 20:22:46 2013 +1000

       - tedu@cvs.openbsd.org 2013/04/23 17:49:45
         [misc.c]
         use xasprintf instead of a series of strlcats and strdup. ok djm

commit 6aa3eacc5e5f39702b6dd5b27970d9fd97bc2383
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 16 11:10:17 2013 +1000

     - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be
        executed if mktemp failed; bz#2105 ok dtucker@

commit c54e3e0741a27119b3badd8ff92b1988b7e9bd50
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 10 18:53:14 2013 +1000

     - (dtucker) [configure.ac] Add -Werror to the -Qunused-arguments test so
       we don't get a warning on compilers that *don't* support it.  Add
       -Wno-unknown-warning-option.  Move both to the start of the list for
       maximum noise suppression.  Tested with gcc 4.6.3, gcc 2.95.4 and clang 2.9.

commit a75d247a18a5099c60226395354eb252c097ac86
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 10 18:11:55 2013 +1000

     - (dtucker) [kex.c] Only include sha256 and ECC key exchange methods when the
       underlying libraries support them.

commit 0abfb559e3f79d1f217773510d7626c3722aa3c1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 10 18:08:49 2013 +1000

    - (dtucker) [openbsd-compat/getopt.h openbsd-compat/getopt_long.c
      openbsd-compat/openbsd-compat.h] pull in getopt.h from openbsd and plumb
      in to use it when we're using our own getopt.

commit ccfdfceacb7e23d1479ed4cc91976c5ac6e23c56
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 10 16:28:55 2013 +1000

     - (dtucker) [openbsd-compat/Makefile.in openbsd-compat/getopt.c
       openbsd-compat/getopt_long.c regress/modpipe.c] Remove getopt.c, add
       portability code to getopt_long.c and switch over Makefile and the ugly
       hack in modpipe.c.  Fixes bz#1448.

commit 39332020078aa8fd4fc28e00b336438dc64b0f5a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 10 15:38:11 2013 +1000

     - (dtucker) [openbsd-compat/getopt_long.c] Import from OpenBSD.  No
       portability changes yet.

commit 35b2fe99bee4f332d1c1efa49107cdb3c67da07a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 10 15:35:26 2013 +1000

     - (dtucker) [openbsd-compat/getopt.c] Factor out portibility changes to
       getopt.c.  Preprocessed source is identical other than line numbers.

commit abbc7a7c02e45787d023f50a30f62d7a3e14fe9e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 10 13:54:23 2013 +1000

     - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler
       supports it.  Mentioned by Colin Watson in bz#2100, ok djm.

commit bc02f163f6e882d390abfb925b47b41e13ae523b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 19:25:49 2013 +1000

       - dtucker@cvs.openbsd.org 2013/04/22 01:17:18
         [mux.c]
         typo in debug output: evitval->exitval

commit f8b894e31dc3530c7eb6d0a378848260d54f74c4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 19:25:29 2013 +1000

       - djm@cvs.openbsd.org 2013/04/19 12:07:08
         [kex.c]
         remove duplicated list entry pointed out by naddy@

commit 34bd20a1e53b63ceb01f06c1654d9112e6784b0a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 19:25:00 2013 +1000

       - djm@cvs.openbsd.org 2013/04/19 11:10:18
         [ssh.c]
         add -Q to usage; reminded by jmc@

commit ea11119eee3c5e2429b1f5f8688b25b028fa991a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 19:24:32 2013 +1000

       - djm@cvs.openbsd.org 2013/04/19 01:06:50
         [authfile.c cipher.c cipher.h kex.c kex.h kexecdh.c kexecdhc.c kexecdhs.c]
         [key.c key.h mac.c mac.h packet.c ssh.1 ssh.c]
         add the ability to query supported ciphers, MACs, key type and KEX
         algorithms to ssh. Includes some refactoring of KEX and key type handling
         to be table-driven; ok markus@

commit a56086b9903b62c1c4fdedf01b68338fe4dc90e4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:24:18 2013 +1000

       - djm@cvs.openbsd.org 2013/04/19 01:03:01
         [session.c]
         reintroduce 1.262 without the connection-killing bug:
         fatal() when ChrootDirectory specified by running without root privileges;
         ok markus@

commit 0d6771b4648889ae5bc4235f9e3fc6cd82b710bd
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:23:24 2013 +1000

       - djm@cvs.openbsd.org 2013/04/19 01:01:00
         [ssh-keygen.c]
         fix some memory leaks; bz#2088 ok dtucker@

commit 467b00c38ba244f9966466e57a89d003f3afb159
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:23:07 2013 +1000

       - djm@cvs.openbsd.org 2013/04/19 01:00:10
         [sshd_config.5]
         document the requirment that the AuthorizedKeysCommand be owned by root;
         ok dtucker@ markus@

commit 9303e6527bb5ca7630c765f28624702c212bfd6c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:22:40 2013 +1000

       - djm@cvs.openbsd.org 2013/04/18 02:16:07
         [sftp.c]
         make "sftp -q" do what it says on the sticker: hush everything but errors;

commit f1a02aea35504e8bef2ed9eef6f9ddeab12bacb3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:22:13 2013 +1000

       - dtucker@cvs.openbsd.org 2013/04/17 09:04:09
         [session.c]
         revert rev 1.262; it fails because uid is already set here.  ok djm@

commit d5edefd27a30768cc7a4817302e964b6cb2f9be7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:21:39 2013 +1000

       - djm@cvs.openbsd.org 2013/04/11 02:27:50
         [packet.c]
         quiet disconnect notifications on the server from error() back to logit()
         if it is a normal client closure; bz#2057 ok+feedback dtucker@

commit 6901032b05291fc5d2bd4067fc47904de3506fda
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:21:24 2013 +1000

       - dtucker@cvs.openbsd.org 2013/04/07 09:40:27
         [sshd.8]
         clarify -e text. suggested by & ok jmc@

commit 03d4d7e60b16f913c75382e32e136ddfa8d6485f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:21:06 2013 +1000

       - dtucker@cvs.openbsd.org 2013/04/07 02:10:33
         [log.c log.h ssh.1 ssh.c sshd.8 sshd.c]
         Add -E option to ssh and sshd to append debugging logs to a specified file
         instead of stderr or syslog.  ok markus@, man page help jmc@

commit 37f1c08473b1ef2a188ee178ce2e11e841f88563
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:20:43 2013 +1000

       - markus@cvs.openbsd.org 2013/04/06 16:07:00
         [channels.c sshd.c]
         handle ECONNABORTED for accept(); ok deraadt some time ago...

commit 172859cff7df9fd8a29a1f0a4de568f644bbda50
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:19:27 2013 +1000

       - djm@cvs.openbsd.org 2013/04/05 00:58:51
         [mux.c]
         cleanup mux-created channels that are in SSH_CHANNEL_OPENING state too
         (in addition to ones already in OPEN); bz#2079, ok dtucker@

commit 9f12b5dcd5f7772e633fb2786c63bfcbea1f1aea
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:19:11 2013 +1000

       - djm@cvs.openbsd.org 2013/04/05 00:31:49
         [pathnames.h]
         use the existing _PATH_SSH_USER_RC define to construct the other
         pathnames; bz#2077, ok dtucker@ (no binary change)

commit d677ad14ff7efedf21745ee1694058350e758e18
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:18:51 2013 +1000

       - djm@cvs.openbsd.org 2013/04/05 00:14:00
         [auth2-gss.c krl.c sshconnect2.c]
         hush some {unused, printf type} warnings

commit 508b6c3d3b95c8ec078fd4801368597ab29b2db9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:18:28 2013 +1000

       - djm@cvs.openbsd.org 2013/03/08 06:32:58
         [ssh.c]
         allow "ssh -f none ..." ok markus@

commit 91a55f28f35431f9000b95815c343b5a18fda712
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:18:10 2013 +1000

       - markus@cvs.openbsd.org 2013/03/07 19:27:25
         [auth.h auth2-chall.c auth2.c monitor.c sshd_config.5]
         add submethod support to AuthenticationMethods; ok and freedback djm@

commit 4ce189d9108c62090a0dd5dea973d175328440db
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:17:52 2013 +1000

       - djm@cvs.openbsd.org 2013/03/07 00:19:59
         [auth2-pubkey.c monitor.c]
         reconstruct the original username that was sent by the client, which may
         have included a style (e.g. "root:skey") when checking public key
         signatures. Fixes public key and hostbased auth when the client specified
         a style; ok markus@

commit 5cbec4c25954b184e43bf3d3ac09e65eb474f5f9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:17:12 2013 +1000

       - djm@cvs.openbsd.org 2013/03/06 23:36:53
         [readconf.c]
         g/c unused variable (-Wunused)

commit 998cc56b65682d490c9bbf5977dceb1aa84a0233
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:16:43 2013 +1000

       - djm@cvs.openbsd.org 2013/03/06 23:35:23
         [session.c]
         fatal() when ChrootDirectory specified by running without root privileges;
         ok markus@

commit 62e9c4f9b6027620f9091a2f43328e057bdb33f1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 15:15:49 2013 +1000

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2013/03/05 20:16:09
         [sshconnect2.c]
         reset pubkey order on partial success; ok djm@

commit 6332da2ae88db623d7da8070dd807efa26d9dfe8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 14:25:52 2013 +1000

     - (djm) [auth.c configure.ac misc.c monitor.c monitor_wrap.c] Support
       platforms, such as Android, that lack struct passwd.pw_gecos. Report
       and initial patch from Nathan Osman bz#2086; feedback tim@ ok dtucker@

commit ce1c9574fcfaf753a062276867335c1e237f725c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Apr 18 21:36:19 2013 +1000

     - (dtucker) [configure.ac] Use -Qunused-arguments to suppress warnings from
       unused argument warnings (in particular, -fno-builtin-memset) from clang.

commit bc68f2451b836e6a3fa65df8774a8b1f10049ded
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 18 11:26:25 2013 +1000

     - (djm) [config.guess config.sub] Update to last versions before they switch
        to GPL3. ok dtucker@

commit 15fd19c4c9943cf02bc6f462d52c86ee6a8f422e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 5 11:22:26 2013 +1100

       - djm@cvs.openbsd.org 2013/02/22 22:09:01
         [ssh.c]
         Allow IdenityFile=none; ok markus deraadt (and dtucker for an earlier
         version)

commit 5d1d9541a7c83963cd887b6b36e25b46463a05d4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 5 11:20:00 2013 +1100

       - markus@cvs.openbsd.org 2013/02/22 19:13:56
         [sshconnect.c]
         support ProxyCommand=- (stdin/out already point to the proxy); ok djm@

commit aefa3682431f59cf1ad9a0f624114b135135aa44
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 5 11:18:35 2013 +1100

       - dtucker@cvs.openbsd.org 2013/02/22 04:45:09
         [ssh.c readconf.c readconf.h]
         Don't complain if IdentityFiles specified in system-wide configs are
         missing.  ok djm, deraadt

commit f3c38142435622d056582e851579d8647a233c7f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 5 11:16:52 2013 +1100

       - dtucker@cvs.openbsd.org 2013/02/19 02:12:47
         [krl.c]
         Remove bogus include.  ok djm
    (id sync only)

commit 1910478c2d2c3d0e1edacaeff21ed388d70759e9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 5 11:13:08 2013 +1100

       - dtucker@cvs.openbsd.org 2013/02/17 23:16:57
         [readconf.c ssh.c readconf.h sshconnect2.c]
         Keep track of which IndentityFile options were manually supplied and which
         were default options, and don't warn if the latter are missing.
         ok markus@

commit c9627cdbc65b25da943f24e6a953da899f08eefc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Apr 1 12:40:48 2013 +1100

     - (dtucker) [openbsd-compat/bsd-cygwin_util.{c,h}] Don't include windows.h
       to avoid conflicting definitions of __int64, adding the required bits.
       Patch from Corinna Vinschen.

commit 75db01d2ce29a85f8e5a2aff2011446896cf3f8a
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Mar 22 10:14:32 2013 -0700

     - (tim) [Makefile.in] remove some duplication introduced in 20130220 commit.

commit 221b4b2436ac78a65c3b775c25ccd396a1fed208
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Mar 22 12:51:09 2013 +1100

     - (dtucker) [includes.h] Check if _GNU_SOURCE is already defined before
       defining it again.  Prevents warnings if someone, eg, sets it in CFLAGS.

commit c8a0f27c6d761d1335d13ed84d773e9ddf1d95c8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Mar 22 12:49:14 2013 +1100

     - (dtucker) [configure.ac] Add stdlib.h to zlib check for exit() prototype.

commit eed8dc261018aea4d6b8606ca3addc9f8cf9ed1e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 22 10:25:22 2013 +1100

     - (djm) Release 6.2p1

commit 83efe7c86168cc07b8e6cc6df6b54f7ace3b64a3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 22 10:17:36 2013 +1100

     - (djm) [contrib/ssh-copy-id contrib/ssh-copy-id.1] Updated to Phil
        Hands' greatly revised version.

commit 63b4bcd04e1c57b77eabb4e4d359508a4b2af685
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 20 12:55:14 2013 +1100

     - (djm) [configure.ac log.c scp.c sshconnect2.c openbsd-compat/vis.c]
       [openbsd-compat/vis.h] FreeBSD's strnvis isn't compatible with OpenBSD's
       so mark it as broken. Patch from des AT des.no

commit aa86c3970f24fc22185a9561ae84eeae0c6d15cd
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Mar 16 20:55:46 2013 -0700

     - (tim) [configure.ac] OpenServer 5 wants lastlog even though it has none
       of the bits the configure test looks for.

commit 585284019020eccaf0ce744df198bd56b6aa109f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 15 11:22:37 2013 +1100

     - (djm) [session.c] FreeBSD needs setusercontext(..., LOGIN_SETUMASK) to
       occur after UID switch; patch from John Marshall via des AT des.no;
       ok dtucker@

commit f4db77d7668104c1237636781cfbd59ef30f79b0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 15 10:34:25 2013 +1100

     - (djm) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
       Add a usleep replacement for platforms that lack it; ok dtucker

commit a2438bbd28eb35a8968d193ac89b30a90e96f719
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 15 10:23:07 2013 +1100

     - (djm) [configure.ac] Disable utmp, wtmp and/or lastlog if the platform
        is unable to successfully compile them. Based on patch from des AT
        des.no

commit aa97d13fa22d410ad155d23b230fd3cce989ce25
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 12 11:31:05 2013 +1100

     - (dtucker) [auth.c configure.ac platform.c platform.h] Accept uid 2 ("bin")
       in addition to root as an owner of system directories on AIX and HP-UX.
       ok djm@

commit fe10a28e088751ec3a6ac96e73be21bae8b86d70
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 12 11:19:40 2013 +1100

     - (dtucker) [regress/Makefile regress/cipher-speed.sh regress/test-exec.sh]
       Improve portability of cipher-speed test, based mostly on a patch from
       Iain Morgan.

commit e4f43478228256ddbbce3b7f0c312ff5c707b667
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 8 12:14:22 2013 +1100

     - (djm) [configure.ac] Add a timeout to the select/rlimit test to give it a
        chance to complete on broken systems; ok dtucker@

commit 2b6ea47106537cff31c863d05062ac97efe3f132
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 7 07:37:13 2013 -0800

     - (tim) [Makefile.in] Add another missing $(EXEEXT) I should have seen 3 days
       ago.

commit 4d1a0fe02916450242a0546fb68aa8261494254d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 7 20:14:34 2013 +1100

    remove extra word

commit 9243ef086fa1afa804c7870fd1be7b466934c048
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 7 20:06:13 2013 +1100

     - (dtucker) [defines.h] Remove SIZEOF_CHAR bits since the test for it is
       was removed in configure.ac rev 1.481 as it was redundant.

commit b3cd5037425c6541722745bef69ee52133d3491b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 7 12:33:35 2013 +1100

     - (dtucker) [INSTALL] Bump documented autoconf version to what we're
       currently using.

commit ff008ded7f9641c03fcbe44aedb51040e04c93e5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 6 17:48:48 2013 +1100

     - (dtucker) [configure.ac] test that we can set number of file descriptors
       to zero with setrlimit before enabling the rlimit sandbox.  This affects
       (at least) HPUX 11.11.

commit 834a0d6d541faf7d8e8aa8116eaf594746239275
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 6 14:06:48 2013 +1100

     - (dtucker) [regress/forward-control.sh] Wait longer for the forwarding
      connection to start so that the test works on slower machines.

commit ff8bda8f05e85b1196ec3a135d9970c475bcdcdb
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Mar 5 14:23:58 2013 -0800

     - (tim) [Makefile.in] Add missing $(EXEEXT). Found by Roumen Petrov.

commit 29c7151d2055ce8469e07e6ac40b1c5b18bfeff0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 5 21:50:09 2013 +1100

     - (dtucker) [Makefile.in] Remove trailing "\" on PATHS, which caused obscure
       build breakage on (at least) HP-UX 11.11.  Found by Amit Kulkarni and Kevin
       Brott.

commit fef9f7c3d104dd2ecc9af93450c57abd66384737
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 5 20:02:24 2013 +1100

    add Amit.

commit 5f0e54c8924e7f2391342cfd8198bd92e28d726f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 5 19:57:39 2013 +1100

     - (dtucker) [configure.ac] use "=" for shell test and not "==".  Spotted by
       Kevin Brott.

commit 43e5e60badb827104363169c333b0b7eadb0d09a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 5 09:49:00 2013 +1100

     - (djm) [regress/modpipe.c] Compilation fix for AIX and parsing fix for
       HP/UX. Spotted by Kevin Brott

commit 21f591b6d975301fd005b4c031dffa0efefded08
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 26 22:48:31 2013 -0800

     - (tim) [regress/krl.sh] keep old solaris awk from hanging.

commit ada7e17ae504b0bbbc04e380986f41ee8f67c437
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 26 21:49:09 2013 -0800

     - (tim) [regress/integrity.sh] keep old solaris awk from hanging.

commit f9e2060ca9d350733ac82ed9858b010a2b1ba5c1
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 26 20:27:29 2013 -0800

     - (tim) [regress/integrity.sh] shell portability fix.

commit a514bc05b180c8fb3b11a387b20513743fb1837d
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 26 19:35:26 2013 -0800

     - (tim) [regress/forward-control.sh] use sh in case login shell is csh.

commit c0cc7ce1669d15cd1302d2d2ef9a704b5e680aee
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 27 10:48:18 2013 +1100

     - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Crank version numbers

commit 6c21bb8c4ae2104f8fff44a9a966897353175b4d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 26 19:41:30 2013 +1100

     - (djm) [regress/integrity.sh] Run sshd via $SUDO; fixes tinderbox breakage
       for UsePAM=yes configuration

commit 1e657d592d1afa169ffb0a7a1a407b4fe5c97686
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 26 18:58:06 2013 +1100

       - djm@cvs.openbsd.org 2013/02/20 08:27:50
         [integrity.sh]
         Add an option to modpipe that warns if the modification offset it not
         reached in it's stream and turn it on for t-integrity. This should catch
         cases where the session is not fuzzed for being too short (cf. my last
         "oops" commit)

commit 03978c61f32935b31337844aa25d87dc0edd39d2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 25 11:24:44 2013 +1100

     - (dtucker) [configure.ac ssh-gss.h] bz#2073: additional #includes needed
       to use Solaris native GSS libs.  Patch from Pierre Ossman.

commit a423fefb89519814ab4a7a44001268648c58ff36
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 25 10:32:27 2013 +1100

    welcome to 2013

commit b87f6b70f894952b74443c8ef1b86323e7c9f465
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 23 09:12:23 2013 +1100

     - (djm) [configure.ac includes.h loginrec.c mux.c sftp.c] Prefer
       bsd/libutil.h to libutil.h to avoid deprecation warnings on Ubuntu.
       ok tim

commit 91f40d8592562b804813a320a4ac3871dbaaf433
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 22 11:37:00 2013 +1100

     - (djm) [configure.ac sandbox-seccomp-filter.c] Support for Linux
        seccomp-bpf sandbox on ARM. Patch from shawnlandden AT gmail.com;
           ok dtucker

commit a2b5a4c746871bd32a12a00548ccf1a9c3c21101
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 22 10:43:15 2013 +1100

     - (dtucker) [configure.ac] bz#2073: look for Solaris' differently-named
       libgss too.  Patch from Pierre Ossman, ok djm.

commit 964de184a8bbb85b1992176c28963f6115c780e1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 22 10:39:59 2013 +1100

     - (dtucker) [Makefile.in configure.ac] bz#2072: don't link krb5 libs to
       ssh(1) since they're not needed.  Patch from Pierre Ossman.

commit 0ec742369243cb4ffaaa0b2938cae9a96dfd27c5
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Feb 20 21:37:55 2013 -0800

     - (tim) [regress/forward-control.sh] shell portability fix.

commit 5acc6be9818e0cd0a6fd95f9d7b65de331ee46d3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 20 21:16:07 2013 +1100

       - djm@cvs.openbsd.org 2013/02/20 08:29:27
         [regress/modpipe.c]
         s/Id/OpenBSD/ in RCS tag

commit 283e575a7db49addd1cffe1a7cb6c5503a98e027
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 20 21:13:27 2013 +1100

       - djm@cvs.openbsd.org 2013/02/20 08:27:50
         [regress/integrity.sh regress/modpipe.c]
         Add an option to modpipe that warns if the modification offset it not
         reached in it's stream and turn it on for t-integrity. This should catch
         cases where the session is not fuzzed for being too short (cf. my last
         "oops" commit)

commit c31db8cd6e301c8d4024cb9250e3178d13d1be44
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 19 19:01:51 2013 -0800

     - (tim) [krl.c Makefile.in regress/Makefile regress/modpipe.c] remove unneeded
       err.h include from krl.c. Additional portability fixes for modpipe. OK djm

commit c08b3ef6f435b64c3b7125f93e5b3e661e019f3e
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 19 11:53:29 2013 -0800

     - (tim) [regress/cipher-speed.sh regress/try-ciphers.sh] shell portability fix.

commit dae85cc3ad02a068b58f42fddc2ccc4f3a9b8311
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 14:27:44 2013 +1100

     - (djm) [regress/integrity.sh] Skip SHA2-based MACs on configurations that
       lack support for SHA2.

commit b3764e12024e70296d35877a3da2c4d575dafdb9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 13:15:01 2013 +1100

       - djm@cvs.openbsd.org 2013/02/19 02:14:09
         [integrity.sh]
         oops, forgot to increase the output of the ssh command to ensure that
         we actually reach $offset

commit 0dc3bc908e702cc2db460446f11628654c9c602e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 09:28:32 2013 +1100

       - djm@cvs.openbsd.org 2013/02/18 22:26:47
         [integrity.sh]
         crank the offset yet again; it was still fuzzing KEX one of Darren's
         portable test hosts at 2800

commit 33d52566bc8e36091b74fbd532df1bc4d2368576
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 18 10:18:05 2013 +1100

       - djm@cvs.openbsd.org 2013/02/17 23:16:55
         [integrity.sh]
         make the ssh command generates some output to ensure that there are at
         least offset+tries bytes in the stream.

commit 5d7b9565bc2cc2b0734a6e8b0b7ab781745d35f9
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 16 17:32:31 2013 +1100

       - djm@cvs.openbsd.org 2013/02/16 06:08:45
         [integrity.sh]
         make sure the fuzz offset is actually past the end of KEX for all KEX
         types. diffie-hellman-group-exchange-sha256 requires an offset around
         2700. Noticed via test failures in portable OpenSSH on platforms that
         lack ECC and this the more byte-frugal ECDH KEX algorithms.

commit 2991d288db4355a54f0860be184c31343cb2c139
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 15 14:55:38 2013 +1100

     - (dtucker) [openbsd-compat/bsd-misc.c] Handle the case where setpgrp() takes
       an argument.  Pointed out by djm.

commit f32db83f41cc0c1355ae28fd9df464ea56562d2d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 15 12:20:41 2013 +1100

     - (dtucker) [openbsd-compat/openbsd-compat.h] Add prototype for strtoul,
       group strto* function prototypes together.

commit 5ceddc31cd654303086c81e0b17b73c4c6af5a5c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 15 12:18:32 2013 +1100

       - dtucker@cvs.openbsd.org 2013/02/15 00:21:01
         [sshconnect2.c]
         Warn more loudly if an IdentityFile provided by the user cannot be read.
         bz #1981, ok djm@

commit 8e6fb780e54f484e3dca4f1bf0abcd9bf13f092f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 15 12:13:01 2013 +1100

     - (dtucker) [configure.ac openbsd-compat/Makefile.in openbsd-compat/strtoull.c
       openbsd-compat/openbsd-compat.h] Add strtoull to compat library for
       platforms that don't have it.

commit 62e4edc797a284f551e7faa616af06f8c3c24015
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 15 11:50:03 2013 +1100

    spacing

commit 3c4a24c3e329ccca86629ed694b9756309b00113
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 15 11:41:35 2013 +1100

     - (dtucker) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
       Use getpgrp() if we don't have getpgid() (old BSDs, maybe others).

commit 4018dc04daa613d0e20df10947b85f154dc5765d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 15 10:28:55 2013 +1100

       - djm@cvs.openbsd.org 2013/02/14 21:35:59
         [auth2-pubkey.c]
         Correct error message that had a typo and was logging the wrong thing;
         patch from Petr Lautrbach

commit 91edc1ce2b4a7038432efbcbbfc0b1cb2fb85d0d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 15 10:23:44 2013 +1100

     - (djm) [contrib/suse/rc.sshd] Use SSHD_BIN consistently; bz#2056 from
       Iain Morgan

commit 57f92185288e0101fe9c3f3dfa29ea1619da8354
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 14 10:32:33 2013 +1100

    - (djm) [regress/integrity.sh] Start fuzzing from offset 2500 (instead
      of 2300) to avoid clobbering the end of (non-MAC'd) KEX. Verified by
      Iain Morgan

commit 6d77d6ea2b96c2e7df0ab036ab4116ac548deb1e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 14 10:31:03 2013 +1100

     - (djm) [regress/krl.sh] typo; found by Iain Morgan

commit 2653f5c0a67c403ff14403b9aac94e6a53f6bbf9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 14 10:14:51 2013 +1100

     - (djm) [regress/krl.sh] Don't use ecdsa keys in environment that lack ECC.

commit 2f20de5e3f1c60eee3c9bda52289aff5c037dd08
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 11:31:38 2013 +1100

     - (djm) [regress/try-ciphers.sh] clean up CVS merge botch

commit 58e2c5b3947122f82ecc0158180ba260e6e59166
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 11:16:57 2013 +1100

       - djm@cvs.openbsd.org 2013/02/11 23:58:51
         [try-ciphers.sh]
         remove acss here too

commit 22e8a1e1695f1c8179cea61ac63b2fdd4b11f2d7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 11:04:48 2013 +1100

       - dtucker@cvs.openbsd.org 2013/02/11 21:21:58
         [sshd.c]
         Add openssl version to debug output similar to the client.  ok markus@

commit 894926ebd8cc3d6651ad1a3a1269a60ef127cd44
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 11:03:58 2013 +1100

       - djm@cvs.openbsd.org 2013/02/10 23:35:24
         [packet.c]
         record "Received disconnect" messages at ERROR rather than INFO priority,
         since they are abnormal and result in a non-zero ssh exit status; patch
         from Iain Morgan in bz#2057; ok dtucker@

commit 78d22713c79da46b80eceec02411563be3c65e71
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 11:03:36 2013 +1100

       - djm@cvs.openbsd.org 2013/02/10 23:32:10
         [ssh-keygen.c]
         append to moduli file when screening candidates rather than overwriting.
         allows resumption of interrupted screen; patch from Christophe Garault
         in bz#1957; ok dtucker@

commit fd05154dc45f6079618c6b0ce92cd6e9b55fc87f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 11:03:10 2013 +1100

       - markus@cvs.openbsd.org 2013/02/10 21:19:34
         [version.h]
         openssh 6.2

commit d6d9fa0281e4856c40d5f03ebe4a5cb6a98337e3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 11:02:46 2013 +1100

       - djm@cvs.openbsd.org 2013/02/08 00:41:12
         [sftp.c]
         fix NULL deref when built without libedit and control characters
         entered as command; debugging and patch from Iain Morgan an
         Loganaden Velvindron in bz#1956

commit 18de9133c223cf820688659903de6d1ffc9873b2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 11:02:27 2013 +1100

       - dtucker@cvs.openbsd.org 2013/02/06 00:22:21
         [auth.c]
         Fix comment, from jfree.e1 at gmail

commit 1f583df8c3a7a3731a18b17e14c9ec09f31905ba
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 11:02:08 2013 +1100

       - dtucker@cvs.openbsd.org 2013/02/06 00:20:42
         [servconf.c sshd_config sshd_config.5]
         Change default of MaxStartups to 10:30:100 to start doing random early
         drop at 10 connections up to 100 connections.  This will make it harder
         to DoS as CPUs have come a long way since the original value was set
         back in 2000.  Prompted by nion at debian org, ok markus@

commit 0cd2f8e5f8276e178d696f3495ca2a9a691dccf5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 11:01:39 2013 +1100

       - djm@cvs.openbsd.org 2013/01/27 10:06:12
         [krl.c]
         actually use the xrealloc() return value; spotted by xi.wang AT gmail.com

commit f0a8ded824a0149940a8c95755da05a9ce5d7f35
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 11:00:34 2013 +1100

       - djm@cvs.openbsd.org 2013/01/26 06:11:05
         [Makefile.in acss.c acss.h cipher-acss.c cipher.c]
         [openbsd-compat/openssl-compat.h]
         remove ACSS, now that it is gone from libcrypto too

commit 60565bcb5c26f38b9f1c0261c0608751979571d4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 10:56:42 2013 +1100

       - djm@cvs.openbsd.org 2013/01/25 10:22:19
         [krl.c]
         redo last commit without the vi-vomit that snuck in:
         skip serial lookup when cert's serial number is zero
         (now with 100% better comment)

commit 377d9a44f9c79c4fde96e973392175d5b22eed80
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 10:55:16 2013 +1100

       - krw@cvs.openbsd.org 2013/01/25 05:00:27
         [krl.c]
         Revert last. Breaks due to likely typo. Let djm@ fix later.
         ok djm@ via dlg@

commit 6045f5d5748582dff473934d760cf0e7e892da8b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 10:54:54 2013 +1100

       - djm@cvs.openbsd.org 2013/01/24 22:08:56
         [krl.c]
         skip serial lookup when cert's serial number is zero

commit ea078462ea9b6efec982dce999ffa47ca1055077
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 12 10:54:37 2013 +1100

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2013/01/24 21:45:37
         [krl.c]
         fix handling of (unused) KRL signatures; skip string in correct buffer

commit b6f73b3af6fa14df1306d763dd7ec38f68de6f79
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 11 10:39:12 2013 +1100

     - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old
       libcrypto that lacks EVP_CIPHER_CTX_ctrl

commit 951b53b1bede98fdcfeeac8c5c00dbf3948d9b75
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 8 11:50:09 2013 +1100

     - (dtucker) [configure.ac openbsd-compat/sys-tree.h] Test if compiler allows
       __attribute__ on return values and work around if necessary.  ok djm@

commit e7f50e1c181bad14787a4b995875ed63b79adf5d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 8 10:49:37 2013 +1100

     - (djm) [contrib/redhat/sshd.init] treat RETVAL as an integer;
       patch from Iain Morgan in bz#2059

commit 5c3bbd76aa5c6f050e7b4606ea55efce3d46e054
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 7 10:11:05 2013 +1100

     - (djm) [configure.ac] Don't probe seccomp capability of running kernel
        at configure time; the seccomp sandbox will fall back to rlimit at
           runtime anyway. Patch from plautrba AT redhat.com in bz#2011

commit dc75d1fc0488a6637779470200f2b4dca2ed6248
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 22:58:51 2013 +1100

     - (djm) [regress/krl.sh] replacement for jot; most platforms lack it

commit d60b2108307dccdc596d1bf3195f6882067e2b2f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 22:49:58 2013 +1100

     - (djm) [openbsd-compat/sys-tree.h] Sync with OpenBSD. krl.c needs newer
        version.

commit a7522d9fc07ab06680853104d52dbbf90146b458
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 22:35:31 2013 +1100

       - markus@cvs.openbsd.org 2013/01/19 12:34:55
         [krl.c]
         RB_INSERT does not remove existing elments; ok djm@

commit a0a7ee8bf417c651f4f5bb8a8a8fb877c13011cd
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 22:35:06 2013 +1100

       - jmc@cvs.openbsd.org 2013/01/19 07:13:25
         [ssh-keygen.1]
         fix some formatting; ok djm

commit 881a7a2c5dc1d39b7e5f50e0d6c52d61b85491c3
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 22:34:46 2013 +1100

       - jmc@cvs.openbsd.org 2013/01/18 21:48:43
         [ssh-keygen.1]
         command-line (adj.) -> command line (n.);

commit 072fdcd19821bbd36ee175475286fad17eaaa367
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 22:34:04 2013 +1100

       - jmc@cvs.openbsd.org 2013/01/18 08:39:04
         [ssh-keygen.1]
         add -Q to the options list; ok djm

commit 72abeb709ee835088d9151629de8d29a9f2529c3
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 22:33:44 2013 +1100

       - jmc@cvs.openbsd.org 2013/01/18 08:00:49
         [sshd_config.5]
         tweak previous;

commit 3d6d68b1e14e78bd0e50e896c99e6a72e1ef7e89
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 22:33:23 2013 +1100

       - jmc@cvs.openbsd.org 2013/01/18 07:59:46
         [ssh-keygen.c]
         -u before -V in usage();

commit ac5542b6b879636144cef61ea318ecf177518b50
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 22:33:02 2013 +1100

       - jmc@cvs.openbsd.org 2013/01/18 07:57:47
         [ssh-keygen.1]
         tweak previous;

commit da5cc5d09a193f29d1a1e1c5a96e06980d240816
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 22:31:29 2013 +1100

     - (djm) [cipher-aes.c cipher-ctr.c openbsd-compat/openssl-compat.h]
       Move prototypes for replacement ciphers to openssl-compat.h; fix EVP
       prototypes for openssl-1.0.0-fips.

commit 13f5f768bc4861bff58074717fc19764ee347ac9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 18 15:32:03 2013 +1100

       - djm@cvs.openbsd.org 2013/01/18 03:00:32
         [krl.c]
         fix KRL generation bug for list sections

commit ebafebda8570b2b013327cdc6627f9c5fb9733c1
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 18 11:51:56 2013 +1100

       - djm@cvs.openbsd.org 2013/01/18 00:45:29
         [regress/Makefile regress/cert-userkey.sh regress/krl.sh]
         Tests for Key Revocation Lists (KRLs)

commit f3747bf4014a450c9aaf1d88b010f6e579d10072
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 18 11:44:04 2013 +1100

       - djm@cvs.openbsd.org 2013/01/17 23:00:01
         [auth.c key.c key.h ssh-keygen.1 ssh-keygen.c sshd_config.5]
         [krl.c krl.h PROTOCOL.krl]
         add support for Key Revocation Lists (KRLs). These are a compact way to
         represent lists of revoked keys and certificates, taking as little as
         a single bit of incremental cost to revoke a certificate by serial number.
         KRLs are loaded via the existing RevokedKeys sshd_config option.
         feedback and ok markus@

commit b26699bbadaffa1b1de2f6b0e175b77aba337de5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 17 14:31:57 2013 +1100

     - (djm) [regress/cipher-speed.sh regress/integrity.sh regress/try-ciphers.sh]
       check for GCM support before testing GCM ciphers.

commit efa1c950921659a0f10b9adf30625fba21b3815c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 12 23:10:47 2013 +1100

     - (djm) [regress/integrity.sh] repair botched merge

commit 846dc7f21c0dd52bc8cc8f433d464a6561066d00
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 12 22:46:26 2013 +1100

       - djm@cvs.openbsd.org 2013/01/12 11:23:53
         [regress/cipher-speed.sh regress/integrity.sh regress/try-ciphers.sh]
         test AES-GCM modes; feedback markus@

commit c20eb8b8eac8b6cb1f86199e16dc7d13902a760b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 12 22:41:26 2013 +1100

       - djm@cvs.openbsd.org 2013/01/12 11:22:04
         [cipher.c]
         improve error message for integrity failure in AES-GCM modes; ok markus@

commit 1422c0887c8e92f7159f6f6ddd4974aab177c6de
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 9 16:44:54 2013 +1100

       - djm@cvs.openbsd.org 2013/01/09 05:40:17
         [ssh-keygen.c]
         correctly initialise fingerprint type for fingerprinting PKCS#11 keys

commit d522c68872689e2e80d9667da1c9a18d04b001cd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 9 16:42:47 2013 +1100

     - (djm) [cipher.c configure.ac openbsd-compat/openssl-compat.h]
       Fix merge botch, automatically detect AES-GCM in OpenSSL, move a little
       cipher compat code to openssl-compat.h

commit 1d75abfe23cadf8cdba0bd2cfd54f3bc1ca80dc5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 9 16:12:19 2013 +1100

       - markus@cvs.openbsd.org 2013/01/08 18:49:04
         [PROTOCOL authfile.c cipher.c cipher.h kex.c kex.h monitor_wrap.c]
         [myproposal.h packet.c ssh_config.5 sshd_config.5]
         support AES-GCM as defined in RFC 5647 (but with simpler KEX handling)
         ok and feedback djm@

commit aa7ad3039c671c157bb99217d60674dad8154a22
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 9 15:58:21 2013 +1100

       - jmc@cvs.openbsd.org 2013/01/04 19:26:38
         [sftp-server.8 sftp-server.c]
         sftp-server.8: add argument name to -d
         sftp-server.c: add -d to usage()
         ok djm

commit ec77c954c8c7b7cebab0e263b1a43bf6b789ecfb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 9 15:58:00 2013 +1100

       - djm@cvs.openbsd.org 2013/01/03 23:22:58
         [ssh-keygen.c]
         allow fingerprinting of keys hosted in PKCS#11 tokens: ssh-keygen -lD ...
         ok markus@

commit 502ab0eff1bba68a1d0492a9d9da3616b0301724
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 9 15:57:36 2013 +1100

       - djm@cvs.openbsd.org 2013/01/03 12:54:49
         [sftp-server.8 sftp-server.c]
         allow specification of an alternate start directory for sftp-server(8)
         "I like this" markus@

commit 3739c8f0413bc7a90a1fc3a6c723436bd285bf86
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 9 15:57:16 2013 +1100

       - djm@cvs.openbsd.org 2013/01/03 12:49:01
         [PROTOCOL]
         fix description of MAC calculation for EtM modes; ok markus@

commit 441384453c7400e8b122e7368c50ab713399fd80
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 9 15:56:45 2013 +1100

       - djm@cvs.openbsd.org 2013/01/03 05:49:36
         [servconf.h]
         add a couple of ServerOptions members that should be copied to the privsep
         child (for consistency, in this case they happen only to be accessed in
         the monitor); ok dtucker@

commit 697485d50af953d36503c11d9e549dd0db8a3287
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 9 15:56:13 2013 +1100

       - djm@cvs.openbsd.org 2013/01/02 00:33:49
         [PROTOCOL.agent]
         correct format description for SSH_AGENTC_ADD_RSA_ID_CONSTRAINED
         bz#2051 from david AT lechnology.com

commit 73298f420efd37659f462d3eb10d8a7f71022e1b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 9 15:55:50 2013 +1100

       - djm@cvs.openbsd.org 2013/01/02 00:32:07
         [clientloop.c mux.c]
         channel_setup_local_fwd_listener() returns 0 on failure, not -ve
         bz#2055 reported by mathieu.lacage AT gmail.com

commit 4e14a58f3f01842ba6a50f84d0ddaa12d6bed62b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 9 15:54:48 2013 +1100

       - dtucker@cvs.openbsd.org 2012/12/14 05:26:43
         [auth.c]
         use correct string in error message; from rustybsd at gmx.fr

commit 0fc77297e6825ae83618c5137e190aa9f9dac9da
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 17 15:59:42 2012 +1100

     - (dtucker) [Makefile.in] Add some scaffolding so that the new regress
       tests will work with VPATH directories.

commit 13cbff1e009c2a1f786e5d84bf78099c70949bf0
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 13 08:25:07 2012 +1100

     - (djm) [cipher.c] Fix missing prototype for compat code

commit 25a02b0c95e01bc331267a1db0f62d3cbd7a0897
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 13 08:18:56 2012 +1100

     - (djm) [configure.ac cipher-ctr.c] Adapt EVP AES CTR change to retain our
       compat code for older OpenSSL

commit 8c05da3326fef892d993f0cd91808f2daf4d6a5f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 13 07:18:59 2012 +1100

       - markus@cvs.openbsd.org 2012/12/12 16:45:52
         [packet.c]
         reset incoming_packet buffer for each new packet in EtM-case, too;
         this happens if packets are parsed only parially (e.g. ignore
         messages sent when su/sudo turn off echo); noted by sthen/millert

commit faabeb6b36df2e1d17b5d23280812c68900d4e40
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 12 12:51:54 2012 +1100

     - (djm) [regress/Makefile] fix t-exec rule

commit 37461d7391e0944d880757b9ac8c98d1feb15a40
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 12 12:37:32 2012 +1100

    - (djm) [regress/integrity.sh] Fix awk quoting, packet length skip

commit 9fec296b0ac3e17ea1dcdf01761870297f7fd50a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 12 12:10:10 2012 +1100

     - (djm) [regress/Makefile regress/integrity.sh] Make the integrity.sh test
       work on platforms without 'jot'

commit 37834afe7be91de1aff4bdffbef2c54797ec58d6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 12 11:00:37 2012 +1100

     - (djm) [mac.c] fix merge botch

commit ec7ce9ace470aad20aeea0769ddc998dea307830
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 12 10:55:32 2012 +1100

       - markus@cvs.openbsd.org 2012/12/11 23:12:13
         [try-ciphers.sh]
         add hmac-ripemd160-etm@openssh.com

commit 1fb593a3f198b75787c5c5974fe256122427d1d3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 12 10:54:37 2012 +1100

       - markus@cvs.openbsd.org 2012/12/11 22:42:11
         [regress/Makefile regress/modpipe.c regress/integrity.sh]
         test the integrity of the packets; with djm@

commit 1a45b63d7b4fe34e18ab4cc669669003e6f8e403
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 12 10:52:07 2012 +1100

       - markus@cvs.openbsd.org 2012/12/11 22:32:56
         [regress/try-ciphers.sh]
         add etm modes

commit 74f13bdf26fc9ef29b9789d7004817ab7e7a295a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 12 10:46:53 2012 +1100

       - sthen@cvs.openbsd.org 2012/12/11 22:51:45
         [mac.c]
         fix typo, s/tem/etm in hmac-ripemd160-tem. ok markus@

commit af43a7ac2d77c57112b48f34c7a72be2adb761bc
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 12 10:46:31 2012 +1100

       - markus@cvs.openbsd.org 2012/12/11 22:31:18
         [PROTOCOL authfile.c cipher.c cipher.h kex.h mac.c myproposal.h]
         [packet.c ssh_config.5 sshd_config.5]
         add encrypt-then-mac (EtM) modes to openssh by defining new mac algorithms
         that change the packet format and compute the MAC over the encrypted
         message (including the packet size) instead of the plaintext data;
         these EtM modes are considered more secure and used by default.
         feedback and ok djm@

commit 6a1937eac5da5bdcf33aaa922ce5de0c764e37ed
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 12 10:44:38 2012 +1100

       - markus@cvs.openbsd.org 2012/12/11 22:16:21
         [monitor.c]
         drain the log messages after receiving the keystate from the unpriv
         child. otherwise it might block while sending. ok djm@

commit 3e1027cd1fff4b3b6320f186ccc69efe06a50466
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 7 13:07:46 2012 +1100

       - dtucker@cvs.openbsd.org 2012/12/07 01:51:35
         [serverloop.c]
         Cast signal to int for logging.  A no-op on openbsd (they're always ints)
         but will prevent warnings in portable.  ok djm@

commit 8a96522482acd40af2e8a08696780a54c00b4feb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 7 13:07:02 2012 +1100

       - markus@cvs.openbsd.org 2012/12/05 15:42:52
         [ssh-add.c]
         prevent double-free of comment; ok djm@

commit f9333d5246d979a448c5ff4d466de2fd2d286cfd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 7 13:06:13 2012 +1100

       - jmc@cvs.openbsd.org 2012/12/03 08:33:03
         [ssh-add.1 sshd_config.5]
         tweak previous;

commit 3dfb877046b40638ac7c88de9bb07091eb463205
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 7 13:03:10 2012 +1100

       - dtucker@cvs.openbsd.org 2012/12/06 06:06:54
         [regress/keys-command.sh]
         Fix some problems with the keys-command test:
          - use string comparison rather than numeric comparison
          - check for existing KEY_COMMAND file and don't clobber if it exists
          - clean up KEY_COMMAND file if we do create it.
          - check that KEY_COMMAND is executable (which it won't be if eg /var/run
            is mounted noexec).
         ok djm.

commit 96ce9a1e45a2f2a1b8be7b97fde07e629dd9fa05
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Dec 4 07:50:03 2012 -0800

    20121205
     - (tim) [defines.h] Some platforms are missing ULLONG_MAX. Feedback djm@.

commit 8b48982a569596f40f9ad16baac9c8c42c8a96aa
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 3 12:35:55 2012 +1100

     - (djm) [configure.ac] Revert previous. configure.ac already does this
       for us.

commit 03af12e9305900611bec6b5f4b106891f025c8a6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 3 11:55:53 2012 +1100

     - (djm) [configure.ac] Turn on -g for gcc compilers. Helps pre-installation
       debugging. ok dtucker@

commit 55aca027ed24f8fdce43bd451ce96b89f979606c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 3 11:25:30 2012 +1100

       - djm@cvs.openbsd.org 2012/12/03 00:14:06
         [auth2-chall.c ssh-keygen.c]
         Fix compilation with -Wall -Werror (trivial type fixes)

commit 999bd2d259c1dacb53a2d8be31d4c1861b58cdb3
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 3 10:13:39 2012 +1100

       - djm@cvs.openbsd.org 2012/12/02 20:47:48
         [Makefile regress/forward-control.sh]
         regress for AllowTcpForwarding local/remote; ok markus@

commit 771c43cee6343f757884030ff92f1156b2ef399f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 3 10:12:13 2012 +1100

       - djm@cvs.openbsd.org 2012/11/22 22:49:30
         [regress/Makefile regress/keys-command.sh]
         regress for AuthorizedKeysCommand; hints from markus@

commit 6618e92509bc0362352de1386ee0d70e785a9bb5
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 3 10:09:04 2012 +1100

       - djm@cvs.openbsd.org 2012/10/19 05:10:42
         [regress/cert-userkey.sh]
         include a serial number when generating certs

commit fa51d8b6b2151c47c08ee54a0ece8173a4c465c3
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 3 10:08:25 2012 +1100

       - dtucker@cvs.openbsd.org 2012/10/05 02:20:48
         [regress/cipher-speed.sh regress/try-ciphers.sh]
         Add umac-128@openssh.com to the list of MACs to be tested

commit d27a026ab7599a95d96436274c3033c2157cdd85
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 3 10:06:37 2012 +1100

       - dtucker@cvs.openbsd.org 2012/10/05 02:05:30
         [regress/multiplex.sh]
         Use 'kill -0' to test for the presence of a pid since it's more portable

commit 15b05cfa17592da7470d7bd4b2de063188697471
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 3 09:53:20 2012 +1100

       - djm@cvs.openbsd.org 2012/12/02 20:34:10
         [auth.c auth.h auth1.c auth2-chall.c auth2-gss.c auth2-jpake.c auth2.c]
         [monitor.c monitor.h]
         Fixes logging of partial authentication when privsep is enabled
         Previously, we recorded "Failed xxx" since we reset authenticated before
         calling auth_log() in auth2.c. This adds an explcit "Partial" state.
    
         Add a "submethod" to auth_log() to report which submethod is used
         for keyboard-interactive.
    
         Fix multiple authentication when one of the methods is
         keyboard-interactive.
    
         ok markus@

commit aa5b3f831417bac9538d2b6f21d55fef278e8926
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 3 09:50:54 2012 +1100

       - djm@cvs.openbsd.org 2012/12/02 20:46:11
         [auth-options.c channels.c servconf.c servconf.h serverloop.c session.c]
         [sshd_config.5]
         make AllowTcpForwarding accept "local" and "remote" in addition to its
         current "yes"/"no" to allow the server to specify whether just local or
         remote TCP forwarding is enabled. ok markus@

commit 33a813613a9f48acba0e88f4c51a6a25259bbebc
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 3 09:50:24 2012 +1100

       - djm@cvs.openbsd.org 2012/12/02 20:42:15
         [ssh-add.1 ssh-add.c]
         make deleting explicit keys "ssh-add -d" symmetric with adding keys -
         try to delete the corresponding certificate too and respect the -k option
         to allow deleting of the key only; feedback and ok markus@

commit cb6b68b209d8868a94a30b1a634beb1a65cb5265
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 3 09:49:52 2012 +1100

       - djm@cvs.openbsd.org 2012/12/02 20:26:11
         [ssh_config.5 sshconnect2.c]
         Make IdentitiesOnly apply to keys obtained from a PKCS11Provider.
         This allows control of which keys are offered from tokens using
         IdentityFile. ok markus@

commit cf6ef137b516a9f739b6e899ec5ef7306835530b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 3 09:37:56 2012 +1100

     - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD to get
       TAILQ_FOREACH_SAFE needed for upcoming changes.

commit 6f3b362fa85e99905c86b768c80c66756116416c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 14 19:04:33 2012 +1100

       - djm@cvs.openbsd.org 2012/11/14 02:32:15
         [ssh-keygen.c]
         allow the full range of unsigned serial numbers; 'fine' deraadt@

commit 1e85469fcb1e81e7f8f643eafd42eb6c123a8c13
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 14 19:04:02 2012 +1100

       - djm@cvs.openbsd.org 2012/11/14 02:24:27
         [auth2-pubkey.c]
         fix username passed to helper program
         prepare stdio fds before closefrom()
    
         spotted by landry@

commit 0120c41d6b927beb89499b49eb66512225d30f7f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 7 08:36:00 2012 +1100

       - jmc@cvs.openbsd.org 2012/09/26 17:34:38
         [moduli.5]
         last stage of rfc changes, using consistent Rs/Re blocks, and moving the
         references into a STANDARDS section;

commit d5c3d4c0ca0312ea96de9eca38b055a98335b550
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 7 08:35:38 2012 +1100

       - eric@cvs.openbsd.org 2011/11/28 08:46:27
         [moduli.5]
         fix formula
         ok djm@

commit 737f7aff365a47039fb48dcc06367e59863a4cee
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 5 17:07:43 2012 +1100

     - (dtucker) [auth2-pubkey.c] wrap paths.h in an ifdef for platforms that
       don't have it.  Spotted by tim@.

commit f96ff18a9240e38e5d3c671f5f8f341099874aaf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 5 17:04:37 2012 +1100

     - (dtucker) [uidswap.c openbsd-compat/Makefile.in
       openbsd-compat/bsd-setres_id.c openbsd-compat/bsd-setres_id.h
       openbsd-compat/openbsd-compat.h]  Move the fallback code for setting uids
       and gids from uidswap.c to the compat library, which allows it to work with
       the new setresuid calls in auth2-pubkey.  with tim@, ok djm@

commit a6e3f01d1e230b8acfdd6b4cf3096459d2a325e0
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Nov 4 23:21:40 2012 +1100

       - djm@cvs.openbsd.org 2012/11/04 11:09:15
         [auth.h auth1.c auth2.c monitor.c servconf.c servconf.h sshd.c]
         [sshd_config.5]
         Support multiple required authentication via an AuthenticationMethods
         option. This option lists one or more comma-separated lists of
         authentication method names. Successful completion of all the methods in
         any list is required for authentication to complete;
         feedback and ok markus@

commit d0d1099b3b8a766480ce6df215631bf0af6e6bcd
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Nov 4 22:23:14 2012 +1100

       - djm@cvs.openbsd.org 2012/11/04 10:38:43
         [auth2-pubkey.c sshd.c sshd_config.5]
         Remove default of AuthorizedCommandUser. Administrators are now expected
         to explicitly specify a user. feedback and ok markus@

commit f33580eed055472b9e5ca05f4826b05e9eacc651
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Nov 4 22:22:52 2012 +1100

     - OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2012/10/31 08:04:50
         [sshd_config.5]
         tweak previous;

commit 09d3e1251250dcf45e5434cd474430e4ec5e8639
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 31 08:58:58 2012 +1100

       - djm@cvs.openbsd.org 2012/10/30 21:29:55
         [auth-rsa.c auth.c auth.h auth2-pubkey.c servconf.c servconf.h]
         [sshd.c sshd_config sshd_config.5]
         new sshd_config option AuthorizedKeysCommand to support fetching
         authorized_keys from a command in addition to (or instead of) from
         the filesystem. The command is run as the target server user unless
         another specified via a new AuthorizedKeysCommandUser option.
    
         patch originally by jchadima AT redhat.com, reworked by me; feedback
         and ok markus@

commit 07daed505f1cd6a0beff4d060b588debcc1ca8c8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 31 08:57:55 2012 +1100

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2012/10/05 12:34:39
         [sftp.c]
         fix signed vs unsigned warning; feedback & ok: djm@

commit c0e5cbe2226f602715e27e80d68b2c416589cb76
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Oct 18 21:38:58 2012 -0700

     - (tim) [buildpkg.sh.in] Double up on some backslashes so they end up in
       the generated file as intended.

commit cc8e9ffdd18e1ff2b14cc49cc983648f62c9d79a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 15:41:06 2012 +1000

     - [Makefile.in] "Using $< in a non-suffix rule context is a GNUmake idiom"

commit 50ce447ef9224030c2a770c318d747f7b08d966c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 12:11:33 2012 +1000

     - [umac.c] Enforce allowed umac output sizes.  From djm@.

commit ee4ad778d778c8a19c763738a0851afb9c6ccf16
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 12:04:10 2012 +1000

       - dtucker@cvs.openbsd.org 2012/09/10 01:51:19
         [regress/multiplex.sh]
         use -Ocheck and waiting for completions by PID to make multiplexing test
         less racy and (hopefully) more reliable on slow hardware.

commit 9b2c0360cf7de7b460f1740b4eb247c27da4630f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 11:45:39 2012 +1000

       - dtucker@cvs.openbsd.org 2012/09/10 00:49:21
         [regress/multiplex.sh]
         Log -O cmd output to the log file and make logging consistent with the
         other tests.  Test clean shutdown of an existing channel when testing
         "stop".

commit 6fc5aa8b2e76790b136adfb68f98fe3fb7230a25
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 11:43:57 2012 +1000

       - dtucker@cvs.openbsd.org 2012/09/09 11:51:25
         [multiplex.sh]
         Add test for ssh -Ostop

commit 189e5bad5c556e320506436a5df19cde28e1f2d0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 11:41:52 2012 +1000

      - dtucker@cvs.openbsd.org 2012/09/06 04:11:07
         [regress/try-ciphers.sh]
         Restore missing space.  (Id sync only).

commit 992faad1f1f71114f66ea67485606b083f7d722a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 11:38:24 2012 +1000

     - [Makefile umac.c] Add special-case target to build umac128.o.

commit 7f93315c3ae6d135dddb2aa9561d969088d8900d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 11:23:59 2012 +1000

    remove stray '+' from sync

commit 427e409e99d465118fbc2f7c1ca2c5d44365f5a8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 11:02:39 2012 +1000

       - markus@cvs.openbsd.org 2012/10/04 13:21:50
         [myproposal.h ssh_config.5 umac.h sshd_config.5 ssh.1 sshd.8 mac.c]
         add umac128 variant; ok djm@ at n2k12
         (note: further Makefile work is required)

commit 0dc283b13acdd4926dec1289b94badc3bbc7f321
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 10:52:51 2012 +1000

       - djm@cvs.openbsd.org 2012/10/02 07:07:45
         [ssh-keygen.c]
         fix -z option, broken in revision 1.215

commit 3a7c04105a545188b84bd3b4db682d8d64a7ea8f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 10:51:59 2012 +1000

       - naddy@cvs.openbsd.org 2012/10/01 13:59:51
         [monitor_wrap.c]
         pasto; ok djm@

commit 628a3fdce25afcff19aaa981040198ccfa49e109
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 10:50:15 2012 +1000

       - jmc@cvs.openbsd.org 2012/09/26 16:12:13
         [ssh.1]
         last stage of rfc changes, using consistent Rs/Re blocks, and moving the
         references into a STANDARDS section;

commit 17146d369cd5f2c0088e4e299974ea3f87f37d4a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 10:46:16 2012 +1000

      - dtucker@cvs.openbsd.org 2012/09/21 10:55:04
         [sftp.c]
         Fix handling of filenames containing escaped globbing characters and
         escape "#" and "*".  Patch from Jean-Marc Robert via tech@, ok djm.

commit 191fcc6e4e6173a59720da043bc85618a4107fcf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 10:45:01 2012 +1000

       - dtucker@cvs.openbsd.org 2012/09/21 10:53:07
         [sftp.c]
         Fix improper handling of absolute paths when PWD is part of the completed
         path.  Patch from Jean-Marc Robert via tech@, ok djm.

commit 063018d9f6f7beb1408213fc27c720534e7c987e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 10:43:58 2012 +1000

       - dtucker@cvs.openbsd.org 2012/09/18 10:36:12
         [sftp.c]
         Add bounds check on sftp tab-completion.  Part of a patch from from
         Jean-Marc Robert via tech@, ok djm

commit 302889a1b0db42d8065fa882ae8e06ca2ff75477
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 10:42:53 2012 +1000

       - markus@cvs.openbsd.org 2012/09/17 13:04:11
         [packet.c]
         clear old keys on rekeing; ok djm

commit 0af2405ebf4d4c3b420740f0fb5b81aca7039bdc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 5 10:41:25 2012 +1000

     - (dtucker) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2012/09/17 09:54:44
         [sftp.c]
         an XXX for later

commit 26b9e3b0c5b2d303991fad61e453cc4f244054cd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 17 13:25:44 2012 +1000

       - markus@cvs.openbsd.org 2012/09/14 16:51:34
         [sshconnect.c]
         remove unused variable

commit bb6cc07cf4e98d86b38a2011203c6bb724465135
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 17 13:25:06 2012 +1000

       - dtucker@cvs.openbsd.org 2012/09/13 23:37:36
         [servconf.c]
         Fix comment line length

commit 86dc9b41107df8d4bb697f7d02b552d98c16a776
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 7 18:08:23 2012 +1000

    Fix author's name for RFC6594 SSHFP change

commit 48bf4b0ca366d68ef9c5ce95cb0c49fb3e149a40
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 7 16:38:53 2012 +1000

       - dtucker@cvs.openbsd.org 2012/09/07 06:34:21
         [clientloop.c]
         when muxmaster is run with -N, make it shut down gracefully when a client
         sends it "-O stop" rather than hanging around (bz#1985).  ok djm@

commit ca0d0fd806ebce746ac0bee52995fc32b1116656
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 7 11:22:24 2012 +1000

       - dtucker@cvs.openbsd.org 2012/09/07 01:10:21
         [clientloop.c]
         Merge escape help text for ~v and ~V; ok djm@

commit f111d40604846da18b190155b85fa72d58647802
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 7 11:21:42 2012 +1000

       - dtucker@cvs.openbsd.org 2012/09/07 00:30:19
         [clientloop.c]
         Print '^Z' instead of a raw ^Z when the sequence is not supported.  ok djm@

commit 83d0af69075269769715b00c21d0debe15986bf2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 7 11:21:03 2012 +1000

       - jmc@cvs.openbsd.org 2012/09/06 13:57:42
         [ssh.1]
         missing letter in previous;

commit 92a39cfa09e38152be34437345577105c4110438
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 7 11:20:20 2012 +1000

       - dtucker@cvs.openbsd.org 2012/09/06 09:50:13
         [clientloop.c]
         Make the escape command help (~?) context sensitive so that only commands
         that will work in the current session are shown.  ok markus@
    
    (note: previous commit with this description was a mistake on my part while
    pulling changes from OpenBSD)

commit 241995382ee30b562a1f644ab9dd518bbbb8f902
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 7 10:44:34 2012 +1000

    bz#2039: add acknowledgement of the original authors of the ECDSA SSHFP DNS
    work.  From Ondřej Surý.

commit 29bf4040b4aa98ce8b1be57a3107ddb1eaa085b4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 6 21:26:34 2012 +1000

       - dtucker@cvs.openbsd.org 2012/09/06 09:50:13
         [clientloop.c]
         Make the escape command help (~?) context sensitive so that only commands
         that will work in the current session are shown.  ok markus@

commit 50a48d025ffc961c3f5e48f521b406d7c49681bb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 6 21:25:37 2012 +1000

       - dtucker@cvs.openbsd.org 2012/09/06 04:37:39
         [clientloop.c log.c ssh.1 log.h]
         Add ~v and ~V escape sequences to raise and lower the logging level
         respectively. Man page help from jmc, ok deraadt jmc

commit 00c1518a4d0e610e319433fa588cc1fbdfbff0b1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 6 21:21:56 2012 +1000

       - djm@cvs.openbsd.org 2012/08/17 01:30:00
         [compat.c sshconnect.c]
         Send client banner immediately, rather than waiting for the server to
         move first for SSH protocol 2 connections (the default). Patch based on
         one in bz#1999 by tls AT panix.com, feedback dtucker@ ok markus@

commit f09a8a6c6d8c06b9b855cf902e2a7129932a25e0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 6 21:20:39 2012 +1000

       - djm@cvs.openbsd.org 2012/08/17 01:25:58
         [ssh-keygen.c]
         print details of which host lines were deleted when using
         "ssh-keygen -R host"; ok markus@

commit ae608bdd83c8bc37ef701aba9603a4f69d473b2d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 6 21:19:51 2012 +1000

       - djm@cvs.openbsd.org 2012/08/17 01:22:56
         [kex.c]
         add some comments about better handling first-KEX-follows notifications
         from the server. Nothing uses these right now. No binary change

commit 66cb0e0733782c2f6773abd9fd1d87f5efef6c27
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 6 21:19:05 2012 +1000

       - dtucker@cvs.openbsd.org 2012/08/17 00:45:45
         [clientloop.c clientloop.h mux.c]
         Force a clean shutdown of ControlMaster client sessions when the ~. escape
         sequence is used.  This means that ~. should now work in mux clients even
         if the server is no longer responding.  Found by tedu, ok djm.

commit 3ee50c5d9f95cd40df403cf1a91fdaffefa21cc5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 6 21:18:11 2012 +1000

       - jmc@cvs.openbsd.org 2012/08/15 18:25:50
         [ssh-keygen.1]
         a little more info on certificate validity;
         requested by Ross L Richardson, and provided by djm

commit 23e4b80a6085bddea80e2e64b4df99dd4931b1ea
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 30 10:42:47 2012 +1000

     - (dtucker) [moduli] Import new moduli file.

commit 4eb0a532efe679917e07655721145c6882bdb4c7
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 29 10:26:20 2012 +1000

     - (djm) Release openssh-6.1

commit 318541854f6a1e770444f7cb19e33a3f005264bf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 28 19:57:19 2012 +1000

     - (dtucker) [openbsd-compat/bsd-cygwin_util.h] define WIN32_LEAN_AND_MEAN
       for compatibility with future mingw-w64 headers.  Patch from vinschen at
       redhat com.

commit 39a9d2c93339a077cc3e49d2123c2a8b4ddd0e4c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 22 21:57:13 2012 +1000

     - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Update version numbers

commit 38fe66230fbb8027e2c8dc7780744af4b6d65176
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 31 12:23:16 2012 +1000

       - markus@cvs.openbsd.org 2012/07/22 18:19:21
         [version.h]
         openssh 6.1

commit 46cb75a25840d793e4f7db2b1c7e702fbbfe87df
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 31 12:22:37 2012 +1000

       - dtucker@cvs.openbsd.org 2012/07/13 01:35:21
         [servconf.c]
         handle long comments in config files better.  bz#2025, ok markus

commit 1cce103b3e43894c1da81cab6d1ee3ab3a8fb367
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 31 12:22:18 2012 +1000

    fix truncated entry

commit 5a5c2b9063fc3d7315424702b01527ccb0d4c0c9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 31 12:21:34 2012 +1000

       - djm@cvs.openbsd.org 2012/07/10 02:19:15
         [servconf.c servconf.h sshd.c sshd_config]
         Turn on systrace sandboxing of pre-auth sshd by default for new installs
         by shipping a config that overrides the current UsePrivilegeSeparation=yes
         default. Make it easier to flip the default in the future by adding too.

commit 709a1e90d9cfb7a0e8cdf57fa967d163c010a6bb
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 31 12:20:43 2012 +1000

       - jmc@cvs.openbsd.org 2012/07/06 06:38:03
         [ssh-keygen.c]
         missing full stop in usage();

commit d809a4bc2858df767c4cf61cac5c92d8e2ac7cee
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 20 10:42:06 2012 +1000

    Import regened moduli file.

commit fff9f095e2f47a4d554b93a247cbcaca5a3baecf
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 6 13:45:01 2012 +1000

       - djm@cvs.openbsd.org 2012/07/06 01:47:38
         [ssh.c]
         move setting of tty_flag to after config parsing so RequestTTY options
         are correctly picked up. bz#1995 patch from przemoc AT gmail.com;
         ok dtucker@

commit ab523b02467f36a2f85c1a8bff6cf2fd4297fb12
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 6 13:44:43 2012 +1000

       - djm@cvs.openbsd.org 2012/07/06 01:37:21
         [mux.c]
         fix memory leak of passed-in environment variables and connection
         context when new session message is malformed; bz#2003 from Bert.Wesarg
         AT googlemail.com

commit dfceafe8b11a4a1f9890a37e0cd88b01eb9cc30c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 6 13:44:19 2012 +1000

       - dtucker@cvs.openbsd.org 2012/07/06 00:41:59
         [moduli.c ssh-keygen.1 ssh-keygen.c]
         Add options to specify starting line number and number of lines to process
         when screening moduli candidates.  This allows processing of different
         parts of a candidate moduli file in parallel.  man page help jmc@, ok djm@

commit 77eab7b0240683eea307332e1df3ff8920baf012
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 6 11:49:28 2012 +1000

     - (djm) [configure.ac] Recursively expand $(bindir) to ensure it has no
       unexpanded $(prefix) embedded. bz#2007 patch from nix-corp AT
       esperi.org.uk; ok dtucker@

commit a0433a7096b7f1f5d7332b04fa83660b3208ab1d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 6 10:27:10 2012 +1000

     - (djm) [sandbox-seccomp-filter.c] fallback to rlimit if seccomp filter is
       not available. Allows use of sshd compiled on host with a filter-capable
       kernel on hosts that lack the support. bz#2011 ok dtucker@

commit 34f702ae641f92f763ea00d54eaaf7e3ceddc2d2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 4 08:50:09 2012 +1000

     - (dtucker) [configure.ac openbsd-compat/bsd-misc.h] Add setlinebuf for
       platforms that don't have it.  "looks good" tim@

commit d545a4b9749fef6613b556b2191f6cb898fcb60f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 3 22:48:31 2012 +1000

     - (dtucker) [configure.ac sandbox-rlimit.c] Test whether or not
       setrlimit(RLIMIT_FSIZE, rl_zero) and skip it if it's not supported.  Its
       benefit is minor, so it's not worth disabling the sandbox if it doesn't
       work.

commit 60395f91c6987c17b3f9a783350e34d35896961b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 3 14:31:18 2012 +1000

     - (dtucker) [configure.ac] Detect platforms that can't use select(2) with
       setrlimit(RLIMIT_NOFILE, rl_zero) and disable the rlimit sandbox on those.

commit 6ea5dc6bb861fc9b6387e222b081c4d25231904e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 3 01:11:28 2012 +1000

     - (dtucker) [regress/test-exec.sh] Correct uname for cygwin/w2k.

commit ec1e15d51a202c95a6414375ae71c461a16ff870
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 3 01:06:49 2012 +1000

     - (dtucker) [regress/reexec.sh regress/sftp-cmds.sh regress/test-exec.sh]
       Move cygwin detection to test-exec and use to skip reexec test on cygwin.

commit 369ceedce24474f50a7934e4ff8515cdc312b268
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 3 00:53:18 2012 +1000

       - dtucker@cvs.openbsd.org 2012/07/02 14:37:06
         [regress/connect-privsep.sh]
         remove exit from end of test since it prevents reporting failure

commit 4908d44e675a9a81e6d24d3a3ca90459a4fd24e3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 2 22:15:38 2012 +1000

       - dtucker@cvs.openbsd.org 2012/07/02 12:13:26
         [ssh-pkcs11-helper.c sftp-client.c]
         fix a couple of "assigned but not used" warnings.  ok markus@

commit 7b30501bf53c3d5df9691f8e52b1f76bb61f2a35
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 2 18:55:09 2012 +1000

       - dtucker@cvs.openbsd.org 2012/07/02 08:50:03
         [ssh.c]
         set interactive ToS for forwarded X11 sessions.  ok djm@

commit 3b4b2d30219d2ecb1426d2f9339239d32bad7bf6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 2 18:54:31 2012 +1000

       - markus@cvs.openbsd.org 2012/06/30 14:35:09
         [sandbox-systrace.c sshd.c]
         fix a during the load of the sandbox policies (child can still make
         the read-syscall and wait forever for systrace-answers) by replacing
         the read/write synchronisation with SIGSTOP/SIGCONT;
         report and help hshoexer@; ok djm@, dtucker@

commit ecbf14aa53da21aeedc0974e13196fe77cca18f3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 2 18:53:37 2012 +1000

       - naddy@cvs.openbsd.org 2012/06/29 13:57:25
         [ssh_config.5 sshd_config.5]
         match the documented MAC order of preference to the actual one;
         ok dtucker@

commit 14a9d2515bcb8438dd0052a0c705c09660069c55
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 30 20:05:02 2012 +1000

     - (dtucker) [key.c] ifdef out sha256 key types on platforms that don't have
       the required functions in libcrypto.

commit 3886f95d423629080decd010662f4c26edea7397
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 30 19:47:01 2012 +1000

     - (dtucker) [myproposal.h] Remove trailing backslash to fix compile error

commit a08c20763a0b4810cb3c837a434568cdff677cf7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 30 15:08:53 2012 +1000

       - dtucker@cvs.openbsd.org 2012/06/28 05:07:45
         [regress/try-ciphers.sh regress/cipher-speed.sh]
         Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs since they were removed
         from draft6 of the spec and will not be in the RFC when published.  Patch
         from mdb at juniper net via bz#2023, ok markus

commit 2920bc145c9d8435e885ac6ad0a0ae613598d599
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 30 15:06:28 2012 +1000

       - dtucker@cvs.openbsd.org 2012/06/26 12:06:59
         [regress/connect-privsep.sh]
         test sandbox with every malloc option

commit ff32d7c9d20d42db364525d92c27a7c7491caf0d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 30 15:04:13 2012 +1000

       - djm@cvs.openbsd.org 2012/06/01 00:52:52
         [regress/sftp-cmds.sh]
         don't delete .* on cleanup due to unintended env expansion; pointed out in
         bz#2014 by openssh AT roumenpetrov.info

commit 4430a86c14dc0e043f8938b39bf389af1200f937
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 30 15:03:28 2012 +1000

       - djm@cvs.openbsd.org 2012/06/01 00:47:35
         [multiplex.sh forwarding.sh]
         append to rather than truncate test log; bz#2013 from openssh AT
         roumenpetrov.

commit 301390316cf73fc50d769691ed7f95c21ea6646a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 30 15:01:22 2012 +1000

       - dtucker@cvs.openbsd.org 2012/05/13 01:42:32
         [regress/addrmatch.sh]
         Add "Match LocalAddress" and "Match LocalPort" to sshd and adjust tests
         to match.  Feedback and ok djm@ markus@.

commit ee3c196ec7b74ef971da4208577daf8039f25326
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 30 08:35:59 2012 +1000

       - naddy@cvs.openbsd.org 2012/06/29 13:57:25
         [ssh_config.5 sshd_config.5]
         match the documented MAC order of preference to the actual one; ok dtucker@
    
    (actual patch accidentally committed with previous)

commit db4f8e86184ef0e8d14a370a5569a52d8ed28551
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 30 08:34:59 2012 +1000

       - dtucker@cvs.openbsd.org 2012/06/28 05:07:45
         [mac.c myproposal.h ssh_config.5 sshd_config.5]
         Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs since they were removed
         from draft6 of the spec and will not be in the RFC when published.  Patch
         from mdb at juniper net via bz#2023, ok markus.

commit 560de922b18fe7fcea8cc837d87cd4609738eb0f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 30 08:33:53 2012 +1000

       - dtucker@cvs.openbsd.org 2012/06/26 11:02:30
         [sandbox-systrace.c]
         Add mquery to the list of allowed syscalls for "UsePrivilegeSeparation
         sandbox" since malloc now uses it.  From johnw.mail at gmail com.

commit ea8582931f40fcf49ed8ce94711a329c0b49dc7d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 30 08:33:32 2012 +1000

       - dtucker@cvs.openbsd.org 2012/06/22 14:36:33
         [sftp.c]
         Remove unused variable leftover from tab-completion changes.
         From Steve.McClellan at radisys com, ok markus@

commit 5f58a877680d1c2c1a1b11e8e2b38353ed728327
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 30 08:33:17 2012 +1000

       - dtucker@cvs.openbsd.org 2012/06/22 12:30:26
         [monitor.c sshconnect2.c]
         remove dead code following 'for (;;)' loops.
         From Steve.McClellan at radisys com, ok markus@

commit 97f43bbfc9be102ca285af28afc288d90afa6712
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 30 08:32:29 2012 +1000

       - dtucker@cvs.openbsd.org 2012/06/21 00:16:07
         [addrmatch.c]
         fix strlcpy truncation check.  from carsten at debian org, ok markus

commit 8908da7dce7711af59c7f43b122f73293dca27ab
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 28 15:21:32 2012 +1000

     - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null
       pointer deref in the client when built with LDNS and using DNSSEC with a
       CNAME.  Patch from gregdlg+mr at hochet info.

commit 62dcd63f5ed39798b0201cf64223960ded766914
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 22 22:02:42 2012 +1000

     - (dtucker) [contrib/cygwin/ssh-host-config] Ensure that user sshd runs as
       can logon as a service.  Patch from vinschen at redhat com.

commit 6c6da33d31c898781ffb45c5d10502b0f84dd4a4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 20 22:31:26 2012 +1000

       - djm@cvs.openbsd.org 2012/06/20 04:42:58
         [clientloop.c serverloop.c]
         initialise accept() backoff timer to avoid EINVAL from select(2) in
         rekeying

commit f8268503d1b71f6cae4609a1c83b403f71a71bad
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 20 21:54:15 2012 +1000

       - jmc@cvs.openbsd.org 2012/06/19 21:35:54
         [sshd_config.5]
         tweak previous; ok markus

commit c24da77015900e4e416a9f3ac5f51001abb0fd20
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 20 21:53:58 2012 +1000

       - markus@cvs.openbsd.org 2012/06/19 18:25:28
         [servconf.c servconf.h sshd_config.5]
         sshd_config: extend Match to allow AcceptEnv and {Allow,Deny}{Users,Groups}
         this allows 'Match LocalPort 1022' combined with 'AllowUser bauer'
         ok djm@ (back in March)

commit 36378c64134c9fee2258e0fc8f1cff1bfccdfecd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 20 21:53:25 2012 +1000

       - dtucker@cvs.openbsd.org 2012/06/18 12:17:18
         [ssh.1]
         Clarify description of -W.  Noted by Steve.McClellan at radisys com, ok jmc

commit b9902cf6f6a2f657b1f2128eb01df75b309e80c6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 20 21:52:58 2012 +1000

       - dtucker@cvs.openbsd.org 2012/06/18 12:07:07
         [ssh.1 sshd.8]
         Remove mention of 'three' key files since there are now four.  From
         Steve.McClellan at radisys com.

commit 7192433633b8d4fa4315bc42eb50493c3a1125c8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 20 21:52:38 2012 +1000

       - dtucker@cvs.openbsd.org 2012/06/18 11:49:58
         [ssh_config.5]
         RSA instead of DSA twice.  From Steve.McClellan at radisys com

commit 276dcfd7f768300fb1d72abcd097d718ad72475a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 20 21:52:18 2012 +1000

       - dtucker@cvs.openbsd.org 2012/06/18 11:43:53
         [jpake.c]
         correct sizeof usage.  patch from saw at online.de, ok deraadt

commit 2e7decfcc0bd337e90649a62599e3ee8f1321b68
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 20 21:52:00 2012 +1000

       - djm@cvs.openbsd.org 2012/06/01 01:01:22
         [mux.c]
         fix memory leak when mux socket creation fails; bz#2002 from bert.wesarg
         AT googlemail.com

commit 7f12157c0a27abe045eaad92b6a2de9ca50a340b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 20 21:51:29 2012 +1000

       - djm@cvs.openbsd.org 2012/06/01 00:49:35
         [PROTOCOL.mux]
         correct types of port numbers (integers, not strings); bz#2004 from
         bert.wesarg AT googlemail.com

commit 3bde12aeef60c9e1221316aff1fe1aca78eca027
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 20 21:51:11 2012 +1000

       - djm@cvs.openbsd.org 2012/05/23 03:28:28
         [dns.c dns.h key.c key.h ssh-keygen.c]
         add support for RFC6594 SSHFP DNS records for ECDSA key types.
         patch from bugzilla-m67 AT nulld.me in bz#1978; ok + tweak markus@

commit ac58ce86e6f4dcb245d5e1aa28a5c7a9f4a56072
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 20 21:50:47 2012 +1000

       - djm@cvs.openbsd.org 2012/01/07 21:11:36
         [mux.c]
         fix double-free in new session handler
         NB. Id sync only

commit 140df63e1f07d25dafd64d3d6000dc0fe27edcf1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 20 21:46:57 2012 +1000

       - djm@cvs.openbsd.org 2011/12/04 23:16:12
         [mux.c]
         revert:
    
         > revision 1.32
         > date: 2011/12/02 00:41:56;  author: djm;  state: Exp;  lines: +4 -1
         > fix bz#1948: ssh -f doesn't fork for multiplexed connection.
         > ok dtucker@
    
         it interacts badly with ControlPersist

commit efc6fc995d894458493699e7e1becdb06edb3f83
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 20 21:44:56 2012 +1000

       - djm@cvs.openbsd.org 2011/12/02 00:41:56
         [mux.c]
         fix bz#1948: ssh -f doesn't fork for multiplexed connection.
         ok dtucker@

commit ba9ea3200dcb4ec61033e41b666f9d1fbfa35bf9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 19 19:37:33 2012 +1000

       - dtucker@cvs.openbsd.org 2012/05/19 06:30:30
         [sshd_config.5]
         Document PermitOpen none.  bz#2001, patch from Loganaden Velvindron

commit fbcf827559b38f7992e1bd0bcdc4b4ccdf63bc74
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 19 19:37:01 2012 +1000

    - (dtucker) OpenBSD CVS Sync
       - dtucker@cvs.openbsd.org 2012/05/13 01:42:32
         [servconf.h servconf.c sshd.8 sshd.c auth.c sshd_config.5]
         Add "Match LocalAddress" and "Match LocalPort" to sshd and adjust tests
         to match.  Feedback and ok djm@ markus@.

commit 593538911a4d27f11f8d56e32abe141223c25916
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 19 15:24:37 2012 +1000

     - (dtucker) [configure.ac contrib/Makefile] bz#1996: use AC_PATH_TOOL to find
       pkg-config so it does the right thing when cross-compiling.  Patch from
       cjwatson at debian org.

commit d0494fdb29bfe47dc211291f77191f25941add77
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 19 14:25:39 2012 +1000

     - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct.  Patch
       from cjwatson at debian org.

commit e1a3ddf99232292a41abf9699b44250d52687c69
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 4 11:05:45 2012 +1000

     - (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h>
       to fix building on some plaforms.  Fom bowman at math utah edu and
       des at des no.

commit d0d3fff483379baf1f38c00415c7895b41b37df9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 27 10:55:39 2012 +1000

     - (dtucker) [regress/addrmatch.sh] skip tests when running on a non-ipv6
       platform rather than exiting early, so that we still clean up and return
       status to test-exec.sh

commit 025bfd11d987b62ecfe3283acfd21933222d4330
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 26 09:52:15 2012 +1000

     - (djm) [auth-krb5.c] Save errno across calls that might modify it;
       ok dtucker@

commit 7584cb1ac4daafbfb3dec592dd7ef48b81d20eea
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 26 09:51:26 2012 +1000

     - (djm) [auth-passwd.c] Handle crypt() returning NULL; from Paul Wouters
       via Niels

commit ba77e1f67311fc76fe7ce460f7f03b6528383cbc
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 23 18:21:05 2012 +1000

       - djm@cvs.openbsd.org 2012/04/23 08:18:17
         [channels.c]
         fix function proto/source mismatch

commit 70b2d5550bd29c426414cca1d2ef9c2f6fbf5823
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 22 11:26:10 2012 +1000

       - jmc@cvs.openbsd.org 2012/04/20 16:26:22
         [ssh.1]
         use "brackets" instead of "braces", for consistency;

commit 4922315d1d307394b40a12d8f7cbb2c0363c1517
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 22 11:25:47 2012 +1000

       - djm@cvs.openbsd.org 2012/04/20 03:24:23
         [sftp.c]
         setlinebuf(3) is more readable than setvbuf(.., _IOLBF, ...)

commit 8fef9ebbab6bd68d245edbadedd52600a800c09c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 22 11:25:10 2012 +1000

       - djm@cvs.openbsd.org 2012/04/12 02:43:55
         [sshd_config sshd_config.5]
         mention AuthorizedPrincipalsFile=none default

commit 23528816dc10165b3bc009f2ab5fdf1653db418c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 22 11:24:43 2012 +1000

       - djm@cvs.openbsd.org 2012/04/12 02:42:32
         [servconf.c servconf.h sshd.c sshd_config sshd_config.5]
         VersionAddendum option to allow server operators to append some arbitrary
         text to the SSH-... banner; ok deraadt@ "don't care" markus@

commit 839f743464ae1cdd7d75b2e759738a9e8d00d609
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 22 11:24:21 2012 +1000

       - djm@cvs.openbsd.org 2012/04/11 13:34:17
         [ssh-keyscan.1 ssh-keyscan.c]
         now that sshd defaults to offering ECDSA keys, ssh-keyscan should also
         look for them by default; bz#1971

commit a116d13c4daeb5416766bc506065eb495409977e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 22 11:23:46 2012 +1000

       - djm@cvs.openbsd.org 2012/04/11 13:26:40
         [sshd.c]
         don't spin in accept() when out of fds (ENFILE/ENFILE) - back off for a
         while; ok deraadt@ markus@

commit 9fed161e67b23977a1070419b356084295422f0c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 22 11:21:43 2012 +1000

       - djm@cvs.openbsd.org 2012/04/11 13:17:54
         [auth.c]
         Support "none" as an argument for AuthorizedPrincipalsFile to indicate
         no file should be read.

commit a6508753db3c49910068d8fc324bd284d72ff153
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 22 11:21:10 2012 +1000

       - djm@cvs.openbsd.org 2012/04/11 13:16:19
         [channels.c channels.h clientloop.c serverloop.c]
         don't spin in accept() when out of fds (ENFILE/ENFILE) - back off for a
         while; ok deraadt@ markus@

commit c6081482b2b72caccce938c100c1b55f7b5e30fe
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 22 11:18:53 2012 +1000

       - dtucker@cvs.openbsd.org 2012/03/29 23:54:36
         [channels.c channels.h servconf.c]
         Add PermitOpen none option based on patch from Loganaden Velvindron
         (bz #1949).  ok djm@

commit 48348fc3b4455df8112d4e1b6de5b4f0779be875
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 22 11:08:30 2012 +1000

       - djm@cvs.openbsd.org 2012/03/28 07:23:22
         [PROTOCOL.certkeys]
         explain certificate extensions/crit split rationale. Mention requirement
         that each appear at most once per cert.

commit 29cd1888873d453f28609d8b301062cbaa4ab4d8
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 22 11:08:10 2012 +1000

       - guenther@cvs.openbsd.org 2012/03/15 03:10:27
         [session.c]
         root should always be excluded from the test for /etc/nologin instead
         of having it always enforced even when marked as ignorenologin.  This
         regressed when the logic was incompletely flipped around in rev 1.251
         ok halex@ millert@

commit a563cced062d0d74843c0ee56a82faa860f10855
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 22 11:07:28 2012 +1000

       - djm@cvs.openbsd.org 2012/02/29 11:21:26
         [ssh-keygen.c]
         allow conversion of RSA1 keys to public PEM and PKCS8; "nice" markus@

commit d5dacb43fa30c2f6d7eebbd4c5fcf906c3b5d5d8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 20 15:01:01 2012 +1000

     - (djm) Release openssh-6.0

commit bf2304167b7afc92ad6ee329f31f34f46e33affb
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 20 14:11:04 2012 +1000

     - (djm) [README] Update URL to release notes.

commit 8beb3203907248b688e366c2621d359f156af853
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 20 10:58:34 2012 +1000

     - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Update for release 6.0

commit 398c0ffe0ec149f0d12f23c158879712b5431af4
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 19 21:46:35 2012 +1000

     - (djm) [configure.ac] Fix compilation error on FreeBSD, whose libutil
       contains openpty() but not login()

commit e0956e38349d4a32f3c4a726af45a3695ff2d3c2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 4 11:27:54 2012 +1000

     - (djm) [Makefile.in configure.ac sandbox-seccomp-filter.c] Add sandbox
       mode for Linux's new seccomp filter; patch from Will Drewry; feedback
       and ok dtucker@

commit ce1ec9d4e27d4e08ef02e4e96818263d3ff2eecc
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 30 14:07:05 2012 +1100

     - (djm) [openbsd-compat/bsd-cygwin_util.h] #undef _WIN32 to avoid incorrect
       assumptions when building on Cygwin; patch from Corinna Vinschen

commit 4d55734c16aa104afea1e446788b3bc7a53999e6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 30 11:34:27 2012 +1100

     - (djm) [entropy.c] bz#1991: relax OpenSSL version test to allow running
       openssh binaries on a newer fix release than they were compiled on.
       with and ok dtucker@

commit 67ccc86506212c12e60bffd9a0e924a84800cf00
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Mar 30 10:19:56 2012 +1100

     - (dtucker) [contrib/redhat/openssh.spec] Bug #1992: remove now-gone WARNING
       file from spec file.  From crighter at nuclioss com.

commit 54c38d24c6e748b100ba305a3b15e0085f52c7d4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 9 10:28:07 2012 +1100

     - (djm) [packet.c] bz#1963: Fix IPQoS not being set on non-mapped v4-in-v6
       addressed connections. ok dtucker@

commit 7bf7b889b3bd2c4c226b8ee39b1e9abfca3d5f13
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 9 10:25:16 2012 +1100

     - (djm) [openbsd-compat/port-linux.c] bz#1960: fix crash on SELinux
       systems where sshd is run in te wrong context. Patch from Sven
       Vermeulen; ok dtucker@

commit 93a2d41505981a9f4fd5f1cffec713622215910e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 24 10:40:41 2012 +1100

     - (dtucker) [audit-bsm.c configure.ac] bug #1968: enable workarounds for BSM
       audit breakage in Solaris 11.  Patch from Magnus Johansson.

commit a3f297de91b58282e16f70efdceab9715f0068fb
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 14 23:01:42 2012 -0800

     - (tim) [regress/keytype.sh] stderr redirection needs to be inside back quote
       to work. Spotted by Angel Gonzalez

commit f79b5d38a1d2ee6402cda1f98dc957fe97755712
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 14 20:13:05 2012 -0800

     - (tim) [defines.h] move chunk introduced in 1.125 before MAXPATHLEN so
       it actually works.

commit e3609c935c93d680e39b9649520bc052576f7fc4
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 14 10:03:30 2012 -0800

     - (tim) [openbsd-compat/bsd-misc.h sshd.c] Fix conflicting return type for
       unsetenv due to rev 1.14 change to setenv.c. Cast unsetenv to void in sshd.c
       ok dtucker@

commit 7b7901c330f7b50e8c6b2929cf329c451bce6c7e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 14 06:38:36 2012 +1100

     - (djm) [openbsd-compat/bsd-cygwin_util.c] Add PROGRAMFILES to list of
       preserved Cygwin environment variables; from Corinna Vinschen

commit db854559be225497fd43fe4a1ff93356204567f3
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 11 08:19:44 2012 +1100

       - markus@cvs.openbsd.org 2012/02/09 20:00:18
         [version.h]
         move from 6.0-beta to 6.0

commit 72de982def3ee6263922d315c7c743c97f600e6c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 11 08:19:21 2012 +1100

       - markus@cvs.openbsd.org 2012/01/25 19:40:09
         [packet.c packet.h]
         packet_read_poll() is not used anymore.

commit 5d0077008f6b9ff00dac01e2265cbfe67d4fe1d0
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 11 08:19:02 2012 +1100

       - markus@cvs.openbsd.org 2012/01/25 19:36:31
         [authfile.c]
         memleak in key_load_file(); from Jan Klemkow

commit 1de2cfe9a9304b00900aaa6ff9fe612e2ba51ba8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 11 08:18:43 2012 +1100

       - markus@cvs.openbsd.org 2012/01/25 19:26:43
         [packet.c]
         do not permit SSH2_MSG_SERVICE_REQUEST/ACCEPT during rekeying;
         ok dtucker@, djm@

commit 8d60be548778c025db8daa0345f8d77331086fc6
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 11 08:18:17 2012 +1100

       - dtucker@cvs.openbsd.org 2012/01/18 21:46:43
         [clientloop.c]
         Ensure that $DISPLAY contains only valid characters before using it to
         extract xauth data so that it can't be used to play local shell
         metacharacter games.  Report from r00t_ati at ihteam.net, ok markus.

commit fb12c6d8bb6515512c3cd00dfcb2670a6c54ba49
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 11 08:17:52 2012 +1100

       - miod@cvs.openbsd.org 2012/01/16 20:34:09
         [ssh-pkcs11-client.c]
         Fix a memory leak in pkcs11_rsa_private_encrypt(), reported by Jan Klemkow.
         While there, be sure to buffer_clear() between send_msg() and recv_msg().
         ok markus@

commit 83ba8e6056af5836ef57d6d24940c4f1681262fd
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 11 08:17:27 2012 +1100

       - miod@cvs.openbsd.org 2012/01/08 13:17:11
         [ssh-ecdsa.c]
         Fix memory leak in ssh_ecdsa_verify(); from Loganaden Velvindron,
         ok markus@

commit 2ec0342ed4f1fcf4d7b140f9d91bc97c8025221a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 11 08:16:28 2012 +1100

       - djm@cvs.openbsd.org 2012/01/07 21:11:36
         [mux.c]
         fix double-free in new session handler

commit a2876db5e6a26c48bd2a20a9f347a1e668730845
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 11 08:16:06 2012 +1100

       - djm@cvs.openbsd.org 2012/01/05 00:16:56
         [monitor.c]
         memleak on error path

commit b56e4930aeada1b73d3457b452bf241236fdb1ed
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 6 07:41:27 2012 +1100

     - (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms
       that don't support ECC. Patch from Phil Oleson

commit e9b3ad73baf25fa780f853e40f91ce74f0381c76
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 17 14:03:34 2012 +1100

     - (dtucker) [configure.ac mac.c openbsd-compat/openssl-compat.h]  Add
       null implementation of HMAC_CTX_init for the benefit of old versions
       of OpenSSL that don't have it.

commit 8ed4de8f1dcebddd7edc0dd3c10f1cb947d831eb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 19 10:52:50 2011 +1100

       - djm@cvs.openbsd.org 2011/12/07 05:44:38
         [auth2.c dh.c packet.c roaming.h roaming_client.c roaming_common.c]
         fix some harmless and/or unreachable int overflows;
         reported Xi Wang, ok markus@

commit 913ddff40d090751d50be2339cd859505b24f65b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 19 10:52:21 2011 +1100

       - djm@cvs.openbsd.org 2011/12/04 23:16:12
         [mux.c]
         revert:
         > revision 1.32
         > date: 2011/12/02 00:41:56;  author: djm;  state: Exp;  lines: +4 -1
         > fix bz#1948: ssh -f doesn't fork for multiplexed connection.
         > ok dtucker@
         it interacts badly with ControlPersist

commit d0e582c6da52377417474e157632d63be55bdbd2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 19 10:51:39 2011 +1100

       - djm@cvs.openbsd.org 2011/12/02 00:43:57
         [mac.c]
         fix bz#1934: newer OpenSSL versions will require HMAC_CTX_Init before
         HMAC_init (this change in policy seems insane to me)
         ok dtucker@

commit 5360dff2a011ab2de10f92450aa9cb10703b9a01
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 19 10:51:11 2011 +1100

       - djm@cvs.openbsd.org 2011/12/02 00:41:56
         [mux.c]
         fix bz#1948: ssh -f doesn't fork for multiplexed connection.
         ok dtucker@

commit 47d8115e5347385d55b4a17b026bd131793b9e95
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 25 13:53:48 2011 +1100

       - oga@cvs.openbsd.org 2011/11/16 12:24:28
         [sftp.c]
         Don't leak list in complete_cmd_parse if there are no commands found.
         Discovered when I was ``borrowing'' this code for something else.
         ok djm@

commit 4a725ef6a54d527fa5f2b3ab56dfff67e372ccdd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 21 16:38:48 2011 +1100

     - (dtucker) [configure.ac] Set _FORTIFY_SOURCE.  ok djm@

commit aa3cbd1b5bc83a30f7deb960e3e69e56df92bc56
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 4 11:25:24 2011 +1100

     - (dtucker) [INSTALL LICENCE configure.ac openbsd-compat/Makefile.in
       openbsd-compat/getrrsetbyname-ldns.c openbsd-compat/getrrsetbyname.c]
       bz 1320: Add optional support for LDNS, a BSD licensed DNS resolver library
       which supports DNSSEC.  Patch from Simon Vallet (svallet at genoscope cns fr)
       with some rework from myself and djm.  ok djm.

commit be4032ba1e821008df614bede98bfd8f270af77a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 4 11:16:06 2011 +1100

       - dtucker@cvs.openbsd.org 011/11/04 00:09:39
         [moduli]
         regenerated moduli file; ok deraadt

commit 9c5d553d58b3f9671619ef4496c290f1b2edbf92
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 4 10:55:24 2011 +1100

       - djm@cvs.openbsd.org 2011/10/24 02:13:13
         [session.c]
         bz#1859: send tty break to pty master instead of (probably already
         closed) slave side; "looks good" markus@

commit 2d6665d944439e48b2d7c283eaddfee0890236e8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 4 10:54:22 2011 +1100

       - djm@cvs.openbsd.org 2011/10/24 02:10:46
         [ssh.c]
         bz#1943: unbreak stdio forwarding when ControlPersist is in user - ssh
         was incorrectly requesting the forward in both the control master and
         slave. skip requesting it in the master to fix. ok markus@

commit 8a057953d2c9e7462e85147c23c65da4a4cfddbc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 4 10:53:31 2011 +1100

       - djm@cvs.openbsd.org 2011/10/19 10:39:48
         [umac.c]
         typo in comment; patch from Michael W. Bombardieri

commit 9ee09cfce6c375f6a52c916803577481227189ba
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 4 10:52:43 2011 +1100

       - djm@cvs.openbsd.org 2011/10/19 00:06:10
         [moduli.c]
         s/tmpfile/tmp/ to make this -Wshadow clean

commit e68cf84ac873f0b3fd566c55d6a915fd7843e76b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 4 10:51:51 2011 +1100

       - djm@cvs.openbsd.org 2011/10/18 23:37:42
         [ssh-add.c]
         add -k to usage(); reminded by jmc@

commit 45c66d7ad4a06ffe85014c6522eebcede042e87f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 4 10:50:40 2011 +1100

       - djm@cvs.openbsd.org 2011/10/18 05:15:28
         [ssh.c]
         ssh(1): skip attempting to create ~/.ssh when -F is passed; ok markus@

commit 9f157abbb64a252a8751bc78b8acb2857447225e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 25 09:37:57 2011 +1100

     - (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file
       fails.  Patch from Corinna Vinschen.

commit 8f4279e4ab6fdc3245fe9c80e363a2f5bdf01d4f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 18 16:06:33 2011 +1100

       - djm@cvs.openbsd.org 2011/10/18 05:00:48
         [ssh-add.1 ssh-add.c]
         new "ssh-add -k" option to load plain keys (skipping certificates);
         "looks ok" markus@

commit c51a5ab2c6f7ea4ae42e70d1d00bdf57c28f8c36
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 18 16:06:14 2011 +1100

       - djm@cvs.openbsd.org 2011/10/18 04:58:26
         [auth-options.c key.c]
         remove explict search for \0 in packet strings, this job is now done
         implicitly by buffer_get_cstring; ok markus

commit 91f3eaec886825c42cf6e38d4e2af0f52b5aa35f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 18 16:05:55 2011 +1100

       - stsp@cvs.openbsd.org 2011/10/16 15:51:39
         [moduli.c]
         add missing includes to unbreak tree; fix from rpointel

commit 927d82bc6a58b112e0a12f9ad12802c7637adef3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 18 16:05:38 2011 +1100

       - jmc@cvs.openbsd.org 2011/10/16 15:02:41
         [ssh-keygen.c]
         put -K in the right place (usage());

commit 390d0561fccfba5e2e97105f75b70b32aab59578
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 18 16:05:19 2011 +1100

       - dtucker@cvs.openbsd.org 2011/10/16 11:02:46
         [moduli.c ssh-keygen.1 ssh-keygen.c]
         Add optional checkpoints for moduli screening.  feedback & ok deraadt

commit d3e6990c4ca1e6c8ad9e66f5e57a2b4545dbc940
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 18 16:04:57 2011 +1100

       - djm@cvs.openbsd.org 2011/10/04 14:17:32
         [sftp-glob.c]
         silence error spam for "ls */foo" in directory with files; bz#1683

commit 2e13560ff59c6a2879fdb5e61915238cf5921988
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 2 19:10:13 2011 +1100

       - djm@cvs.openbsd.org 2011/09/30 21:22:49
         [sshd.c]
         fix inverted test that caused logspam; spotted by henning@

commit 95125e5f43f73e1c325c85b9571d80b228b963d8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 2 19:09:07 2011 +1100

    ChangeLog entry for sshd.c rev 1.409

commit af1a60ec4f2b36ab960b8fd06483595742686ae9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 2 18:59:59 2011 +1100

       - djm@cvs.openbsd.org 2011/09/25 05:44:47
         [auth2-pubkey.c]
         improve the AuthorizedPrincipalsFile debug log message to include
         file and line number

commit 68afb8c5f242ec74f48fd86137122399435dd757
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 2 18:59:03 2011 +1100

       - markus@cvs.openbsd.org 2011/09/23 07:45:05
         [mux.c readconf.h channels.h compat.h compat.c ssh.c readconf.c channels.c     version.h]
         unbreak remote portforwarding with dynamic allocated listen ports:
         1) send the actual listen port in the open message (instead of 0).
            this allows multiple forwardings with a dynamic listen port
         2) update the matching permit-open entry, so we can identify where
            to connect to
         report: den at skbkontur.ru and P. Szczygielski
         feedback and ok djm@

commit 1338b9e067055259033a05e14db0bc2ad5536482
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 2 18:57:35 2011 +1100

       - dtucker@cvs.openbsd.org 2011/09/23 00:22:04
         [channels.c auth-options.c servconf.c channels.h sshd.8]
         Add wildcard support to PermitOpen, allowing things like "PermitOpen
         localhost:*".  bz #1857, ok djm markus.

commit b0b29cc0c5befffd9902a8e6e634c4473c8687a1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 2 18:49:24 2011 +1100

    remove SELECT_REQUIRED_FDS added erroneously with strnlen. spotted by tim

commit 036876cd7d53236278fcfbd3a89e4ed9a4d9a214
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 1 18:46:12 2011 +1000

     - (dtucker) [openbsd-compat/mktemp.c] Fix compiler warning.  ok djm

commit b54f50e5d0053e2c79fbb5032722aca541fdc6c1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 29 23:17:18 2011 +1000

     - (dtucker) [configure.ac openbsd-compat/Makefile.in
       openbsd-compat/strnlen.c] Add strnlen to the compat library.

commit 5ffe1c4b437a519c90b2017ce8afeef0f845207c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 29 11:11:51 2011 +1000

     - (djm) [configure.ac defines.h] No need to detect sizeof(char); patch
       from des AT des.no

commit d1a74580f8c7ca34758ffe319ef4e7cbb5c48bb9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 23 11:26:34 2011 +1000

     - (djm) [openbsd-compat/setenv.c] Forklift upgrade, including inclusion
       of static __findenv() function from upstream setenv.c

commit 3e6fe87ef99f8ed17d90f0334921183c058697e6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 23 11:16:09 2011 +1000

       - otto@cvs.openbsd.org 2008/12/09 19:38:38
         [openbsd-compat/inet_ntop.c]
         fix inet_ntop(3) prototype; ok millert@ libc to be bumbed very soon

commit 64efe9671d1b2056e8799dc3a4a2e87925d9804b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 23 11:13:00 2011 +1000

     - (djm) [openbsd-compat/sha2.c openbsd-compat/sha2.h] Remove OpenBSD rcsid
       marker. The upstream API has changed (function and structure names)
       enough to put it out of sync with other providers of this interface.

commit 48886713435eb8c62c04b615edad36aebb5fa30b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 23 10:56:29 2011 +1000

     - (djm) [openbsd-compat/mktemp.c] forklift upgrade to -current version.
       The file was totally rewritten between what we had in tree and -current.

commit 3a359b3228fae226d4d73e7b9021c15904d274b4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 23 10:47:29 2011 +1000

       - millert@cvs.openbsd.org 2008/08/21 16:54:44
         [mktemp.c]
         Remove useless code, the kernel will set errno appropriately if an
         element in the path does not exist.  OK deraadt@ pvalchev@

commit dc0e09b41c0de295e1c5d902a52343259130e76f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 23 10:46:48 2011 +1000

       - deraadt@cvs.openbsd.org 2008/07/22 21:47:45
         [mktemp.c]
         use arc4random_uniform(); ok djm millert

commit cd92790fcb0e26fb7c7819ea548583aa06b469bf
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 23 10:44:03 2011 +1000

     - (djm) [openbsd-compat/getgrouplist.c] Remove OpenBSD rcsid marker: the
       upstream version is YPified and we don't want this

commit 834e82031749cb039ad9258314e62ebf25ca4365
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 23 10:42:02 2011 +1000

       - tobias@cvs.openbsd.org 2007/10/21 11:09:30
         [mktemp.c]
         Comment fix about time consumption of _gettemp.
         FreeBSD did this in revision 1.20.
         OK deraadt@, krw@

commit acdf3fbdba747125c1d8d2dce8c5ffb3ddd23f58
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 23 10:40:50 2011 +1000

     - (djm) [openbsd-compat/getcwd.c] Remove OpenBSD rcsid marker since we no
       longer want to sync this file (OpenBSD uses a __getcwd syscall now, we
       want this longhand version)

commit b9cd0491f712ec489edf94977e9867be1b8e157c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 23 10:38:11 2011 +1000

       - millert@cvs.openbsd.org 2006/05/05 15:27:38
         [openbsd-compat/strlcpy.c]
         Convert do {} while loop -> while {} for clarity.  No binary change
         on most architectures.  From Oliver Smith.  OK deraadt@ and henning@

commit add1e20802bb781593ac7554a4c45b1576eca3ca
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 23 10:38:01 2011 +1000

       - millert@cvs.openbsd.org 2006/05/05 15:27:38
         [strlcpy.c]
         Convert do {} while loop -> while {} for clarity.  No binary change
         on most architectures.  From Oliver Smith.  OK deraadt@ and henning@

commit d7be70d0524abbc37861af61a75f576d7f82d93b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:43:06 2011 +1000

       - djm@cvs.openbsd.org 2011/09/22 06:29:03
         [sftp.c]
         don't let remote_glob() implicitly sort its results in do_globbed_ls() -
         in all likelihood, they will be resorted anyway

commit 57c38ac7d5e81c9fa6643ec8a3ed08c0c96bde64
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:42:45 2011 +1000

       - markus@cvs.openbsd.org 2011/09/12 08:46:15
         [sftp-client.c]
         fix leak in do_lsreaddir(); ok djm

commit 3decdba42525170d56755bbdab1997b5004d3b9f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:41:05 2011 +1000

       - markus@cvs.openbsd.org 2011/09/11 16:07:26
         [sftp-client.c]
         fix leaks in do_hardlink() and do_readlink(); bz#1921
         from Loganaden Velvindron

commit 1bcbd0a9de64b3c633e2293c74c750908aac2af4
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:40:45 2011 +1000

       - okan@cvs.openbsd.org 2011/09/11 06:59:05
         [ssh.1]
         document new -O cancel command; ok djm@

commit ff773644e6892e6d3999b0e0c69f05b56705eabc
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:39:48 2011 +1000

       - markus@cvs.openbsd.org 2011/09/10 22:26:34
         [channels.c channels.h clientloop.c ssh.1]
         support cancellation of local/dynamic forwardings from ~C commandline;
         ok & feedback djm@

commit f6dff7cd2ff5eba5cd63e3a9c7bf6ccf183cb056
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:38:52 2011 +1000

       - djm@cvs.openbsd.org 2011/09/09 22:46:44
         [channels.c channels.h clientloop.h mux.c ssh.c]
         support for cancelling local and remote port forwards via the multiplex
         socket. Use ssh -O cancel -L xx:xx:xx -R yy:yy:yy user@host" to request
         the cancellation of the specified forwardings; ok markus@

commit 9ee2c606c1d03ecb955aa8a2624b9db4aa9752a2
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:38:30 2011 +1000

       - djm@cvs.openbsd.org 2011/09/09 22:38:21
         [sshd.c]
         kill the preauth privsep child on fatal errors in the monitor;
         ok markus@

commit 0603d98b4e014acdca549d8d090d93759207e5fa
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:38:00 2011 +1000

       - djm@cvs.openbsd.org 2011/09/09 22:37:01
         [scp.c]
         suppress adding '--' to remote commandlines when the first argument
         does not start with '-'. saves breakage on some difficult-to-upgrade
         embedded/router platforms; feedback & ok dtucker ok markus

commit 4cb855b070a814b0148ae0f3f5cbd5f8e255c8be
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:37:38 2011 +1000

       - djm@cvs.openbsd.org 2011/09/09 00:44:07
         [PROTOCOL.mux]
         MUX_C_CLOSE_FWD includes forward type in message (though it isn't
         implemented anyway)

commit f6e758cdba3db30053afc4254b071ddae761a5df
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:37:13 2011 +1000

       - djm@cvs.openbsd.org 2011/09/09 00:43:00
         [ssh_config.5 sshd_config.5]
         fix typo in IPQoS parsing: there is no "AF14" class, but there is
         an "AF21" class. Spotted by giesen AT snickers.org; ok markus stevesk

commit 6232a16a9aab31a01481b2459ae2e675775dd1d8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:36:00 2011 +1000

       - deraadt@cvs.openbsd.org 2011/09/07 02:18:31
         [ssh-keygen.1]
         typo (they vs the) found by Lawrence Teo

commit e029673f1fa27488817861ba4ad02ea23ea9145c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:34:56 2011 +1000

       - jmc@cvs.openbsd.org 2011/09/05 07:01:44
         [scp.1]
         knock out a useless Ns;

commit 2918e030fc0afb9064d6b884c4f80393b552d2a5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:34:35 2011 +1000

       - djm@cvs.openbsd.org 2011/09/05 05:59:08
         [misc.c]
         fix typo in IPQoS parsing: there is no "AF14" class, but there is
         an "AF21" class. Spotted by giesen AT snickers.org; ok markus stevesk

commit e577772a89ba6ba37b3f9bbfebcc037c3711c138
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:34:15 2011 +1000

       - djm@cvs.openbsd.org 2011/09/05 05:56:13
         [scp.1 sftp.1]
         mention ControlPersist and KbdInteractiveAuthentication in the -o
         verbiage in these pages too (prompted by jmc@)

commit efad7275170c877e5ccb442b6eb99c7d3675622a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:33:53 2011 +1000

       - djm@cvs.openbsd.org 2011/08/26 01:45:15
         [ssh.1]
         Add some missing ssh_config(5) options that can be used in ssh(1)'s
         -o argument. Patch from duclare AT guu.fi

commit e128a50e35eb4eabcf234ada07f07b8749b5e49c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:22:21 2011 +1000

       - djm@cvs.openbsd.org 2011/09/22 06:27:29
         [glob.c]
         fix GLOB_KEEPSTAT without GLOB_NOSORT; the implicit sort was being
         applied only to the gl_pathv vector and not the corresponding gl_statv
         array. reported in OpenSSH bz#1935; feedback and okay matthew@

commit c4bf7dde9231194f4e38140a46e9957758317cb5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:21:48 2011 +1000

       - stsp@cvs.openbsd.org 2011/09/20 10:18:46
         [glob.c]
         In glob(3), limit recursion during matching attempts. Similar to
         fnmatch fix. Also collapse consecutive '*' (from NetBSD).
         ok miod deraadt

commit e01a6270477bc4037ec8b48c5c19caf6be0818c6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 22 21:20:21 2011 +1000

       - pyr@cvs.openbsd.org 2011/05/12 07:15:10
         [openbsd-compat/glob.c]
         When the max number of items for a directory has reached GLOB_LIMIT_READDIR
         an error is returned but closedir() is not called.
         spotted and fix provided by Frank Denis obsd-tech@pureftpd.org
         ok otto@, millert@

commit e8a82c5fafdbe4ffd4295c25a4cce5ff131a1524
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 9 11:29:40 2011 +1000

     - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng.  From
       Colin Watson.

commit 022ee24197ba115b41d7914daabfb231befdfa70
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 7 09:15:02 2011 +1000

     - (djm) [contrib/redhat/openssh.spec] Correct restorcon => restorecon

commit fb9d8173f05e8e9ad985fbcf340170e2a24fab8d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 7 09:11:53 2011 +1000

     - (djm) [README version.h] Correct version

commit 8e4a71e952ca2092aa6020d1afc4e0a05ba5125c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 5 15:39:20 2011 +1000

     - (djm) Release OpenSSH-5.9

commit 86dcd3e45aa476aa751101c98990b20f431044dd
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 5 10:29:04 2011 +1000

     - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Update version numbers.

commit 0dd24e02ec85146660302a7bcc491a0515b983ae
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 4 19:59:26 2011 +1000

     - (dtucker) [ssh-keygen.c ssh-pkcs11.c] Bug #1929: add null implementations
       ofsh-pkcs11.cpkcs_init and pkcs_terminate for building without dlopen support.

commit 6efd94f32e7ddf3cfdb94f0a3f91310304f8f6b5
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 4 19:04:16 2011 +1000

     - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal
       regress errors for the sandbox to warnings. ok tim dtucker

commit 58ac11a2bd0935aee87b8cc60e2b724e71c41207
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 29 16:09:52 2011 +1000

     - (djm) [openbsd-compat/port-linux.c] Suppress logging when attempting
       to switch SELinux context away from unconfined_t, based on patch from
       Jan Chadima; bz#1919 ok dtucker@

commit 4438354870aa3bdbf52d9bc7bf20c85aa3fff1f9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 28 04:50:16 2011 +1000

     - (dtucker) [auth-skey.c] Add log.h to fix build --with-skey.

commit a6e60616be992b689945fe349fbc652f3cf29f3c
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Aug 17 21:48:22 2011 -0700

     - (tim) [configure.ac] Typo in error message spotted by Andy Tsouladze

commit 2df1bec086db1cf53db6620c18d88ae9cb27bb89
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 17 12:25:46 2011 +1000

     - (djm) [regress/cipher-speed.sh regress/try-ciphers.sh] disable HMAC-SHA2
       MAC tests for platforms that hack EVP_SHA2 support

commit 062fa30532fdce4c2837e9d4e265595aa1cbca14
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 17 12:10:02 2011 +1000

       - djm@cvs.openbsd.org 2011/08/02 01:23:41
         [regress/cipher-speed.sh regress/try-ciphers.sh]
         add SHA256/SHA512 based HMAC modes

commit faf4d80420af1eb5074a1ae2ce9fc3e1bf9850c0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 17 12:09:19 2011 +1000

       - markus@cvs.openbsd.org 2011/06/30 22:44:43
         [connect-privsep.sh]
         test with sandbox enabled; ok djm@

commit 9231c8bde4169895243a9f3e2dff09ae795c0d21
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 17 12:08:15 2011 +1000

       - dtucker@cvs.openbsd.org 2011/06/03 05:35:10
         [regress/cfgmatch.sh]
         use OBJ to find test configs, patch from Tim Rice

commit 44a6c9340ab0ae5fe616b0ae291187e8187f2ec6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 17 12:01:44 2011 +1000

     - (djm) [contrib/ssh-copy-id] Missing backlslash; spotted by
       bisson AT archlinux.org

commit 1a91c0f163f0a53e092e7832791a09d659567546
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 17 11:59:25 2011 +1000

     - (djm) [configure.ac] error out if the host lacks the necessary bits for
       an explicitly requested sandbox type

commit 9c08312968c965aca19d21f08407e21f5824f8b4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 17 11:31:07 2011 +1000

     - (djm) [ openbsd-compat/bsd-cygwin_util.c openbsd-compat/bsd-cygwin_util.h]
       binary_pipe is no longer required on Cygwin; patch from Corinna Vinschen

commit a1226828add427f4ff29462b3153b1549d3b46a8
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Aug 16 17:29:01 2011 -0700

     - (tim) [mac.c myproposal.h] Wrap SHA256 and SHA512 in ifdefs for
       OpenSSL 0.9.7. ok djm

commit d1eb1dd5edf4960c1b4cbcda6cfc23462fe4f9fa
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 12 11:22:47 2011 +1000

     - (djm) [contrib/ssh-copy-id] Fix failure for cases where the path to the
       identify file contained whitespace. bz#1828 patch from gwenael.lambrouin
       AT gmail.com; ok dtucker@

commit 2db9977c061ff027bafa488c8e9afad505be773e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 12 11:02:35 2011 +1000

     - (djm) [contrib/redhat/openssh.spec contrib/redhat/sshd.init]
       [contrib/suse/openssh.spec contrib/suse/rc.sshd] Updated RHEL and SLES
       init scrips from imorgan AT nas.nasa.gov

commit 4d47ec9c892883b60b496335425b427a48498bbc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 12 10:12:53 2011 +1000

     - (dtucker) [openbsd-compat/port-linux.c] Bug 1924: Improve selinux context
       change error by reporting old and new context names  Patch from
       jchadima at redhat.

commit ddccfb4b985ec765c605fb4eb1e6b54ad9321020
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 7 23:12:26 2011 +1000

       - dtucker@cvs.openbsd.org 2011/08/07 12:55:30
         [sftp.1]
         typo, fix from Laurent Gautrot

commit 91e6b577290057b123ade507d6cfe8ed841afe92
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 7 23:10:56 2011 +1000

       - jmc@cvs.openbsd.org 2010/10/14 20:41:28
         [moduli.5]
         probabalistic -> probabilistic; from naddy

commit f279474f1b81c194e29aea2e2da0872bda85e703
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 7 23:10:11 2011 +1000

       - sobrado@cvs.openbsd.org 2009/10/28 08:56:54
         [moduli.5]
         "Diffie-Hellman" is the usual spelling for the cryptographic protocol
         first published by Whitfield Diffie and Martin Hellman in 1976.
         ok jmc@

commit 578451ddda0f591b5186f005253af4c9f78c3321
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 7 23:09:20 2011 +1000

     - (dtucker) OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2008/06/26 06:59:39
         [moduli.5]
         tweak previous;

commit 765f8c4effc6afdb4fa26daf1f72c3b660abb220
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 6 06:18:16 2011 +1000

       - djm@cvs.openbsd.org 2011/08/02 23:15:03
         [ssh.c]
         typo in comment

commit c471860d25d0d769a0f261f97a59e2a64e6a2781
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 6 06:17:48 2011 +1000

       - djm@cvs.openbsd.org 2011/08/02 23:13:01
         [version.h]
         crank now, release later

commit 20bd4535c01f4a47f535d6e4dc84420a6c5425a5
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 6 06:17:30 2011 +1000

       - djm@cvs.openbsd.org 2011/08/02 01:22:11
         [mac.c myproposal.h ssh.1 ssh_config.5 sshd.8 sshd_config.5]
         Add new SHA256 and SHA512 based HMAC modes from
         http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt
         Patch from mdb AT juniper.net; feedback and ok markus@

commit adb467fb692600c569d8129dfd96371b481d2653
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 6 06:16:46 2011 +1000

       - markus@cvs.openbsd.org 2011/08/01 19:18:15
         [gss-serv.c]
         prevent post-auth resource exhaustion (int overflow leading to 4GB malloc);
         report Adam Zabrock; ok djm@, deraadt@

commit 35e48198a80aba7361bce8dde4fba464800e3ff6
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 6 06:16:23 2011 +1000

       - djm@cvs.openbsd.org 2011/07/29 14:42:45
         [sandbox-systrace.c]
         fail open(2) with EPERM rather than SIGKILLing the whole process. libc
         will call open() to do strerror() when NLS is enabled;
         feedback and ok markus@

commit 6ea5e44871314a980e7506282450b58fc78ae9aa
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 6 06:16:00 2011 +1000

       - tedu@cvs.openbsd.org 2011/07/06 18:09:21
         [authfd.c]
         bzero the agent address.  the kernel was for a while very cranky about
         these things.  evne though that's fixed, always good to initialize
         memory.  ok deraadt djm

commit 7741ce8bd2d0aef8aae0c2406eb51b617f1165fe
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 6 06:15:15 2011 +1000

       - djm@cvs.openbsd.org 2011/06/23 23:35:42
         [monitor.c]
         ignore EINTR errors from poll()

commit cd5e52ee784f0ff67b60ffeeab335ed64df688a4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 27 07:18:18 2011 +1000

     - (djm) [configure.ac Makefile.in sandbox-darwin.c] Add a sandbox for
       Darwin/OS X using sandbox_init() + setrlimit(); feedback and testing
       markus@

commit dcbd41e7aff4c7ef10dd13d8833a8cba82f9a794
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 23 19:45:51 2011 +1000

       - djm@cvs.openbsd.org 2011/06/23 09:34:13
         [sshd.c ssh-sandbox.h sandbox.h sandbox-rlimit.c sandbox-systrace.c]
         [sandbox-null.c]
         rename sandbox.h => ssh-sandbox.h to make things easier for portable

commit 80b62e37384b14187b6d9fa5eb3cf6bf04a3cf3a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 23 19:03:18 2011 +1000

     - (djm) [sandbox-null.c] Dummy sandbox for platforms that don't support
       setrlimit(2)

commit 6d7b4377dd740a215ded149b5ffbc871ba7891f8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 23 08:31:57 2011 +1000

       - djm@cvs.openbsd.org 2011/06/22 22:08:42
         [channels.c channels.h clientloop.c clientloop.h mux.c ssh.c]
         hook up a channel confirm callback to warn the user then requested X11
         forwarding was refused by the server; ok markus@

commit 69ff1df952eebf0489b775a60ede094eaf596a05
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 23 08:30:03 2011 +1000

       - djm@cvs.openbsd.org 2011/06/22 21:57:01
         [servconf.c servconf.h sshd.c sshd_config.5 sandbox-rlimit.c]
         [sandbox-systrace.c sandbox.h configure.ac Makefile.in]
         introduce sandboxing of the pre-auth privsep child using systrace(4).
    
         This introduces a new "UsePrivilegeSeparation=sandbox" option for
         sshd_config that applies mandatory restrictions on the syscalls the
         privsep child can perform. This prevents a compromised privsep child
         from being used to attack other hosts (by opening sockets and proxying)
         or probing local kernel attack surface.
    
         The sandbox is implemented using systrace(4) in unsupervised "fast-path"
         mode, where a list of permitted syscalls is supplied. Any syscall not
         on the list results in SIGKILL being sent to the privsep child. Note
         that this requires a kernel with the new SYSTR_POLICY_KILL option.
    
         UsePrivilegeSeparation=sandbox will become the default in the future
         so please start testing it now.
    
         feedback dtucker@; ok markus@

commit 82c558761d0fa42dc954d62812b9e4b4a94f64bd
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 23 08:20:30 2011 +1000

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2011/06/22 21:47:28
         [servconf.c]
         reuse the multistate option arrays to pretty-print options for "sshd -T"

commit 4ac99c366cc1c2afacabc1a8df560aaee5a07b98
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 20 14:43:31 2011 +1000

       - djm@cvs.openbsd.org 2011/06/17 21:57:25
         [clientloop.c]
         setproctitle for a mux master that has been gracefully stopped;
         bz#1911 from Bert.Wesarg AT googlemail.com

commit 33322127ec41b04e380123d2ed4ae1df20bf18cc
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 20 14:43:11 2011 +1000

       - djm@cvs.openbsd.org 2011/06/17 21:47:35
         [servconf.c]
         factor out multi-choice option parsing into a parse_multistate label
         and some support structures; ok dtucker@

commit f145a5be1c7d7849c3c2699d32d253b26d0c895a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 20 14:42:51 2011 +1000

       - djm@cvs.openbsd.org 2011/06/17 21:46:16
         [sftp-server.c]
         the protocol version should be unsigned; bz#1913 reported by mb AT
         smartftp.com

commit 8f0bf237d4e699d00c2febaf1b88a9b9b827e77e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 20 14:42:23 2011 +1000

       - djm@cvs.openbsd.org 2011/06/17 21:44:31
         [log.c log.h monitor.c monitor.h monitor_wrap.c monitor_wrap.h sshd.c]
         make the pre-auth privsep slave log via a socketpair shared with the
         monitor rather than /var/empty/dev/log; ok dtucker@ deraadt@ markus@

commit e7ac2bd42ad16c2e2485331641befedebaebdb46
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 20 14:23:25 2011 +1000

       - markus@cvs.openbsd.org 2011/06/14 22:49:18
         [authfile.c]
         make sure key_parse_public/private_rsa1() no longer consumes its input
         buffer.  fixes ssh-add for passphrase-protected ssh1-keys;
         noted by naddy@; ok djm@

commit 6029e076b2c58f5a2cb0dce370b1f14912104fcd
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 20 14:22:49 2011 +1000

       - djm@cvs.openbsd.org 2011/06/04 00:10:26
         [ssh_config.5]
         explain IdentifyFile's semantics a little better, prompted by bz#1898
         ok dtucker jmc

commit bc481570d14b6061fe4cb286cec56d555351c28d
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jun 2 22:26:19 2011 -0700

     - (tim) [regress/cfgmatch.sh] Build/test out of tree fix.

commit bf4d05a37ca67a2b2c69ef072652b6be3b24fd76
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 3 14:19:02 2011 +1000

       - dtucker@cvs.openbsd.org 2011/06/03 00:29:52
         [regress/dynamic-forward.sh]
         Retry establishing the port forwarding after a small delay, should make
         the tests less flaky when the previous test is slow to shut down and free
         up the port.

commit 75e035c34e323cccb19aab5d58cb9c706ce8fcee
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 3 14:18:17 2011 +1000

       - dtucker@cvs.openbsd.org 2011/05/31 02:03:34
         [regress/dynamic-forward.sh]
         work around startup and teardown races; caught by deraadt

commit 260c8fbc4d8c5865fc312ed56a48b36817507b30
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 3 14:17:27 2011 +1000

        - dtucker@cvs.openbsd.org 2011/05/31 02:01:58
         [regress/dynamic-forward.sh]
         back out revs 1.6 and 1.5 since it's not reliable

commit 3e78a516a0f476f193bc3b566b5e0919d29ccc17
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 3 14:14:16 2011 +1000

       - dtucker@cvs.openbsd.org 2011/06/03 01:37:40
         [ssh-agent.c]
         Check current parent process ID against saved one to determine if the parent
         has exited, rather than attempting to send a zero signal, since the latter
         won't work if the parent has changed privs.  bz#1905, patch from Daniel Kahn
         Gillmor, ok djm@

commit c09182f61366f31609224765b36386bab84298b2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 3 12:11:38 2011 +1000

     - (djm) [configure.ac] enable setproctitle emulation for OS X

commit ea2c1a4dc6b0568ec1c74f94adee124ad8a60c68
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 3 12:10:22 2011 +1000

      - djm@cvs.openbsd.org 2011/06/03 00:54:38
        [ssh.c]
        bz#1883 - setproctitle() to identify mux master; patch from Bert.Wesarg
        AT googlemail.com; ok dtucker@
        NB. includes additional portability code to enable setproctitle emulation
        on platforms that don't support it.

commit c3c7227ccc4443a0b9bf180ee660fef47a064cdf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 3 11:20:06 2011 +1000

    add missing changelog entry

commit dd9e0385abcf9dd2e6c9fe6dc082b0ffd4ae2bac
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 3 11:17:52 2011 +1000

    Remove the !HAVE_SOCKETPAIR case.  We use socketpair unconditionally in other
    places and the survey data we have does not show any systems that use it.
    "nuke it" djm@

commit 90f42b07058d0813e258db90ccdd5da839844d19
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jun 2 18:17:49 2011 -0700

     - (tim) [configure.ac defines.h] Run test program to detect system mail
       directory. Add --with-maildir option to override. Fixed OpenServer 6
       getting it wrong. Fixed many systems having MAIL=/var/mail//username
       ok dtucker

commit c412c1567b6d9eac77bbb43f450b95ef47389ad1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 3 10:35:23 2011 +1000

     - (dtucker) [README version.h contrib/caldera/openssh.spec
       contrib/redhat/openssh.spec contrib/suse/openssh.spec] Pull the version
       bumps from the 5.8p2 branch into HEAD.  ok djm.

commit 8cb3587336d3fe8e67db1d75da5f4c11456d3f1a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 29 21:59:10 2011 +1000

       - djm@cvs.openbsd.org 2011/05/23 03:31:31
         [regress/cfgmatch.sh]
         include testing of multiple/overridden AuthorizedKeysFiles
         refactor to simply daemon start/stop and get rid of racy constructs

commit 295ee63ab2123899fb21f76616ef4dac51515236
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 29 21:42:31 2011 +1000

       - djm@cvs.openbsd.org 2011/05/24 07:15:47
         [readconf.c readconf.h ssh.c ssh_config.5 sshconnect.c sshconnect2.c]
         Remove undocumented legacy options UserKnownHostsFile2 and
         GlobalKnownHostsFile2 by making UserKnownHostsFile/GlobalKnownHostsFile
         accept multiple paths per line and making their defaults include
         known_hosts2; ok markus

commit 04bb56ef10bca3219010fdb191f1f9941353174b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 29 21:42:08 2011 +1000

       - djm@cvs.openbsd.org 2011/05/23 07:24:57
         [authfile.c]
         read in key comments for v.2 keys (though note that these are not
         passed over the agent protocol); bz#439, based on patch from binder
         AT arago.de; ok markus@

commit b9132fc42717152cdb222a01595a4e6c04e257b3
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 29 21:41:40 2011 +1000

       - jmc@cvs.openbsd.org 2011/05/23 07:10:21
         [sshd.8 sshd_config.5]
         tweak previous; ok djm

commit 201f425d298d3c1c43fac122e2e0bcbf7a707939
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 29 21:41:03 2011 +1000

       - djm@cvs.openbsd.org 2011/05/23 03:52:55
         [sshconnect.c]
         remove extra newline

commit 1dd66e5f748af2de4e0d83fa66d2f663ba62146d
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 29 21:40:42 2011 +1000

       - djm@cvs.openbsd.org 2011/05/23 03:33:38
         [auth.c]
         make secure_filename() spam debug logs less

commit d8478b6a9b32760d47c2419279c4a73f5f88fdb6
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 29 21:39:36 2011 +1000

    OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2011/05/23 03:30:07
         [auth-rsa.c auth.c auth.h auth2-pubkey.c monitor.c monitor_wrap.c pathnames.h servconf.c servconf.h sshd.8 sshd_config sshd_config.5]
         allow AuthorizedKeysFile to specify multiple files, separated by spaces.
         Bring back authorized_keys2 as a default search path (to avoid breaking
         existing users of this file), but override this in sshd_config so it will
         be no longer used on fresh installs. Maybe in 2015 we can remove it
         entierly :)
    
         feedback and ok markus@ dtucker@

commit acacced70b3fd520ee3f12d3f477f9fd7c2f687a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 19:08:40 2011 +1000

       - dtucker@cvs.openbsd.org 2011/05/20 06:32:30
         [dynamic-forward.sh]
         fix dumb error in dynamic-forward test

commit 7b9451f382156bdc20945a63c1507a466959fab1
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 19:08:11 2011 +1000

       - dtucker@cvs.openbsd.org 2011/05/20 05:19:50
         [dynamic-forward.sh]
         Prevent races in dynamic forwarding test; ok djm

commit 3045b45a030f04af7daf9037939a8aca5a54a574
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 19:07:45 2011 +1000

       - djm@cvs.openbsd.org 2011/05/20 02:43:36
         [cert-hostkey.sh]
         another attempt to generate a v00 ECDSA key that broke the test
         ID sync only - portable already had this somehow

commit f67188fe13d3ac96493c9cd67e87f64fd07f20e5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 19:06:48 2011 +1000

       - djm@cvs.openbsd.org 2011/05/17 07:13:31
         [regress/cert-userkey.sh]
         fatal() if asked to generate a legacy ECDSA cert (these don't exist)
         and fix the regress test that was trying to generate them :)

commit f2e407e2dd83addc26b68b4218d8b6ceaceca54b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 19:04:14 2011 +1000

       - djm@cvs.openbsd.org 2011/05/20 03:25:45
         [monitor.c monitor_wrap.c servconf.c servconf.h]
         use a macro to define which string options to copy between configs
         for Match. This avoids problems caused by forgetting to keep three
         code locations in perfect sync and ordering
    
         "this is at once beautiful and horrible" + ok dtucker@

commit c2411909c7ff298744998e00c7a5f1f64fbb0349
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 19:03:49 2011 +1000

       - dtucker@cvs.openbsd.org 2011/05/20 02:00:19
         [servconf.c]
         Add comment documenting what should be after the preauth check.  ok djm

commit 5d74e58e62df1e80c23ff8444ff22483cba1995a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 19:03:31 2011 +1000

       - djm@cvs.openbsd.org 2011/05/20 00:55:02
         [servconf.c]
         the options TrustedUserCAKeys, RevokedKeysFile, AuthorizedKeysFile
         and AuthorizedPrincipalsFile were not being correctly applied in
         Match blocks, despite being overridable there; ok dtucker@

commit 8f639fe722133495eebad594f2f9c886857a5ef8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 19:03:08 2011 +1000

       - djm@cvs.openbsd.org 2011/05/17 07:13:31
         [key.c]
         fatal() if asked to generate a legacy ECDSA cert (these don't exist)
         and fix the regress test that was trying to generate them :)

commit 814ace08751a80c3b965c06fdfc1c9ac3d7698ca
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 19:02:47 2011 +1000

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2011/05/15 08:09:01
         [authfd.c monitor.c serverloop.c]
         use FD_CLOEXEC consistently; patch from zion AT x96.org

commit ec2eaa3daf7f5543d8619cec30c1d73268323d01
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 18:57:14 2011 +1000

     - (djm) [servconf.c] remove leftover droppings of AuthorizedKeysFile2

commit 989bb7f0c5c52ebe55f7ab1d9c7fef826cb0aaa4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 18:56:30 2011 +1000

     - (djm) [aclocal.m4 configure.ac] since gcc-4.x ignores all -Wno-options
       options, we should corresponding -W-option when trying to determine
       whether it is accepted.  Also includes a warning fix on the program
       fragment uses (bad main() return type).
       bz#1900 and bz#1901 reported by g.esp AT free.fr; ok dtucker@

commit b176362d26dd746819b6287e4702bce90eefa2c1
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 11:45:25 2011 +1000

     - (djm) [aclocal.m4 configure.ac] since gcc-4.x ignores all -Wno-options
       options, we should corresponding -W-option when trying to determine
       whether it is accepted.  Also includes a warning fix on the program
       fragment uses (bad main() return type).
       bz#1900 and bz#1901 reported by g.esp AT free.fr; ok dtucker@

commit 14684a1f84e2c8fc949ccff1a6dce10e9bf52ac2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 20 11:23:07 2011 +1000

     - (djm) [session.c] call setexeccon() before executing passwd for pw
       changes; bz#1891 reported by jchadima AT redhat.com; ok dtucker@

commit 23f425b48b5c496a4a2f5289a491852e21a97623
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:58:15 2011 +1000

     - (djm) [packet.c] unbreak portability #endif

commit 9d276b8d689b4dc878fa6154e7b449c1c0c85290
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:51:43 2011 +1000

       - djm@cvs.openbsd.org 2011/05/13 00:05:36
         [authfile.c]
         warn on unexpected key type in key_parse_private_type()

commit 7c1b2c4ea8a5d06908dda3f8e406b902b81fe905
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:51:05 2011 +1000

       - djm@cvs.openbsd.org 2011/05/11 04:47:06
         [auth.c auth.h auth2-pubkey.c pathnames.h servconf.c servconf.h]
         remove support for authorized_keys2; it is a relic from the early days
         of protocol v.2 support and has been undocumented for many years;
         ok markus@

commit 3219824f2d8b0ea1711818745b046931ffcd3918
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:50:32 2011 +1000

       - djm@cvs.openbsd.org 2011/05/10 05:46:46
         [authfile.c]
         despam debug() logs by detecting that we are trying to load a private key
         in key_try_load_public() and returning early; ok markus@

commit 555f3b856f2681b46870a66386396b49426b9719
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:48:05 2011 +1000

       - djm@cvs.openbsd.org 2011/05/08 12:52:01
         [PROTOCOL.mux clientloop.c clientloop.h mux.c]
         improve our behaviour when TTY allocation fails: if we are in
         RequestTTY=auto mode (the default), then do not treat at TTY
         allocation error as fatal but rather just restore the local TTY
         to cooked mode and continue. This is more graceful on devices that
         never allocate TTYs.
    
         If RequestTTY is set to "yes" or "force", then failure to allocate
         a TTY is fatal.
    
         ok markus@

commit f4b32aad05cb65caa6eabe09049750b3c8a29cf3
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:47:43 2011 +1000

       - jmc@cvs.openbsd.org 2011/05/07 23:20:25
         [ssh.1]
         +.It RequestTTY

commit 486dd2eadbbb4d51d0062789fdb8d8f7a3fe51fd
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:47:18 2011 +1000

       - jmc@cvs.openbsd.org 2011/05/07 23:19:39
         [ssh_config.5]
         - tweak previous
         - come consistency fixes
    
         ok djm

commit c067f6256048f01e646cc3db71ad3d836a742ac1
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:46:54 2011 +1000

       - djm@cvs.openbsd.org 2011/05/06 22:20:10
         [PROTOCOL.mux]
         fix numbering; from bert.wesarg AT googlemail.com

commit a6bbbe465825338637ad68b41c68827be732cc82
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:46:29 2011 +1000

       - djm@cvs.openbsd.org 2011/05/06 21:38:58
         [ssh.c]
         fix dropping from previous diff

commit 21771e22d3e23a10cb01983b2df83d47362eadda
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:45:50 2011 +1000

       - djm@cvs.openbsd.org 2011/05/06 21:34:32
         [clientloop.c mux.c readconf.c readconf.h ssh.c ssh_config.5]
         Add a RequestTTY ssh_config option to allow configuration-based
         control over tty allocation (like -t/-T); ok markus@

commit fe92421772243702ecb18b862dbeb51a9bdbbc6e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:44:45 2011 +1000

       - djm@cvs.openbsd.org 2011/05/06 21:31:38
         [readconf.c ssh_config.5]
         support negated Host matching, e.g.
    
         Host *.example.org !c.example.org
            User mekmitasdigoat
    
         Will match "a.example.org", "b.example.org", but not "c.example.org"
         ok markus@

commit dfc85fa1815004bd885473068e7578be3dcbdfef
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:44:02 2011 +1000

       - djm@cvs.openbsd.org 2011/05/06 21:18:02
         [ssh.c ssh_config.5]
         add a %L expansion (short-form of the local host name) for ControlPath;
         sync some more expansions with LocalCommand; ok markus@

commit d2ac5d74b4dd51d8e28615ea7af1ab5372a3db2b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:43:13 2011 +1000

       - djm@cvs.openbsd.org 2011/05/06 21:14:05
         [packet.c packet.h]
         set traffic class for IPv6 traffic as we do for IPv4 TOS;
         patch from lionel AT mamane.lu via Colin Watson in bz#1855;
         ok markus@

commit 78c40c321bd4168bb2a17230f242d6aea684692a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:36:59 2011 +1000

       - djm@cvs.openbsd.org 2011/05/06 02:05:41
         [sshconnect2.c]
         fix memory leak; bz#1849 ok dtucker@

commit 58a77e2eac23f22708002e00a57af1b9cbec282f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:36:29 2011 +1000

       - djm@cvs.openbsd.org 2011/05/06 01:09:53
         [sftp.1]
         mention that IPv6 addresses must be enclosed in square brackets;
         bz#1845

commit fd53abd00bf1708c401f3de3d62e9d8ca635e4d3
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:36:02 2011 +1000

       - dtucker@cvs.openbsd.org 2011/05/06 01:03:35
         [sshd_config]
         clarify language about overriding defaults.  bz#1892, from Petr Cerny

commit 60432d8cf250e2176f50fd486342612a822d70e3
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 15 08:34:46 2011 +1000

       - djm@cvs.openbsd.org 2011/05/05 05:12:08
         [mux.c]
         gracefully fall back when ControlPath is too large for a
         sockaddr_un. ok markus@ as part of a larger diff

commit d6548fe4cf3bcfe4e473a452757f1e307bf0eaf1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue May 10 11:13:36 2011 +1000

     - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix
       --with-ssl-engine which was broken with the change from deprecated
       SSLeay_add_all_algorithms().  ok djm

commit 343f75fa1968a84747f808c02bc81fc6c4f51b07
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 6 10:43:50 2011 +1000

     - (dtucker) [openbsd-compat/regress/closefromtest.c] Bug #1875: add prototype
       for closefrom() in test code.  Report from Dan Wallis via Gentoo.

commit 9abb697d4fd4fffe7961db0bebb133aacf69a759
Author: Tim Rice <tim@multitalents.net>
Date:   Wed May 4 23:06:59 2011 -0700

     - (tim) [defines.h] Deal with platforms that do not have S_IFSOCK ok djm@

commit 19d8181b86f90d638dc1dfd0f5722903bf945d5b
Author: Tim Rice <tim@multitalents.net>
Date:   Wed May 4 21:44:25 2011 -0700

     - (tim) [configure.ac] Add AC_LANG_SOURCE to OPENSSH_CHECK_CFLAG_COMPILE
       so autoreconf 2.68 is happy.

commit 2ce12ef1ac96c47b386168459cf7264fdc6faf95
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:17:18 2011 +1000

       - djm@cvs.openbsd.org 2011/05/04 21:15:29
         [authfile.c authfile.h ssh-add.c]
         allow "ssh-add - < key"; feedback and ok markus@

commit 8cb1cda1e3a24c6f73b96822f36762c1c80ae147
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:16:56 2011 +1000

       - djm@cvs.openbsd.org 2011/04/18 00:46:05
         [ssh-keygen.c]
         certificate options are supposed to be packed in lexical order of
         option name (though we don't actually enforce this at present).
         Move one up that was out of sequence

commit 6c3eec7ab23d58157ded8a0e6283f93e45390d07
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:16:22 2011 +1000

       - djm@cvs.openbsd.org 2011/04/17 22:42:42
         [PROTOCOL.mux clientloop.c clientloop.h mux.c ssh.1 ssh.c]
         allow graceful shutdown of multiplexing: request that a mux server
         removes its listener socket and refuse future multiplexing requests;
         ok markus@

commit ad21032e656aefcddb2cc52f014885026ba82d56
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:15:54 2011 +1000

       - djm@cvs.openbsd.org 2011/04/13 04:09:37
         [ssh-keygen.1]
         mention valid -b sizes for ECDSA keys; bz#1862

commit 085c90fa202a232ea0a9b1034f27070119833574
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:15:33 2011 +1000

       - djm@cvs.openbsd.org 2011/04/13 04:02:48
         [ssh-keygen.1]
         improve wording; bz#1861

commit 26b57ce6c24f243790e6b19659caf9a4e41a8afe
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:15:09 2011 +1000

       - djm@cvs.openbsd.org 2011/04/12 05:32:49
         [sshd.c]
         exit with 0 status on SIGTERM; bz#1879

commit 884b63a061dbaf750b6c95043358d6a6b87fdf7a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:14:52 2011 +1000

       - djm@cvs.openbsd.org 2011/04/12 04:23:50
         [ssh-keygen.c]
         fix -Wshadow

commit 91475865997f16a728ae1dc3a98dda957c997a5d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:14:34 2011 +1000

       - stevesk@cvs.openbsd.org 2011/03/29 18:54:17
         [misc.c misc.h servconf.c]
         print ipqos friendly string for sshd -T; ok markus
         # sshd -Tf sshd_config|grep ipqos
         ipqos lowdelay throughput

commit 044f4a6cc39d1c3d109c143c162c4c00fc4df0aa
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:14:08 2011 +1000

       - stevesk@cvs.openbsd.org 2011/03/24 22:14:54
         [ssh-keygen.c]
         use strcasecmp() for "clear" cert permission option also; ok djm

commit 3ca1eb373f84a6d64eb17abf40beeffafa7b034c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:13:50 2011 +1000

       - jmc@cvs.openbsd.org 2011/03/24 15:29:30
         [ssh-keygen.1]
         zap trailing whitespace;

commit 111431963ef704c0ee2e6130ce986e6891ab7a90
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:13:25 2011 +1000

       - stevesk@cvs.openbsd.org 2011/03/23 16:50:04
         [ssh-keygen.c]
         remove -d, documentation removed >10 years ago; ok markus

commit 4a4d161545447bb847aa01dd5332a9424271da44
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:06:39 2011 +1000

       - stevesk@cvs.openbsd.org 2011/03/23 16:24:56
         [ssh-keygen.1]
         -q not used in /etc/rc now so remove statement.

commit 58f1bafb3d4cf0965ebcb65d94b3476b959f42d8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:06:15 2011 +1000

       - stevesk@cvs.openbsd.org 2011/03/23 15:16:22
         [ssh-keygen.1 ssh-keygen.c]
         Add -A option.  For each of the key types (rsa1, rsa, dsa and ecdsa)
         for which host keys do not exist, generate the host keys with the
         default key file path, an empty passphrase, default bits for the key
         type, and default comment.  This will be used by /etc/rc to generate
         new host keys.  Idea from deraadt.
         ok deraadt

commit c5219e701ecf6ce28d9bec1aecca5cfac114231d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:05:12 2011 +1000

       - okan@cvs.openbsd.org 2011/03/15 10:36:02
         [ssh-keyscan.c]
         use timerclear macro
         ok djm@

commit b2da7d185e1227501262449b634139349a3f736f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:04:50 2011 +1000

       - djm@cvs.openbsd.org 2011/03/10 11:34:25
         [auth.h]
         allow GSSAPI authentication to detect when a server-side failure causes
         authentication failure and don't count such failures against MaxAuthTries;
         bz#1244 from simon AT sxw.org.uk; ok markus@ before lock

commit 3fcdfd55a3a3a16342a4f110f2dc1ba998526e47
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 14:04:11 2011 +1000

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2011/03/10 02:52:57
         [auth2-gss.c auth2.c]
         allow GSSAPI authentication to detect when a server-side failure causes
         authentication failure and don't count such failures against MaxAuthTries;
         bz#1244 from simon AT sxw.org.uk; ok markus@ before lock

commit f22019bdbfb986daf24428a9d37f9fe9bb3ff7ad
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 13:48:37 2011 +1000

     - (djm) [Makefile.in WARNING.RNG aclocal.m4 buildpkg.sh.in configure.ac]
       [entropy.c ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c]
       [ssh-keysign.c ssh-pkcs11-helper.c ssh-rand-helper.8 ssh-rand-helper.c]
       [ssh.c ssh_prng_cmds.in sshd.c contrib/aix/buildbff.sh]
       [regress/README.regress] Remove ssh-rand-helper and all its
       tentacles. PRNGd seeding has been rolled into entropy.c directly.
       Thanks to tim@ for testing on affected platforms.

commit 68790fedef210e03e36534b111e2f27b858170b4
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 5 11:19:13 2011 +1000

     - (djm) [defines.h] Move up include of netinet/ip.h for IPTOS
       definitions.

commit a10abe9e4be4ca3b5da71c34c6f5f1844336958e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 12 15:39:35 2011 +1000

    s/recommended/required in warning:
    
    "It is recommended that your private key files are NOT accessible by others."
    
    since there is no way to skip this check; bz#1878

commit db59a3fb22799c83bb979154a1110ba57961ef21
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 28 15:07:06 2011 +1100

    (whitespace change to test sync to hg)

commit e541aaaf0f544fca9aeedff5941f5103b8e49a5c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 21 21:41:29 2011 +1100

     - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the
       Cygwin-specific service installer script ssh-host-config.  The actual
       functionality is the same, the revisited version is just more
       exact when it comes to check for problems which disallow to run
       certain aspects of the script.  So, part of this script and the also
       rearranged service helper script library "csih" is to check if all
       the tools required to run the script are available on the system.
       The new script also is more thorough to inform the user why the
       script failed.  Patch from vinschen at redhat com.

commit 0588beba3987853d02b849e92a243ec0a38aa4fb
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 18 09:18:45 2011 +1100

       - djm@cvs.openbsd.org 2011/02/16 00:31:14
         [ssh-keysign.c]
         make hostbased auth with ECDSA keys work correctly. Based on patch
         by harvey.eneman AT oracle.com in bz#1858; ok markus@ (pre-lock)

commit ea676a642264ee45f3f1191096d8d51a376061a4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 6 13:31:23 2011 +1100

     - (dtucker) [contrib/cygwin/ssh-{host,user}-config]  Add ECDSA key
       generation and simplify.  Patch from Corinna Vinschen.

commit 3b9617ecbd6bdb205e202a3345e84740851b021c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 6 13:24:35 2011 +1100

     - (dtucker) [openbsd-compat/port-linux.c] Bug #1851: fix syntax error in
       selinux code.  Patch from Leonardo Chiquitto.

commit 0d30b092ce0dee75cc4f5848720cbb2752694f8e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 4 12:43:36 2011 +1100

     - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] update versions in docs and spec files.
     - Release OpenSSH 5.8p1

commit a69812707d34c979a2435d5147ba245c625c352a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 4 11:47:20 2011 +1100

       - djm@cvs.openbsd.org 2011/02/04 00:44:43
         [version.h]
         openssh-5.8

commit 0a5f0129a3d64ac59a1b499cc6310f271c28a020
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 4 11:47:01 2011 +1100

       - djm@cvs.openbsd.org 2011/02/04 00:44:21
         [key.c]
         fix uninitialised nonce variable; reported by Mateusz Kocielski

commit b407dd8d058e018ef92ead51027ab47425695dad
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 4 11:46:39 2011 +1100

       - djm@cvs.openbsd.org 2011/01/31 21:42:15
         [PROTOCOL.mux]
         cut'n'pasto; from bert.wesarg AT googlemail.com

commit d4a5504cb19acf061bc6d68362b666416b21d9b3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 28 10:30:18 2011 +1100

     - (djm) [openbsd-compat/port-linux.c] Check whether SELinux is enabled
       before attempting setfscreatecon(). Check whether matchpathcon()
       succeeded before using its result. Patch from cjwatson AT debian.org;
       bz#1851

commit 648f876566053e6df45060019d370d9ea73f08f4
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jan 26 12:38:57 2011 -0800

    20110127
     - (tim) [configure.ac] Consistent M4 quoting throughout, updated obsolete
       AC_TRY_COMPILE with AC_COMPILE_IFELSE, updated obsolete AC_TRY_LINK with
       AC_LINK_IFELSE, updated obsolete AC_TRY_RUN with AC_RUN_IFELSE, misc white
       space changes for consistency/readability. Makes autoconf 2.68 happy.
       "Nice work" djm

commit d069c482070b35540fb808d92018d2ddddb6bef7
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jan 26 12:32:12 2011 -0800

    20110127
     - (tim) [config.guess config.sub] Sync with upstream.

commit 71adf127e834e215017b22d61cb4cd4b75cf8ddc
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 25 12:16:15 2011 +1100

     - (djm) [configure.ac Makefile.in ssh.c openbsd-compat/port-linux.c
       openbsd-compat/port-linux.h] Move SELinux-specific code from ssh.c to
       port-linux.c to avoid compilation errors. Add -lselinux to ssh when
       building with SELinux support to avoid linking failure; report from
       amk AT spamfence.net; ok dtucker

commit 6f8f04b860765da07938bfe1fef017b00c3a3d55
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 22 20:25:11 2011 +1100

     - (djm) Release 5.7p1

commit 4a5eb41cee4cdda9d224d575b435d6277f4cc086
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 22 20:24:34 2011 +1100

    trim entries older than 5.5p1

commit 966accc5331784f26e3231dcd3c162f581e1dce6
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 22 20:23:10 2011 +1100

     - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] update versions in docs and spec files.

commit ad4b1adf95ff50e7066ef59abd1edc46cb35843a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 22 20:21:33 2011 +1100

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2011/01/22 09:18:53
         [version.h]
         crank to OpenSSH-5.7

commit 79241377df7fdd34a05d0565c7c5fb48ef6492a5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 22 09:37:01 2011 +1100

     - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}] Add
       RSA_get_default_method() for the benefit of openssl versions that don't
       have it (at least openssl-engine-0.9.6b).  Found and tested by Kevin Brott,
       ok djm@.

commit e323ebc250bb25c51a27be4b34190bf5a371f50b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 19 23:12:27 2011 +1100

     - (djm) [configure.ac] Disable ECC on OpenSSL <0.9.8g. Releases prior to
       0.9.8 lacked it, and 0.9.8a through 0.9.8d have proven buggy in pre-
       release testing (random crashes and failure to load ECC keys).
       ok dtucker@

commit 15e1b4dea756446a73bcfd9953fc994dea2ed0f6
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jan 18 20:47:04 2011 -0800

     - (tim) [contrib/caldera/openssh.spec] Use CFLAGS from Makefile instead
       of RPM so build completes. Signatures were changed to .asc since 4.1p1.

commit ea52a829699e981a58a69a77342e7ca3715a5f5b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 17 21:15:27 2011 +1100

    - (dtucker) [LICENCE Makefile.in audit-bsm.c audit-linux.c audit.c audit.h
       configure.ac defines.h loginrec.c]  Bug #1402: add linux audit subsystem
       support, based on patches from Tomas Mraz and jchadima at redhat.

commit 263d43d2a58f0fc4cf211808410560c8c3e451d2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 17 18:50:22 2011 +1100

     - (dtucker) [openbsd-compat/port-linux.c] Fix minor bug caught by -Werror on
       the tinderbox.

commit 6dfcd34042197e904a6c92e277d6b60a58e7a90a
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jan 16 22:53:56 2011 -0800

     - (tim) [regress/agent-getpeereid.sh] shell portability fix.

commit 58497780ab22d56ac5216c71f5a20efc1e39ce2e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 16:17:09 2011 +1100

     - (djm) [configure.ac regress/agent-getpeereid.sh regress/multiplex.sh]
       [regress/sftp-glob.sh regress/test-exec.sh] Rework how feature tests are
       disabled on platforms that do not support them; add a "config_defined()"
       shell function that greps for defines in config.h and use them to decide
       on feature tests.
       Convert a couple of existing grep's over config.h to use the new function
       Add a define "FILESYSTEM_NO_BACKSLASH" for filesystem that can't represent
       backslash characters in filenames, enable it for Cygwin and use it to turn
       of tests for quotes backslashes in sftp-glob.sh.
       based on discussion with vinschen AT redhat.com and dtucker@; ok dtucker@

commit 0c93adc7c1814b113d25c5e214973a3aa630b0af
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 17 11:55:59 2011 +1100

     - (dtucker) [openbsd-compat/port-linux.c] Bug #1838: Add support for the new
       Linux OOM-killer magic values that changed in 2.6.36 kernels, with fallback
       to the old values.  Feedback from vapier at gentoo org and djm, ok djm.

commit 1ccbfa88b1defffa6cd4b533bcc97f737162afee
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 11:52:40 2011 +1100

     - (djm) [regress/agent-getpeereid.sh] leave stdout attached when running
       ssh-add to avoid $SUDO failures on Linux

commit fd3669eb266086951f9181a3037a813b12eb6a94
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 11:20:18 2011 +1100

     - (djm) [regress/agent-ptrace.sh] Fix false failure on OS X by adding
       its unique snowflake of a gdb error to the ones we look for.

commit 369c0e8eefe767c244c085677e7901526ef462be
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 10:51:40 2011 +1100

     - (djm) [regress/Makefile] use $TEST_SSH_KEYGEN instead of the one in
       $PATH, fix cleanup of droppings; reported by openssh AT
       roumenpetrov.info; ok dtucker@

commit cfd6e4f57fc8489ed4065be06d85de3f30575fe2
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 16 23:18:33 2011 +1100

       - djm@cvs.openbsd.org 2011/01/16 12:05:59
         [clientloop.c]
         a couple more tweaks to the post-close protocol 1 stderr/stdout flush:
         now that we use atomicio(), convert them from while loops to if statements
         add test and cast to compile cleanly with -Wsigned

commit 6fb6fd566267da4f36499078caf46da5291f4b8c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 16 23:17:45 2011 +1100

       - djm@cvs.openbsd.org 2011/01/16 11:50:36
         [sshconnect.c]
         reset the SIGPIPE handler when forking to execute child processes;
         ok dtucker@

commit 4791f9dcecb89f5601d8b20e2e6b43dce6f25755
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 16 23:16:53 2011 +1100

       - djm@cvs.openbsd.org 2011/01/16 11:50:05
         [clientloop.c]
         Use atomicio when flushing protocol 1 std{out,err} buffers at
         session close. This was a latent bug exposed by setting a SIGCHLD
         handler and spotted by kevin.brott AT gmail.com; ok dtucker@

commit 50c61f88abdb356d45026dc1427ddb461b626e45
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 16 18:28:09 2011 +1100

     - (dtucker) [Makefile.in configure.ac regress/kextype.sh] Skip sha256-based
       on configurations that don't have it.

commit 08f83883f518fa0e9765ed25ae6c19e279633ea9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 16 18:24:04 2011 +1100

    not February yet...

commit c5c346b101fbd0399d11c88d9e204ac475596117
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jan 13 22:36:14 2011 -0800

     - (tim) [regress/cert-hostkey.sh] Add missing TEST_SSH_ECC guard around some
       ecdsa bits.

commit 02d99da9760bc17ee383b7fffcd539b1731e3da5
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jan 13 22:20:27 2011 -0800

     - (tim) [regress/cert-hostkey.sh] Typo. Missing $ on variable name.

commit e9b40487fa41696a8f045ff7a5447ce9da511913
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 14 14:47:37 2011 +1100

     - (djm) [Makefile.in] Use shell test to disable ecdsa key generating in
       host-key-force target rather than a substitution that is replaced with a
       comment so that the Makefile.in is still a syntactically valid Makefile
       (useful to run the distprep target)

commit 42747df8b7986912b008b4341a707f80dd147997
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 14 12:01:50 2011 +1100

       - djm@cvs.openbsd.org 2011/01/13 21:55:25
         [PROTOCOL.mux]
         correct protocol names and add a couple of missing protocol number
         defines; patch from bert.wesarg AT googlemail.com

commit 445c9a507d23bd84e146133dcb2b9ba07ab216c6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 14 12:01:29 2011 +1100

       - djm@cvs.openbsd.org 2011/01/13 21:54:53
         [mux.c]
         correct error messages; patch from bert.wesarg AT googlemail.com

commit 5278806e39bb1794959c71bba61610efb6ec0d58
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 13 22:05:14 2011 +1100

     - (djm) [regress/kextype.sh] Testing diffie-hellman-group-exchange-sha256
       should not depend on ECC support

commit 9b16086e74c5df0b213bd871be6bee3c04c98f87
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 13 22:00:20 2011 +1100

     - (djm) [myproposal.h] Fix reversed OPENSSL_VERSION_NUMBER test and bad
       #define that was causing diffie-hellman-group-exchange-sha256 to be
       incorrectly disabled

commit cbaf8e6ec17ceceb488eed578a11f3ab73264a1e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 13 21:08:27 2011 +1100

     - (djm) [regress/Makefile] add a few more generated files to the clean
       target

commit ff22df538ef29d0596c9bff03f3c93fcd37ffb6e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 13 21:05:27 2011 +1100

     - (djm) [entropy.c] cast OPENSSL_VERSION_NUMBER to u_long to avoid
       gcc warning on platforms where it defaults to int

commit 9b87a5ce3ca693c257c6097fb4c6906910b1900b
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jan 12 22:35:43 2011 -0800

     - (tim) [Makefile.in configure.ac opensshd.init.in] Add support for generating
       ecdsa keys. ok djm.

commit cce927c25f93596a62b6d45c61a9d7fddf3d35c2
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jan 12 19:06:31 2011 -0800

     - (tim) [Makefile.in] test the ECC bits if we have the capability. ok djm

commit 1708cb7d0d318f2ef6d48ef763125162f99a3b8c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 13 12:21:34 2011 +1100

     - (djm) [misc.c] include time.h for nanosleep() prototype

commit 134d02a494f435458a1147dea9ed719f1274078c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 12 16:00:37 2011 +1100

     - (djm) [configure.ac] Fix broken test for gcc >= 4.4 with per-compiler
       flag tests that don't depend on gcc version at all; suggested by and
       ok dtucker@

commit 945aa0c744ea99544fdf7f868ff9cce0193c9fdd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 12 13:34:02 2011 +1100

     - (djm) [configure.ac] Turn on -Wno-unused-result for gcc >= 4.4 to avoid
       silly warnings on write() calls we don't care succeed or not.

commit 4927aaf4460de407855676a0ad36bf39704e74a2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 12 13:32:03 2011 +1100

       - djm@cvs.openbsd.org 2011/01/12 01:53:14
         avoid some integer overflows mostly with GLOB_APPEND and GLOB_DOOFFS
         and sanity check arguments (these will be unnecessary when we switch
         struct glob members from being type into to size_t in the future);
         "looks ok" tedu@ feedback guenther@

commit b66e91783186ad68b7a11fd67a81795fdbe103d8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 12 13:30:18 2011 +1100

       - nicm@cvs.openbsd.org 2010/10/08 21:48:42
         [openbsd-compat/glob.c]
         Extend GLOB_LIMIT to cover readdir and stat and bump the malloc limit
         from ARG_MAX to 64K.
         Fixes glob-using programs (notably ftp) able to be triggered to hit
         resource limits.
         Idea from a similar NetBSD change, original problem reported by jasper@.
         ok millert tedu jasper

commit 821de0ad2ea1036cb70872d26db2c9652694854d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 11 17:20:29 2011 +1100

       - djm@cvs.openbsd.org 2011/01/11 06:13:10
         [clientloop.c ssh-keygen.c sshd.c]
         some unsigned long long casts that make things a bit easier for
         portable without resorting to dropping PRIu64 formats everywhere

commit a256c8d680203b41c8c4c8f012c1edbc3cd72336
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 11 17:20:05 2011 +1100

       - djm@cvs.openbsd.org 2011/01/11 06:06:09
         [sshlogin.c]
         fd leak on error paths; from zinovik@
         NB. Id sync only; we use loginrec.c that was also audited and fixed
         recently

commit b73b6fd916a842dbcf800c13434a6abb6cd06ade
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 11 17:18:56 2011 +1100

       - djm@cvs.openbsd.org 2011/01/08 10:51:51
         [clientloop.c]
         use host and not options.hostname, as the latter may have unescaped
         substitution characters

commit 81ad4b1fc0f3d2004a0e0004607ebd9a3664034b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 11 17:02:23 2011 +1100

     - (djm) [platform.c] Some missing includes that show up under -Werror

commit 076a3b9ced9bbf5ee4f17a84b9593cc074308e15
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Jan 10 12:56:26 2011 -0800

     - (tim) [regress/host-expand.sh] Fix for building outside of read only
       source tree.

commit e63b7f28213b28efb412e7ea723fdb2b8de4843b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 9 09:19:50 2011 +1100

     - (djm) [Makefile.in] list ssh_host_ecdsa key in PATHSUBS; spotted by
       openssh AT roumenpetrov.info

commit 996384d5005130b0c77901ced4ca776dd3d9328f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 8 21:58:20 2011 +1100

     - (djm) [regress/keytype.sh] s/echo -n/echon/ to repair failing regress
       test on OSX and others. Reported by imorgan AT nas.nasa.gov

commit ed3a8eb65f7f04e5aeb121fe176336bbf5e0114f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 7 10:02:52 2011 +1100

       - djm@cvs.openbsd.org 2011/01/06 23:01:35
         [sshconnect.c]
         reset SIGCHLD handler to SIG_DFL when execuring LocalCommand;
         ok markus@

commit 7d06b00032d2d57474dbba9fddd0b8cd9ef05ef3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 7 09:54:20 2011 +1100

       - djm@cvs.openbsd.org 2011/01/06 22:46:21
         [regress/Makefile regress/host-expand.sh]
         regress test for LocalCommand %n expansion from bert.wesarg AT
         googlemail.com; ok markus@

commit 64abf31425e2e72b9d308b51519bd123ae77830f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 7 09:51:52 2011 +1100

       - djm@cvs.openbsd.org 2011/01/06 22:23:02
         [clientloop.c]
         when exiting due to ServerAliveTimeout, mention the hostname that caused
         it (useful with backgrounded controlmaster)

commit 83f8a4014d1818687f4e0ab36d1d388abac78863
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 7 09:51:17 2011 +1100

       - djm@cvs.openbsd.org 2011/01/06 22:23:53
         [ssh.c]
         unbreak %n expansion in LocalCommand; patch from bert.wesarg AT
         googlemail.com; ok markus@

commit 322125b9603cab2c70e827ae83d332cb6575e399
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 7 09:50:08 2011 +1100

     - (djm) [regress/cert-hostkey.sh regress/cert-userkey.sh] fix shell test
       for no-ECC case. Patch from cristian.ionescu-idbohrn AT axis.com

commit 8ad960b4ba8d076e38587e4d5e57db92d395c4f3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 6 22:44:44 2011 +1100

       - otto@cvs.openbsd.org 2011/01/04 20:44:13
         [ssh-keyscan.c]
         handle ecdsa-sha2 with various key lengths; hint and ok djm@

commit de53fd04b1e58059673c4d827f7cc4752870174f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 6 22:44:18 2011 +1100

       - djm@cvs.openbsd.org 2010/12/24 21:41:48
         [auth-options.c]
         don't send the actual forced command in a debug message; ok markus deraadt

commit 106079c06d308f6fb3b582607f590b2dcb4682b0
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 6 22:43:44 2011 +1100

       - djm@cvs.openbsd.org 2010/12/15 00:49:27
         [readpass.c]
         fix ControlMaster=ask regression
         reset SIGCHLD handler before fork (and restore it after) so we don't miss
         the the askpass child's exit status. Correct test for exit status/signal to
         account for waitpid() failure; with claudio@ ok claudio@ markus@

commit 05c8997b33cf391784d6a5f9f0d85d275dcf7ce5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 6 22:42:04 2011 +1100

       - markus@cvs.openbsd.org 2010/12/14 11:59:06
         [sshconnect.c]
         don't mention key type in key-changed-warning, since we also print
         this warning if a new key type appears. ok djm@

commit 907998df72d7206d4dd5c37d8f185f9b2988b007
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 6 22:41:21 2011 +1100

       - jmc@cvs.openbsd.org 2010/12/09 14:13:33
         [scp.1 scp.c]
         scp.1: grammer fix
         scp.c: add -3 to usage()

commit f12114366b4ffcd34e3a638dd187f29ac03fbdbd
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 6 22:40:30 2011 +1100

       - markus@cvs.openbsd.org 2010/12/08 22:46:03
         [scp.1 scp.c]
         add a new -3 option to scp: Copies between two remote hosts are
         transferred through the local host.  Without this option the data
         is copied directly between the two remote hosts. ok djm@ (bugzilla #1837)

commit 30a69e7bba0161eabb678b9902fbd04e7495d86e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 4 08:16:27 2011 +1100

     - (djm) [configure.ac Makefile.in] Use mandoc as preferred manpage
       formatter if it is present, followed by nroff and groff respectively.
       Fixes distprep target on OpenBSD (which has bumped groff/nroff to ports
       in favour of mandoc). feedback and ok tim

commit d197fd64a1fa309295a99ce46e9ee016b84d2a59
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 3 14:48:14 2011 +1100

     - (djm) [Makefile.in] revert local hack I didn't intend to commit

commit 41bccf75af219888d55552134242207392d91d67
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 2 21:53:07 2011 +1100

     - (djm) [configure.ac] Check whether libdes is needed when building
       with Heimdal krb5 support. On OpenBSD this library no longer exists,
       so linking it unconditionally causes a build failure; ok dtucker

commit 4a06f9271fe5341c942232015add391cee366b68
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 2 21:43:59 2011 +1100

     - (djm) [loginrec.c] Fix some fd leaks on error paths. ok dtucker

commit 928362dc0312f5d258da0a98ab48f35bfaa368f1
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 14:26:45 2010 +1100

       - djm@cvs.openbsd.org 2010/12/08 04:02:47
         [ssh_config.5 sshd_config.5]
         explain that IPQoS arguments are separated by whitespace; iirc requested
         by jmc@ a while back

commit bf5fec1bc65ce82cf82b48056680e91208665d6b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 5 10:34:08 2010 +1100

    Id sync

commit 4288c53d04a5726805bca06b9a543cb7db15e6d2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 5 09:45:50 2010 +1100

       - djm@cvs.openbsd.org 2010/12/04 00:21:19
         [regress/sftp-cmds.sh]
         adjust for hard-link support

commit 7e1a5a4e1bcacd5f7248d5e616cdc4be33743fad
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 5 09:29:31 2010 +1100

     - (dtucker) [regress/Makefile] Id sync.

commit 094f1e99348bdcea46f62f5c0f0e9944ed698b4e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 5 09:03:31 2010 +1100

       - djm@cvs.openbsd.org 2010/12/04 13:31:37
         [hostfile.c]
         fix fd leak; spotted and ok dtucker

commit af1f90925494deba97a4b877798cf250f7dc75cf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 5 09:02:47 2010 +1100

       - djm@cvs.openbsd.org 2010/12/04 00:18:01
         [sftp-server.c sftp.1 sftp-client.h sftp.c PROTOCOL sftp-client.c]
         add a protocol extension to support a hard link operation. It is
         available through the "ln" command in the client. The old "ln"
         behaviour of creating a symlink is available using its "-s" option
         or through the preexisting "symlink" command; based on a patch from
         miklos AT szeredi.hu in bz#1555; ok markus@

commit adab6f12992c522e1208fa2bdf89ce572840ccf8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 5 09:01:47 2010 +1100

       - djm@cvs.openbsd.org 2010/12/03 23:55:27
         [auth-rsa.c]
         move check for revoked keys to run earlier (in auth_rsa_key_allowed)
         bz#1829; patch from ldv AT altlinux.org; ok markus@

commit 7336b904ffab8c8b412b8ef19d7d0387a584ec58
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 5 09:00:30 2010 +1100

     - (dtucker) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2010/12/03 23:49:26
         [schnorr.c]
         check that g^x^q === 1 mod p; recommended by JPAKE author Feng Hao
         (this code is still disabled, but apprently people are treating it as
         a reference implementation)

commit 37bb7568ab9299e64a838d4801bc374b090cf547
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 5 08:46:05 2010 +1100

     - (dtucker) openbsd-compat/openssl-compat.c] remove sleep leftover from
       debugging.  Spotted by djm.

commit ebdef76b5df3c33b05128b4fb2cc484427f99ca6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Dec 4 23:20:50 2010 +1100

     - (dtucker) [configure.ac moduli.c openbsd-compat/openssl-compat.{c,h}]  Add
       shims for the new, non-deprecated OpenSSL key generation functions for
       platforms that don't have the new interfaces.

commit d89745b9e7e2048c13b0173eadc2d41e23b6a79d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 3 10:50:26 2010 +1100

     - (djm) [openbsd-compat/bindresvport.c] Use arc4random_uniform(range)
       instead of (arc4random() % range)

commit d925dcd8a5d1a3070061006788352bed93260582
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 1 12:21:51 2010 +1100

       - djm@cvs.openbsd.org 2010/11/29 23:45:51
         [auth.c hostfile.c hostfile.h ssh.c ssh_config.5 sshconnect.c]
         [sshconnect.h sshconnect2.c]
         automatically order the hostkeys requested by the client based on
         which hostkeys are already recorded in known_hosts. This avoids
         hostkey warnings when connecting to servers with new ECDSA keys
         that are preferred by default; with markus@

commit 03c0e533de56a1fc55ec1885d35c3197fdefbf94
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 1 12:03:39 2010 +1100

       - markus@cvs.openbsd.org 2010/11/29 18:57:04
         [authfile.c]
         correctly load comment for encrypted rsa1 keys;
         report/fix Joachim Schipper; ok djm@

commit 87dc0a4188191f5de738e61b3cd1cfc90582329a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 1 12:03:19 2010 +1100

       - djm@cvs.openbsd.org 2010/11/26 05:52:49
         [scp.c]
         Pass through ssh command-line flags and options when doing remote-remote
         transfers, e.g. to enable agent forwarding which is particularly useful
         in this case; bz#1837 ok dtucker@

commit f80c3deaafcb8194ba95e219f1b70e418bea3542
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 1 12:02:59 2010 +1100

       - djm@cvs.openbsd.org 2010/11/25 04:10:09
         [session.c]
         replace close() loop for fds 3->64 with closefrom();
         ok markus deraadt dtucker

commit b7f827ae4586f6637bcad36b65ebafb51e727f36
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 1 12:02:35 2010 +1100

       - djm@cvs.openbsd.org 2010/11/24 01:24:14
         [channels.c]
         remove a debug() that pollutes stderr on client connecting to a server
         in debug mode (channel_close_fds is called transitively from the session
         code post-fork); bz#1719, ok dtucker

commit d0fdd6818c1633656fd47ee1de9438130eb9eb03
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 1 12:02:14 2010 +1100

       - djm@cvs.openbsd.org 2010/11/23 23:57:24
         [clientloop.c]
         avoid NULL deref on receiving a channel request on an unknown or invalid
         channel; report bz#1842 from jchadima AT redhat.com; ok dtucker@

commit 6a740e7b92c8dba96e81ad3979849e7abcd26829
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 1 12:01:51 2010 +1100

       - djm@cvs.openbsd.org 2010/11/23 02:35:50
         [auth.c]
         use strict_modes already passed as function argument over referencing
         global options.strict_modes

commit a232792783655659395f445c0f265d4f9444bb7c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 1 12:01:21 2010 +1100

       - djm@cvs.openbsd.org 2010/11/21 10:57:07
         [authfile.c]
         Refactor internals of private key loading and saving to work on memory
         buffers rather than directly on files. This will make a few things
         easier to do in the future; ok markus@

commit 2cd629349d9fc4067985fec04b23bfb5ff7aa8d8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 1 11:50:35 2010 +1100

       - djm@cvs.openbsd.org 2010/11/21 01:01:13
         [clientloop.c misc.c misc.h ssh-agent.1 ssh-agent.c]
         honour $TMPDIR for client xauth and ssh-agent temporary directories;
         feedback and ok markus@

commit 188ea814b10e39a399178af1fb18a79ea406f9bb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 1 11:50:14 2010 +1100

     - OpenBSD CVS Sync
       - deraadt@cvs.openbsd.org 2010/11/20 05:12:38
         [auth2-pubkey.c]
         clean up cases of ;;

commit 73de86ac5a1f8a82439dca4988288182ffd11489
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 24 10:50:04 2010 +1100

     - (djm) [defines.h] Add IP DSCP defines

commit 4b6cbf7aabbcbe170a69e9780e7c4ec06a3224e0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Nov 24 10:46:37 2010 +1100

     - (dtucker) [packet.c] Remove redundant local declaration of "int tos".

commit 88e341e1ca9502403242a275941b11e509f669fb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 24 10:36:15 2010 +1100

     - (djm) [loginrec.c] Relax permission requirement on btmp logs to allow
       group read/write. ok dtucker@

commit d995712383c043c4f9d8ca52363e6e1df128dc72
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Nov 24 10:09:13 2010 +1100

     - (dtucker) [platform.c session.c] Move the getluid call out of session.c and
       into the platform-specific code  Only affects SCO, tested by and ok tim@.

commit 9e0ff7afc894da2b5a9e5bfd334cf4a821acf0ae
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 22 17:59:00 2010 +1100

     - (dtucker) Bug #1840: fix warning when configuring --with-ssl-engine, patch
       from vapier at gentoo org.

commit 0a1847347dc789e88143a7ec8fe899c63f1bbde3
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 20 15:21:03 2010 +1100

       - jmc@cvs.openbsd.org 2010/11/18 15:01:00
         [scp.1 sftp.1 ssh.1 sshd_config.5]
         add IPQoS to the various -o lists, and zap some trailing whitespace;

commit 8e1ea4e5a34185a445feba86c16231ef554bdb5e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 20 15:20:10 2010 +1100

       - jmc@cvs.openbsd.org 2010/11/15 07:40:14
         [ssh_config.5]
         libary -> library;

commit 0dac6fb6b228a96f4ab3717e3d73871595a291a8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 20 15:19:38 2010 +1100

       - djm@cvs.openbsd.org 2010/11/13 23:27:51
         [clientloop.c misc.c misc.h packet.c packet.h readconf.c readconf.h]
         [servconf.c servconf.h session.c ssh.c ssh_config.5 sshd_config.5]
         allow ssh and sshd to set arbitrary TOS/DSCP/QoS values instead of
         hardcoding lowdelay/throughput.
    
         bz#1733 patch from philipp AT redfish-solutions.com; ok markus@ deraadt@

commit 4499f4cc20eee7e0f67b35f5a5c6078bf07dcbc0
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 20 15:15:49 2010 +1100

       - djm@cvs.openbsd.org 2010/11/10 01:33:07
         [kexdhc.c kexdhs.c kexgexc.c kexgexs.c key.c moduli.c]
         use only libcrypto APIs that are retained with OPENSSL_NO_DEPRECATED.
         these have been around for years by this time. ok markus

commit 7a221a159188eceeea366d4f58345d2bdccaeb8d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 20 15:14:29 2010 +1100

       - djm@cvs.openbsd.org 2010/11/05 02:46:47
         [packet.c]
         whitespace KNF

commit dd190ddfd7a8934808556354eeee6ee690443d3e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 11 14:17:02 2010 +1100

     - (djm) [servconf.c ssh-add.c ssh-keygen.c] don't look for ECDSA keys on
       platforms that don't support ECC. Fixes some spurious warnings reported
       by tim@

commit c7a8af03a022e8ab52422b6ce26fdbcb729031fd
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Nov 8 14:26:23 2010 -0800

     - (tim) [configure.ac openbsd-compat/bsd-misc.h openbsd-compat/bsd-misc.c] Add
       support for platforms missing isblank(). ok djm@

commit e426f5e932cedeb6938469ded340f272390f6a07
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Nov 8 09:15:14 2010 -0800

     - (tim) [regress/kextype.sh] Not all platforms have time in /usr/bin.
       Feedback from dtucker@

commit c10aeaa8f2f8614de323c5e6d7268b063a321261
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Nov 7 13:03:11 2010 -0800

     - (tim) [regress/kextype.sh] Shell portability fix.

commit 522262f8b328e6d5951bf2a77f22080bdc123f04
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Nov 7 13:00:27 2010 -0800

     - (tim) [regress/Makefile] Fixes to allow building/testing outside source
       tree.

commit d1ece6e4a274df0447ad278f729c6f32b8e4a5e5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Nov 7 18:05:54 2010 +1100

     - (dtucker) [platform.c] includes.h instead of defines.h so that we get
       the correct typedefs.

commit 9283d8cbc594419712f09258540253b899d2afd9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 18:56:08 2010 +1100

     - (dtucker) [platform.c] Need servconf.h and extern options.

commit f619d1cad948193e53910ff48bc0b36547fa6d8f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 18:41:50 2010 +1100

     - (dtucker) [regress/kextype.sh] Make sha256 test depend on ECC.  This is not
       strictly correct since while ECC requires sha256 the reverse is not true
       however it does prevent spurious test failures.

commit 345178d95103a976044ed44de0ad19cf1075706b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 18:35:52 2010 +1100

     - (dtucker) [regress/kextype.sh] Add missing "test".

commit eab5f0df90cad495ee65abdb557538dbfb625d15
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 18:23:38 2010 +1100

     - (dtucker) [Makefile configure.ac regress/Makefile regress/keytype.sh]
       Import recent changes to regress/Makefile, pass a flag to enable ECC tests
       from configure through to regress/Makefile and use it in the tests.

commit b69e033e6704000be33ed6dc47eb9ac28f10b14b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 18:19:15 2010 +1100

     - (dtucker) [regress/keytype.sh] Import new test.

commit b12fe272a0e850175417aa56e6efef8f08250977
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 14:47:01 2010 +1100

     - (dtucker) [platform.c platform.h session.c] Move the Cygwin special-case
       check into platform.c

commit cc12418e18242ce1f61d7035da4956274ba13a96
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 13:32:52 2010 +1100

     - (dtucker) [platform.c session.c] Move PAM credential establishment for the
       non-LOGIN_CAP case into platform.c.

commit 0b2ee6452c6c6e0c37dc10072ec4cf711e8dde89
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 13:29:25 2010 +1100

     - (dtucker) [platform.c session.c] Move irix setusercontext fragment into
       platform.c.

commit 676b912e780499e9f59e8add7859a014cb2db07d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 13:11:04 2010 +1100

     - (dtucker) platform.c session.c] Move aix_usrinfo frament into platform.c.

commit 7a8afe3186bd2007da3a2fce4276e5b96ed877f6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 13:07:24 2010 +1100

     - (dtucker) platform.c session.c] Move the USE_LIBIAF fragment into
       platform.c

commit 728d8371a1dc1b615284ece94b0085897b4c0b51
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 13:00:05 2010 +1100

     - (dtucker) [platform.c session.c] Move the PAM credential establishment for
       the LOGIN_CAP case into platform.c.

commit fd4d8aa2cbe0acad520ab168656759cb46054c03
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 12:50:41 2010 +1100

     - (dtucker) [platform.c] Only call setpgrp on BSDI if running as root to
       retain previous behavior.

commit 44a97be0cc3ede56663b94548806465d2b090461
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 12:45:18 2010 +1100

     - (dtucker) [platform.c session.c] Move the BSDI setpgrp into platform.c.

commit 4db380701d15727e43600e41a567d36177e4226e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 12:41:13 2010 +1100

     - (dtucker) [platform.c session.c] Move the AIX setpcred+chroot hack into
       platform.c

commit 920612e45ae8183226e8841ff27cdc54a8287ba2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 12:36:15 2010 +1100

     - (dtucker) [platform.c platform.h session.c] Add a platform hook to run
       after the user's groups are established and move the selinux calls into it.

commit 97528353c2b4f27169ea9b81e5c4420c734ceea2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 12:03:05 2010 +1100

     - (dtucker) [configure.ac platform.{c,h} session.c
       openbsd-compat/port-solaris.{c,h}] Bug #1824: Add Solaris Project support.
       Patch from cory.erickson at csu mnscu edu with a bit of rework from me.
       ok djm@

commit 34ee4204c6051f5f48113903750738e8e055a778
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 5 10:52:37 2010 +1100

     - (djm) [loginrec.c loginrec.h] Use correct uid_t/pid_t types instead of
       int. Should fix bz#1817 cleanly; ok dtucker@

commit 07331211949938b0dce95d6a8aae1500da9f5750
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 5 10:20:31 2010 +1100

       - djm@cvs.openbsd.org 2010/11/04 02:45:34
         [sftp-server.c]
         umask should be parsed as octal. reported by candland AT xmission.com;
         ok markus@

commit 55fa56505b81dea6143f3e59735ecfbe07fd2254
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 5 10:20:14 2010 +1100

       - jmc@cvs.openbsd.org 2010/10/28 18:33:28
         [scp.1 ssh-add.1 ssh-keygen.1 ssh.1 ssh_config.5 sshd.8 sshd_config.5]
         knock out some "-*- nroff -*-" lines;

commit b472a90d4ceca15620aa525099bf4b2d5ba8a59b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 5 10:19:49 2010 +1100

       - djm@cvs.openbsd.org 2010/10/28 11:22:09
         [authfile.c key.c key.h ssh-keygen.c]
         fix a possible NULL deref on loading a corrupt ECDH key
    
         store ECDH group information in private keys files as "named groups"
         rather than as a set of explicit group parameters (by setting
         the OPENSSL_EC_NAMED_CURVE flag). This makes for shorter key files and
         retrieves the group's OpenSSL NID that we need for various things.

commit 3a0e9f6479d50a95b5ccd7d7668b0ff45571de9c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 5 10:16:34 2010 +1100

       - djm@cvs.openbsd.org 2010/09/22 12:26:05
         [regress/Makefile regress/kextype.sh]
         regress test for each of the key exchange algorithms that we support

commit 54b1f3121df1317627a52d9b6d1d854ad977cf76
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 25 16:54:28 2010 +1100

     - (dtucker) [defines.h] Use SIZE_T_MAX for SIZE_MAX for platforms that have a
       native one.

commit bdd3e67c1965c262ae6a6ae1ac88d06dc4393bda
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Oct 24 18:35:55 2010 -0700

     - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with
       1.12 to unbreak Solaris build.
       ok djm@

commit 7bc236de2124070a68e6b2360418142b0784a526
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 24 11:58:43 2010 +1100

     - (dtucker) [defines.h] Add SIZE_MAX for the benefit of platforms that don't
       have it.

commit d633fef4712f87324516bd7e6c0314dfb37a5820
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 24 11:33:07 2010 +1100

    - (dtucker) [regress/cert-userkey.sh] Disable ECC-based tests on platforms
       which don't have ECC support in libcrypto.

commit bfd9b1be41300a6a789873f990127ffb0438c333
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 24 11:19:26 2010 +1100

     - (dtucker) [regress/cert-hostkey.sh] Disable ECC-based tests on platforms
       which don't have ECC support in libcrypto.

commit d78739ab90f6561d7fef5a7de495644868e01a24
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 24 10:56:32 2010 +1100

       - sthen@cvs.openbsd.org 2010/10/23 22:06:12
         [sftp.c]
         escape '[' in filename tab-completion; fix a type while there.
         ok djm@

commit a53939332dab05db474d75446211160b21a9742c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 24 10:47:30 2010 +1100

     - (dtucker) [includes.h] Add missing ifdef GLOB_HAS_GL_STATV to fix build.

commit 6fd2d7de4b4ea3a361141cbe56f70bf70710546c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 21 15:27:14 2010 +1100

       - djm@cvs.openbsd.org 2010/08/31 12:24:09
         [regress/cert-hostkey.sh regress/cert-userkey.sh]
         tests for ECDSA certificates

commit 68512c034140611e9df7a52e12ac5e4cd19f2db1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 21 15:21:11 2010 +1100

     - OpenBSD CVS Sync
       - dtucker@cvs.openbsd.org 2010/10/12 02:22:24
         [mux.c]
         Typo in confirmation message.  bz#1827, patch from imorgan at nas nasa gov

commit 9c0c31d2db8563b21e15d920ee589c891593a006
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 12 13:30:44 2010 +1100

     - (djm) [sshconnect.c] Need signal.h for prototype for kill(2)

commit 47e57bfab40ba681edf47e136474fe30db2dab73
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 12 13:28:12 2010 +1100

     - (djm) [canohost.c] Zero a4 instead of addr to better match type.
       bz#1825, reported by foo AT mailinator.com

commit 1f78980099b72270538b671a40b6052e8875d0b3
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 11 22:35:22 2010 +1100

     - (djm) [configure.ac] Use = instead of == in shell tests. Patch from
       dr AT vasco.com

commit 88b844f19b93c68dff1700effb4d42959caea91a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 22:19:23 2010 +1100

     - (djm) [openbsd-compat/Makefile.in] Actually link timingsafe_bcmp

commit 80e99539385bf55f09f4e0fa3e37b5eff9cc9cbe
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 22:12:08 2010 +1100

     - (djm) [cipher-acss.c] Add missing header.

commit 37f4f1892f1af1dd9f3a646f79ff8afaf9c8a646
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 22:10:38 2010 +1100

     - (djm) [openbsd-compat/glob.c] restore ARG_MAX compat code.

commit 45fcdaa1cf21557a076660d701e6e7a068907374
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 22:07:58 2010 +1100

       - djm@cvs.openbsd.org 2010/10/06 21:10:21
         [sshconnect.c]
         swapped args to kill(2)

commit a41ccca643364b3b1b65d7a818577dd35360fa20
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 22:07:32 2010 +1100

       - djm@cvs.openbsd.org 2010/10/06 06:39:28
         [clientloop.c ssh.c sshconnect.c sshconnect.h]
         kill proxy command on fatal() (we already kill it on clean exit);
         ok markus@

commit 38d9a965bfc795fba1c000e0b42e705e2bcd34c9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 22:07:11 2010 +1100

       - djm@cvs.openbsd.org 2010/10/05 05:13:18
         [sftp.c sshconnect.c]
         use default shell /bin/sh if $SHELL is ""; ok markus@

commit 9a3d0dc062e4ebcafdc399ed8522df97066b139e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 22:06:42 2010 +1100

       - djm@cvs.openbsd.org 2010/10/01 23:05:32
         [cipher-3des1.c cipher-bf1.c cipher-ctr.c openbsd-compat/openssl-compat.h]
         adapt to API changes in openssl-1.0.0a
         NB. contains compat code to select correct API for older OpenSSL

commit 195dbaff7a2c27b371a126d3b87888ba7a71ef7e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 22:05:11 2010 +1100

     - (djm) [ssh-agent.c] Fix type for curve name.

commit 2738361878ec4a4b0d5481d909cd644dce17a94b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 22:00:24 2010 +1100

    sadly, two typos on one line is not my best record

commit faca8ccd4d44ca0dacb413233c9e9d3e7aabb936
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 21:59:40 2010 +1100

    unbreak previous

commit c54b02c4eb82ed71449109774eecf5935bdc61bf
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 21:40:17 2010 +1100

       - djm@cvs.openbsd.org 2010/09/30 11:04:51
         [servconf.c]
         prevent free() of string in .rodata when overriding AuthorizedKeys in
         a Match block; patch from rein AT basefarm.no

commit 68e2e56ea90d88f514672991a2ac11445df0e4ac
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 21:39:55 2010 +1100

       - djm@cvs.openbsd.org 2010/09/26 22:26:33
         [sftp.c]
         when performing an "ls" in columnated (short) mode, only call
         ioctl(TIOCGWINSZ) once to get the window width instead of per-
         filename

commit a6e121aaa0ab61965db2dcfe8e2ba5d719fbe1e6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 21:39:17 2010 +1100

       - djm@cvs.openbsd.org 2010/09/25 09:30:16
         [sftp.c configure.ac openbsd-compat/glob.c openbsd-compat/glob.h]
         make use of new glob(3) GLOB_KEEPSTAT extension to save extra server
         rountrips to fetch per-file stat(2) information.
         NB. update openbsd-compat/ glob(3) implementation from OpenBSD libc to
         match.

commit aa18063baf35e303832d9ec58204ffaab221de85
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 7 21:25:27 2010 +1100

       - matthew@cvs.openbsd.org 2010/09/24 13:33:00
         [misc.c misc.h configure.ac openbsd-compat/openbsd-compat.h]
         [openbsd-compat/timingsafe_bcmp.c]
         Add timingsafe_bcmp(3) to libc, mention that it's already in the
         kernel in kern(9), and remove it from OpenSSH.
         ok deraadt@, djm@
         NB. re-added under openbsd-compat/ for portable OpenSSH

commit 2beb32f290390c4f7c2a86dd5d096475e3b76c5b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 24 22:16:03 2010 +1000

       - jmc@cvs.openbsd.org 2010/09/23 13:36:46
         [scp.1 sftp.1]
         add KexAlgorithms to the -o list;

commit 56883e194fce3dea230cffddba512181398c06c4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 24 22:15:39 2010 +1000

       - jmc@cvs.openbsd.org 2010/09/23 13:34:43
         [sftp.c]
         add [-l limit] to usage();

commit 65e42f87fe945a2bf30d7e02358554dbaefa8a4c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 24 22:15:11 2010 +1000

       - djm@cvs.openbsd.org 2010/09/22 22:58:51
         [atomicio.c atomicio.h misc.c misc.h scp.c sftp-client.c]
         [sftp-client.h sftp.1 sftp.c]
         add an option per-read/write callback to atomicio
    
         factor out bandwidth limiting code from scp(1) into a generic bandwidth
         limiter that can be attached using the atomicio callback mechanism
    
         add a bandwidth limit option to sftp(1) using the above
         "very nice" markus@

commit 7fe2b1fec3b364faf952828f3875b8e7eed8feb4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 24 22:11:53 2010 +1000

       - jmc@cvs.openbsd.org 2010/09/22 08:30:08
         [ssh.1 ssh_config.5]
         ssh.1: add kexalgorithms to the -o list
         ssh_config.5: format the kexalgorithms in a more consistent
         (prettier!) way
         ok djm

commit d5f62bf280b0798d7009d4424594a648a4e887fb
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 24 22:11:14 2010 +1000

       - djm@cvs.openbsd.org 2010/09/22 05:01:30
         [kex.c kex.h kexecdh.c kexecdhc.c kexecdhs.c readconf.c readconf.h]
         [servconf.c servconf.h ssh_config.5 sshconnect2.c sshd.c sshd_config.5]
         add a KexAlgorithms knob to the client and server configuration to allow
         selection of which key exchange methods are used by ssh(1) and sshd(8)
         and their order of preference.
         ok markus@

commit 603134e077e667b4819effb0e121803842df621f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 24 22:07:55 2010 +1000

       - djm@cvs.openbsd.org 2010/09/20 07:19:27
         [mux.c]
         "atomically" create the listening mux socket by binding it on a temorary
         name and then linking it into position after listen() has succeeded.
         this allows the mux clients to determine that the server socket is
         either ready or stale without races. stale server sockets are now
         automatically removed
         ok deraadt

commit 18e1cab1a112052580bbd3f35fbaec15661d098d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 24 22:07:17 2010 +1000

       - djm@cvs.openbsd.org 2010/09/20 04:54:07
         [jpake.c]
         missing #include

commit f7540cd5c4047675d03b2426bb6c32d3ff811bf7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 24 22:03:24 2010 +1000

       - djm@cvs.openbsd.org 2010/09/20 04:50:53
         [jpake.c schnorr.c]
         check that received values are smaller than the group size in the
         disabled and unfinished J-PAKE code.
         avoids catastrophic security failure found by Sebastien Martini

commit 857b02e37f3bd6d5390711521e2dd021beca3a3c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 24 22:02:56 2010 +1000

       - djm@cvs.openbsd.org 2010/09/20 04:41:47
         [ssh.c]
         install a SIGCHLD handler to reap expiried child process; ok markus@

commit 881adf74eba06251604151cd4686fef3640b9008
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 24 22:01:54 2010 +1000

       - jmc@cvs.openbsd.org 2010/09/19 21:30:05
         [sftp.1]
         more wacky macro fixing;

commit 1ca94693180f4be6ece4056b9d3e95dc484973bb
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 24 22:01:22 2010 +1000

       - djm@cvs.openbsd.org 2010/09/11 21:44:20
         [ssh.1]
         mention RFC 5656 for ECC stuff

commit 6186bbc7fbdda96d8a5febba9e158fdf2f3f4db4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 24 22:00:54 2010 +1000

       - naddy@cvs.openbsd.org 2010/09/10 15:19:29
         [ssh-keygen.1]
         * mention ECDSA in more places
         * less repetition in FILES section
         * SSHv1 keys are still encrypted with 3DES
         help and ok jmc@

commit 8ccb7392e7ea45d2997afdfa981a450c7db85211
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 10 12:28:24 2010 +1000

     - (dtucker) [kex.h key.c packet.h ssh-agent.c ssh.c] A few more ECC ifdefs
       for missing headers and compiler warnings.

commit 6af914a15c0c33e8b5bab5ca61919b8562ff1db9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:39:26 2010 +1000

     - (djm) [authfd.c authfile.c bufec.c buffer.h configure.ac kex.h kexecdh.c]
       [kexecdhc.c kexecdhs.c key.c key.h myproposal.h packet.c readconf.c]
       [ssh-agent.c ssh-ecdsa.c ssh-keygen.c ssh.c] Disable ECDH and ECDSA on
       platforms that don't have the requisite OpenSSL support. ok dtucker@

commit 041ab7c1e7d6514ed84a539a767f79ffb356e807
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:23:34 2010 +1000

       - djm@cvs.openbsd.org 2010/09/09 10:45:45
         [kex.c kex.h kexecdh.c key.c key.h monitor.c ssh-ecdsa.c]
         ECDH/ECDSA compliance fix: these methods vary the hash function they use
         (SHA256/384/512) depending on the length of the curve in use. The previous
         code incorrectly used SHA256 in all cases.
    
         This fix will cause authentication failure when using 384 or 521-bit curve
         keys if one peer hasn't been upgraded and the other has. (256-bit curve
         keys work ok). In particular you may need to specify HostkeyAlgorithms
         when connecting to a server that has not been upgraded from an upgraded
         client.
    
         ok naddy@

commit 3796ab47d3f68f69512c360f178b77bf0fb12b4f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:20:59 2010 +1000

       - deraadt@cvs.openbsd.org 2010/09/08 04:13:31
         [compress.c]
         work around name-space collisions some buggy compilers (looking at you
         gcc, at least in earlier versions, but this does not forgive your current
         transgressions) seen between zlib and openssl
         ok djm

commit bf0423e550e47bc4b3a40fe165da4e5c68b4aa5c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:20:38 2010 +1000

       - djm@cvs.openbsd.org 2010/09/08 03:54:36
         [authfile.c]
         typo

commit 80ed82aaf4d62ab76920d7b7d5fb181ed909ed8c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:20:11 2010 +1000

       - naddy@cvs.openbsd.org 2010/09/06 17:10:19
         [sshd_config]
         add ssh_host_ecdsa_key to /etc; from Mattieu Baptiste
         <mattieu.b@gmail.com>
         ok deraadt@

commit daa7b2254f6391bfddde2c6b4acb1957843feaa1
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:19:33 2010 +1000

       - jmc@cvs.openbsd.org 2010/09/04 09:38:34
         [ssh-add.1 ssh.1]
         two more EXIT STATUS sections;

commit 390f1532f2861f6dad19f34852d8088a8ef8bc73
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:17:54 2010 +1000

       - jmc@cvs.openbsd.org 2010/09/03 11:09:29
         [scp.1]
         add an EXIT STATUS section for /usr/bin;

commit 6e9f680cd2bb19b96280e90adaef5a536d8ae160
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:17:38 2010 +1000

       - naddy@cvs.openbsd.org 2010/09/02 17:21:50
         [ssh-keygen.c]
         Switch ECDSA default key size to 256 bits, which according to RFC5656
         should still be better than our current RSA-2048 default.
         ok djm@, markus@

commit 5929c52f65fc2029fb9b496ccfa91bd4cecca0be
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:17:02 2010 +1000

      - markus@cvs.openbsd.org 2010/09/02 16:08:39
         [ssh.c]
         unbreak ControlPersist=yes for ControlMaster=yes; ok djm@

commit 5773794d55a4e30eac2b45adb4dfcb48727c07ae
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:16:37 2010 +1000

      - markus@cvs.openbsd.org 2010/09/02 16:07:25
         [ssh-keygen.c]
         permit -b 256, 384 or 521 as key size for ECDSA; ok djm@

commit 0f2635884c23537cb466ee5aeb9527f1fd4ce854
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:16:09 2010 +1000

       - djm@cvs.openbsd.org 2010/09/01 22:42:13
         [myproposal.h]
         prefer ECDH in a 256 bit curve field; prompted by naddy@

commit e13cadf41b920ccce3eb51e600a61ceaf1c37542
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:15:33 2010 +1000

       - naddy@cvs.openbsd.org 2010/09/01 15:21:35
         [servconf.c]
         pick up ECDSA host key by default; ok djm@

commit d44279029243ca238682bbc171e80531badbd3fb
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:15:10 2010 +1000

       - jmc@cvs.openbsd.org 2010/08/31 21:14:58
         [ssh.1]
         small text tweak to accommodate previous;

commit de735ea3bddf5813aabd76de18151e55172626b3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:12:38 2010 +1000

       - jmc@cvs.openbsd.org 2010/08/31 17:40:54
         [ssh-agent.1]
         fix some macro abuse;

commit 4314c2b5489da5af3b70c440fcd2c44ddc4745a8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 10 11:12:09 2010 +1000

       - djm@cvs.openbsd.org 2010/08/31 12:33:38
         [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c]
         reintroduce commit from tedu@, which I pulled out for release
         engineering:
           OpenSSL_add_all_algorithms is the name of the function we have a
           man page for, so use that.  ok djm

commit 50e3bab2421e41cbce9093c5047298ed7ad730cb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 10 10:30:25 2010 +1000

     - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact
       return code since it can apparently return -1 under some conditions.  From
       openssh bugs werbittewas de, ok djm@

commit c79ff0770e0ac1e0d9acc2741190cf7599bb6bd8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 31 22:50:48 2010 +1000

     - (djm) [bufec.c kexecdh.c kexecdhc.c kexecdhs.c ssh-ecdsa.c] include
       includes.h

commit b5a62d0300b9e469ee2e84df6de1ad36e32ed4d7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 31 22:47:15 2010 +1000

     - (djm) [Makefile.in] Add new ECC files

commit eb8b60e320cdade9f4c07e2abacfb92c52e01348
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 31 22:41:14 2010 +1000

       - djm@cvs.openbsd.org 2010/08/31 11:54:45
         [PROTOCOL PROTOCOL.agent PROTOCOL.certkeys auth2-jpake.c authfd.c]
         [authfile.c buffer.h dns.c kex.c kex.h key.c key.h monitor.c]
         [monitor_wrap.c myproposal.h packet.c packet.h pathnames.h readconf.c]
         [ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c]
         [ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 ssh.1 ssh.c ssh2.h]
         [ssh_config.5 sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config.5]
         [uuencode.c uuencode.h bufec.c kexecdh.c kexecdhc.c kexecdhs.c ssh-ecdsa.c]
         Implement Elliptic Curve Cryptography modes for key exchange (ECDH) and
         host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA offer
         better performance than plain DH and DSA at the same equivalent symmetric
         key length, as well as much shorter keys.
    
         Only the mandatory sections of RFC5656 are implemented, specifically the
         three REQUIRED curves nistp256, nistp384 and nistp521 and only ECDH and
         ECDSA. Point compression (optional in RFC5656 is NOT implemented).
    
         Certificate host and user keys using the new ECDSA key types are supported.
    
         Note that this code has not been tested for interoperability and may be
         subject to change.
    
         feedback and ok markus@

commit da108ece6843f1268aa36d7c8ed0030dc53acd15
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 31 22:36:39 2010 +1000

       - djm@cvs.openbsd.org 2010/08/31 09:58:37
         [auth-options.c auth1.c auth2.c bufaux.c buffer.h kex.c key.c packet.c]
         [packet.h ssh-dss.c ssh-rsa.c]
         Add buffer_get_cstring() and related functions that verify that the
         string extracted from the buffer contains no embedded \0 characters*
         This prevents random (possibly malicious) crap from being appended to
         strings where it would not be noticed if the string is used with
         a string(3) function.
    
         Use the new API in a few sensitive places.
    
         * actually, we allow a single one at the end of the string for now because
         we don't know how many deployed implementations get this wrong, but don't
         count on this to remain indefinitely.

commit d96546f5b0f7c57395a338dbb9ac3ac5a48b77fa
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 31 22:32:12 2010 +1000

       - djm@cvs.openbsd.org 2010/08/16 04:06:06
         [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c]
         backout previous temporarily; discussed with deraadt@

commit 9b87e795387f748a21cd4d6c26ae57e800c36b54
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 31 22:31:37 2010 +1000

       - tedu@cvs.openbsd.org 2010/08/12 23:34:39
         [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c]
         OpenSSL_add_all_algorithms is the name of the function we have a man page
         for, so use that.  ok djm

commit afdae616354e19d2b420fd533ddc2099de4c404c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 31 22:31:14 2010 +1000

       - jmc@cvs.openbsd.org 2010/08/08 19:36:30
         [ssh-keysign.8 ssh.1 sshd.8]
         use the same template for all FILES sections; i.e. -compact/.Pp where we
         have multiple items, and .Pa for path names;

commit 6889abd9ad3cf0ec9a136b9ece71373c05087e38
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 27 10:12:54 2010 +1000

     - (dtucker) [contrib/redhat/sshd.init] Bug #1810: initlog is deprecated,
       remove.  Patch from martynas at venck us.

commit a53620218b198be806c307e517b9d672a7006880
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 23 21:20:20 2010 +1000

     - (djm) Release OpenSSH-5.6p1

commit 07ad38918117d87121e65738431a68fd3a3b2048
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 17 07:04:28 2010 +1000

    - (djm) [regress/README.regress] typo

commit 00d9ae26db2a8176f8ff511c207fa0bc7fadd562
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 17 01:59:31 2010 +1000

       - djm@cvs.openbsd.org 2010/08/12 21:49:44
         [ssh.c]
         close any extra file descriptors inherited from parent at start and
         reopen stdin/stdout to /dev/null when forking for ControlPersist.
    
         prevents tools that fork and run a captive ssh for communication from
         failing to exit when the ssh completes while they wait for these fds to
         close. The inherited fds may persist arbitrarily long if a background
         mux master has been started by ControlPersist. cvs and scp were effected
         by this.
    
         "please commit" markus@

commit aa74f6754aa3696cf15abb3f27b00a7274e062dd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 16 13:15:23 2010 +1000

     - (dtucker) [configure.ac openbsd-compat/Makefile.in
       openbsd-compat/openbsd-compat.h openbsd-compat/strptime.c] Add strptime to
       the compat library which helps on platforms like old IRIX.  Based on work
       by djm, tested by Tom Christensen.

commit ad7d547acd8ee484f6841dd6c63bd768144e1329
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Aug 12 10:33:01 2010 -0700

     - (tim) [auth.c] add cast to quiet compiler. Change only affects SVR5 systems.

commit 722b8d14f17f6471ef9b746f8b5942e1c7940d32
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Aug 12 09:43:13 2010 -0700

     - (tim) [regress/login-timeout.sh regress/reconfigure.sh regress/reexec.sh
       regress/test-exec.sh] Under certain conditions when testing with sudo
       tests would fail because the pidfile could not be read by a regular user.
       "cat: cannot open ...../regress/pidfile: Permission denied (error 13)"
       Make sure cat is run by $SUDO.  no objection from me. djm@

commit 02c47341a2d0bd03411f6e00c74fb7ddd9b03986
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 10 13:36:09 2010 +1000

     - (dtucker) bug #1530: strip trailing ":" from hostname in ssh-copy-id.
       based in part on a patch from Colin Watson, ok djm@

commit 2c4b13aa32cbe05801857d3a1a0080d8b0030155
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 10 12:47:40 2010 +1000

     - (djm) bz#1561: don't bother setting IFF_UP on tun(4) device if it is
       already set. Makes FreeBSD user openable tunnels useful; patch from
       richard.burakowski+ossh AT mrburak.net, ok dtucker@

commit 792010bafde7f901d339039b56f648912fd54b02
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 9 02:32:05 2010 +1000

     - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Crank version numbers

commit 7e569b883c250cc05868a6d558b363066d649112
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 9 02:28:37 2010 +1000

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2010/08/08 16:26:42
         [version.h]
         crank to 5.6

commit 8e604acd441234a4d1f720beac66c24fcf8c7e5a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 9 02:28:10 2010 +1000

    unbreak datestamps

commit 7d45718943e63ec649003d3a9b56e531da2193ea
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 5 23:09:48 2010 +1000

       - djm@cvs.openbsd.org 2010/08/05 13:08:42
         [channels.c]
         Fix a trio of bugs in the local/remote window calculation for datagram
         data channels (i.e. TunnelForward):
    
         Calculate local_consumed correctly in channel_handle_wfd() by measuring
         the delta to buffer_len(c->output) from when we start to when we finish.
         The proximal problem here is that the output_filter we use in portable
         modified the length of the dequeued datagram (to futz with the headers
         for !OpenBSD).
    
         In channel_output_poll(), don't enqueue datagrams that won't fit in the
         peer's advertised packet size (highly unlikely to ever occur) or which
         won't fit in the peer's remaining window (more likely).
    
         In channel_input_data(), account for the 4-byte string header in
         datagram packets that we accept from the peer and enqueue in c->output.
    
         report, analysis and testing 2/3 cases from wierbows AT us.ibm.com;
         "looks good" markus@

commit b89e6b76be2842d7d91b186753af741a73465d71
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 5 13:06:20 2010 +1000

       - djm@cvs.openbsd.org 2010/08/04 06:08:40
         [ssh-keysign.c]
         clean for -Wuninitialized (Id sync only; portable had this change)

commit 757f34e051d59995b7225e5c08c70f7f54019ae6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 5 13:05:31 2010 +1000

       - djm@cvs.openbsd.org 2010/08/04 06:07:11
         [ssh-keygen.1 ssh-keygen.c]
         Support CA keys in PKCS#11 tokens; feedback and ok markus@

commit 5458c4dd138a4ca14ad5d1d1c2da9acff7d909d6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 5 13:05:15 2010 +1000

       - djm@cvs.openbsd.org 2010/08/04 05:49:22
         [authfile.c]
         commited the wrong version of the hostbased certificate diff; this
         version replaces some strlc{py,at} verbosity with xasprintf() at
         the request of markus@

commit c158331f8c7e059c6c1d099bffc7f5fc6087ddbd
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 5 13:04:50 2010 +1000

       - djm@cvs.openbsd.org 2010/08/04 05:42:47
         [auth.c auth2-hostbased.c authfile.c authfile.h ssh-keysign.8]
         [ssh-keysign.c ssh.c]
         enable certificates for hostbased authentication, from Iain Morgan;
         "looks ok" markus@

commit 1da638895916bc061ff6aca9f373d48a9776810b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 5 13:03:51 2010 +1000

       - djm@cvs.openbsd.org 2010/08/04 05:40:39
         [PROTOCOL.certkeys ssh-keygen.c]
         tighten the rules for certificate encoding by requiring that options
         appear in lexical order and make our ssh-keygen comply. ok markus@

commit 7fa96602e52f02e66897f98a1568cbd3a555192b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 5 13:03:13 2010 +1000

       - djm@cvs.openbsd.org 2010/08/04 05:37:01
         [ssh.1 ssh_config.5 sshd.8]
         Remove mentions of weird "addr/port" alternate address format for IPv6
         addresses combinations. It hasn't worked for ages and we have supported
         the more commen "[addr]:port" format for a long time. ok jmc@ markus@

commit 081f3c73d8ee4352968348bd6d3dfb65203f3e01
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 3 16:05:25 2010 +1000

       - dtucker@cvs.openbsd.org 2010/07/23 08:49:25
         [ssh.1]
         Ciphers is documented in ssh_config(5) these days

commit 8c1eb113efb7e78c239acce90b19b12234352906
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 3 16:05:05 2010 +1000

       - djm@cvs.openbsd.org 2010/07/21 02:10:58
         [misc.c]
         sync timingsafe_bcmp() with the one dempsky@ committed to sys/lib/libkern

commit e11e1ea5d475ee8be0038d64aa3e47c776295ac2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 3 16:04:46 2010 +1000

       - djm@cvs.openbsd.org 2010/07/19 09:15:12
         [clientloop.c readconf.c readconf.h ssh.c ssh_config.5]
         add a "ControlPersist" option that automatically starts a background
         ssh(1) multiplex master when connecting. This connection can stay alive
         indefinitely, or can be set to automatically close after a user-specified
         duration of inactivity. bz#1330 - patch by dwmw2 AT infradead.org, but
         further hacked on by wmertens AT cisco.com, apb AT cequrux.com,
         martin-mindrot-bugzilla AT earth.li and myself; "looks ok" markus@

commit c4bb91c79c0a05d2bbf2ac68b7be8421fb4957bf
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 3 16:04:22 2010 +1000

       - djm@cvs.openbsd.org 2010/07/19 03:16:33
         [sftp-client.c]
         bz#1797: fix swapped args in upload_dir_internal(), breaking recursive
         upload depth checks and causing verbose printing of transfers to always
         be turned on; patch from imorgan AT nas.nasa.gov

commit 4e8285e31248f7306e4b1d299d186b277c69d00f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 3 16:04:03 2010 +1000

       - djm@cvs.openbsd.org 2010/07/16 14:07:35
         [ssh-rsa.c]
         more timing paranoia - compare all parts of the expected decrypted
         data before returning. AFAIK not exploitable in the SSH protocol.
         "groovy" deraadt@

commit 844cccfc1ae3bde48aa481bb8522d482fc8e7a0e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 3 16:03:29 2010 +1000

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2010/07/16 04:45:30
         [ssh-keygen.c]
         avoid bogus compiler warning

commit 8b7a055e9aac7c95d934e4ad8ba3991dfccfe586
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 3 15:50:16 2010 +1000

     - (dtucker) [monitor.c] Bug #1795: Initialize the values to be returned from
       PAM to sane values in case the PAM method doesn't write to them.  Spotted by
       Bitman Zhou, ok djm@.

commit 12b29dbd8a439b7de6bd7c30bf9b03539ac2e105
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 19 21:24:13 2010 +1000

     - (dtucker) [contrib/ssh-copy-ud.1] Bug #1786: update ssh-copy-id.1 with more
       details about its behaviour WRT existing directories.  Patch from
       asguthrie at gmail com, ok djm.

commit bad5e03bfdcfd0ae3b5f6812affd8c2cf62d6046
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 16 13:59:59 2010 +1000

       - schwarze@cvs.openbsd.org 2010/07/15 21:20:38
         [ssh-keygen.1]
         repair incorrect block nesting, which screwed up indentation;
         problem reported and fix OK by jmc@

commit bcfbc48930448c726e02cba6e1a85b316801564b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 16 13:59:11 2010 +1000

       - jmc@cvs.openbsd.org 2010/07/14 17:06:58
         [ssh.1]
         finally ssh synopsis looks nice again! this commit just removes a ton of
         hacks we had in place to make it work with old groff;

commit ea1651c98e1814f54c8d4b027b31f7de1c34989c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 16 13:58:37 2010 +1000

       - djm@cvs.openbsd.org 2010/07/13 23:13:16
         [auth-rsa.c channels.c jpake.c key.c misc.c misc.h monitor.c packet.c]
         [ssh-rsa.c]
         s/timing_safe_cmp/timingsafe_bcmp/g

commit 8a0268f1b3f62292d4124f8d158e0587c4f7c330
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 16 13:57:51 2010 +1000

       - djm@cvs.openbsd.org 2010/07/13 11:52:06
         [auth-rsa.c channels.c jpake.c key.c misc.c misc.h monitor.c]
         [packet.c ssh-rsa.c]
         implement a timing_safe_cmp() function to compare memory without leaking
         timing information by short-circuiting like memcmp() and use it for
         some of the more sensitive comparisons (though nothing high-value was
         readily attackable anyway); "looks ok" markus@

commit d0244d498ba970b9d9348429eaf7a4a0ef2b903c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 16 13:56:43 2010 +1000

       - djm@cvs.openbsd.org 2010/07/12 22:41:13
         [ssh.c ssh_config.5]
         expand %h to the hostname in ssh_config Hostname options. While this
         sounds useless, it is actually handy for working with unqualified
         hostnames:
    
         Host *.*
            Hostname %h
         Host *
            Hostname %h.example.org
    
         "I like it" markus@

commit 1f25ab43f4b374f920120b93ae3ed2f8521472c5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 16 13:56:23 2010 +1000

       - djm@cvs.openbsd.org 2010/07/12 22:38:52
         [ssh.c]
         Make ExitOnForwardFailure work with fork-after-authentication ("ssh -f")
         for protocol 2. ok markus@

commit 9308fc7743d485f7ddf6dfd7c2e222588f7623df
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 16 13:56:01 2010 +1000

       - djm@cvs.openbsd.org 2010/07/02 04:32:44
         [misc.c]
         unbreak strdelim() skipping past quoted strings, e.g.
         AllowUsers "blah blah" blah
         was broken; report and fix in bz#1757 from bitman.zhou AT centrify.com
         ok dtucker;

commit cfbdc28ffe06de99d582ddff43f9f0be7dccc608
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jul 14 13:42:28 2010 -0700

     - (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass
       (line 77) should have been for no_x11_askpass.

commit ab139cde3827744985a7d52da753af8cff27f3a3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 2 13:42:18 2010 +1000

       - djm@cvs.openbsd.org 2010/06/29 23:59:54
         [cert-userkey.sh]
         regress tests for key options in AuthorizedPrincipals

commit 527ded7f643d99ef0798a3c3a19e4edc56b9289f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 2 13:40:16 2010 +1000

       - phessler@cvs.openbsd.org 2010/06/27 19:19:56
         [Makefile]
         fix how we run the tests so we can successfully use SUDO='sudo -E'
         in our env

commit 0979b40934a59615d8fa1535103d51f11c04bad2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 2 13:37:33 2010 +1000

       - millert@cvs.openbsd.org 2010/07/01 13:06:59
         [scp.c]
         Fix a longstanding problem where if you suspend scp at the
         password/passphrase prompt the terminal mode is not restored.
         OK djm@

commit d59dab83536d4a539e795ff5ce2be6b952d57e24
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 2 13:37:17 2010 +1000

       - jmc@cvs.openbsd.org 2010/06/30 07:28:34
         [sshd_config.5]
         tweak previous;

commit 6022f58e3af3fcda0d28b4d62a54429d2ef45e70
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 2 13:37:01 2010 +1000

       - jmc@cvs.openbsd.org 2010/06/30 07:26:03
         [ssh-keygen.c]
         sort usage();

commit ea72728ffecfd1f87e9f8644f263e2a53e87af4d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 2 13:35:34 2010 +1000

       - jmc@cvs.openbsd.org 2010/06/30 07:24:25
         [ssh-keygen.1]
         tweak previous;

commit 6018a36864643ad0e5ff1f7205a7187b961c2c57
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 2 13:35:19 2010 +1000

       - djm@cvs.openbsd.org 2010/06/29 23:16:46
         [auth2-pubkey.c sshd_config.5]
         allow key options (command="..." and friends) in AuthorizedPrincipals;
         ok markus@

commit 44b25040110a224a79ff371ee548be9a10ba8bfa
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 2 13:35:01 2010 +1000

       - djm@cvs.openbsd.org 2010/06/29 23:15:30
         [ssh-keygen.1 ssh-keygen.c]
         allow import (-i) and export (-e) of PEM and PKCS#8 encoded keys;
         bz#1749; ok markus@

commit b96c441ee2e4d8ffae756d0d74e2777149c91067
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 2 13:34:24 2010 +1000

       - djm@cvs.openbsd.org 2010/06/26 23:04:04
         [ssh.c]
         oops, forgot to #include <canohost.h>; spotted and patch from chl@

commit cede1dbc557df3801bd1628c10543b7385ce50f7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 2 13:33:48 2010 +1000

       - jmc@cvs.openbsd.org 2010/06/26 00:57:07
         [ssh_config.5]
         tweak previous;

commit 3fd307df5bdfaa556910ec15c6d1cd1ad94f20a5
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Jun 26 16:45:15 2010 -0700

     - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs
       key.h.

commit 1ab6a51f9b258a6e844f1ee442c15aec7fcb6a72
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 10:02:24 2010 +1000

       - djm@cvs.openbsd.org 2010/06/25 23:10:30
         [ssh.c]
         log the hostname and address that we connected to at LogLevel=verbose
         after authentication is successful to mitigate "phishing" attacks by
         servers with trusted keys that accept authentication silently and
         automatically before presenting fake password/passphrase prompts;
         "nice!" markus@

commit 383ffe6c5f31d3ecd89caadc8aef1bc2b821d63a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 10:02:03 2010 +1000

       - djm@cvs.openbsd.org 2010/06/25 23:10:30
         [ssh.c]
         log the hostname and address that we connected to at LogLevel=verbose
         after authentication is successful to mitigate "phishing" attacks by
         servers with trusted keys that accept authentication silently and
         automatically before presenting fake password/passphrase prompts;
         "nice!" markus@

commit bda3ecafcafd85856c6ffd0ba54b85afe6d71a84
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 10:01:33 2010 +1000

       - djm@cvs.openbsd.org 2010/06/25 08:46:17
         [auth1.c auth2-none.c]
         skip the initial check for access with an empty password when
         PermitEmptyPasswords=no; bz#1638; ok markus@

commit 8853ca5fc46b7b71c74baeefb9b0899c7fcfdb9a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 10:00:14 2010 +1000

       - djm@cvs.openbsd.org 2010/06/25 07:20:04
         [channels.c session.c]
         bz#1750: fix requirement for /dev/null inside ChrootDirectory for
         internal-sftp accidentally introduced in r1.253 by removing the code
         that opens and dup /dev/null to stderr and modifying the channels code
         to read stderr but discard it instead; ok markus@

commit 232cfb1b1d0dccee68b1d433e0b4e1aa74919fc9
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:50:30 2010 +1000

       - djm@cvs.openbsd.org 2010/06/25 07:14:46
         [channels.c mux.c readconf.c readconf.h ssh.h]
         bz#1327: remove hardcoded limit of 100 permitopen clauses and port
         forwards per direction; ok markus@ stevesk@

commit d834d3583427981a395f8fc53346f9473b2e902c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:48:02 2010 +1000

       - djm@cvs.openbsd.org 2010/06/23 02:59:02
         [ssh-keygen.c]
         fix printing of extensions in v01 certificates that I broke in r1.190

commit 1b2b61e6f87810354c9a47448fbdb483f33413b0
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:47:43 2010 +1000

       - djm@cvs.openbsd.org 2010/06/22 04:59:12
         [session.c]
         include the user name on "subsystem request for ..." log messages;
         bz#1571; ok dtucker@

commit 0e76c5e50227ca2fc4e8e8846b0ec911f26e0684
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:39:59 2010 +1000

       - djm@cvs.openbsd.org 2010/06/22 04:54:30
         [ssh-keyscan.c]
         replace verbose and overflow-prone Linebuf code with read_keyfile_line()
         based on patch from joachim AT joachimschipper.nl; bz#1565; ok dtucker@

commit 48147d6801be6b9158c4bcedce6c67b0d591d642
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:39:25 2010 +1000

       - djm@cvs.openbsd.org 2010/06/22 04:49:47
         [auth.c]
         queue auth debug messages for bad ownership or permissions on the user's
         keyfiles. These messages will be sent after the user has successfully
         authenticated (where our client will display them with LogLevel=debug).

commit ba3420acd2aceae99aa317ef539b85b047aa6c86
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:39:07 2010 +1000

       - djm@cvs.openbsd.org 2010/06/22 04:32:06
         [ssh-keygen.c]
         standardise error messages when attempting to open private key
         files to include "progname: filename: error reason"
         bz#1783; ok dtucker@

commit ab6de351404d5a691a89cf2c9fbe9438271bd03d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:38:45 2010 +1000

       - djm@cvs.openbsd.org 2010/06/22 04:22:59
         [servconf.c sshd_config.5]
         expose some more sshd_config options inside Match blocks:
           AuthorizedKeysFile AuthorizedPrincipalsFile
           HostbasedUsesNameFromPacketOnly PermitTunnel
         bz#1764; feedback from imorgan AT nas.nasa.gov; ok dtucker@

commit 495663165f9ef1583249e690a8f654b312fbd40e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:38:23 2010 +1000

       - djm@cvs.openbsd.org 2010/06/18 04:43:08
         [sftp-client.c]
         fix memory leak in do_realpath() error path; bz#1771, patch from
         anicka AT suse.cz

commit 7aa46ec393dd193d0a45ce7a5eb49413ead8789b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:37:57 2010 +1000

       - djm@cvs.openbsd.org 2010/06/18 03:16:03
         [session.c]
         Missing check for chroot_director == "none" (we already checked against
         NULL); bz#1564 from Jan.Pechanec AT Sun.COM

commit 99ac4e9546b2eafc43e104d676a3b10866be98e9
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:36:58 2010 +1000

       - djm@cvs.openbsd.org 2010/06/18 00:58:39
         [sftp.c]
         unbreak ls in working directories that contains globbing characters in
         their pathnames. bz#1655 reported by vgiffin AT apple.com

commit c094d1e4812e6560f2e9c9790a5866ee3a4654ec
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:36:34 2010 +1000

       - djm@cvs.openbsd.org 2010/06/17 07:07:30
         [mux.c]
         Correct sizing of object to be allocated by calloc(), replacing
         sizeof(state) with sizeof(*state). This worked by accident since
         the struct contained a single int at present, but could have broken
         in the future. patch from hyc AT symas.com

commit 4fe686d35fc1bbf5f160d1619ab392e09f3bd5c5
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:36:10 2010 +1000

       - markus@cvs.openbsd.org 2010/06/08 21:32:19
         [ssh-pkcs11.c]
         check length of value returned  C_GetAttributValue for != 0
         from mdrtbugzilla@codefive.co.uk; bugzilla #1773; ok dtucker@

commit 2e77446a13b0fd09c94c1a3d088b7d7e7e479fd3
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:30:47 2010 +1000

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2010/05/21 05:00:36
         [misc.c]
         colon() returns char*, so s/return (0)/return NULL/

commit d82a260fdff795ddf2f7f49ea22901b7c2aad9c5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 22 15:02:39 2010 +1000

     - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512
       bz#1579; ok dtucker

commit ea909791c5cf297aa83d32af1c9df56e77c2e84a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 18 11:09:24 2010 +1000

     - (djm) [contrib/ssh-copy-id] Update key file explicitly under ~
       rather than assuming that $CWD == $HOME. bz#1500, patch from
       timothy AT gelter.com

commit b9ae4ec556e6ee4cbe0c6cc7fb4ec9b9486cb8f7
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jun 17 11:11:44 2010 -0700

     - (tim) [contrib/cygwin/README] Remove a reference to the obsolete
       minires-devel package, and to add the reference to the libedit-devel
       package since CYgwin now provides libedit. Patch from Corinna Vinschen.

commit d0e4a8e2e0bc6fcee6cd8486fbcdffaf7d037aed
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 21 14:58:32 2010 +1000

       - djm@cvs.openbsd.org 2010/05/20 23:46:02
         [PROTOCOL.certkeys auth-options.c ssh-keygen.c]
         Move the permit-* options to the non-critical "extensions" field for v01
         certificates. The logic is that if another implementation fails to
         implement them then the connection just loses features rather than fails
         outright.
    
         ok markus@

commit 84399555f0a3c78b96c3e5a56ce9c83eaa814228
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 21 14:58:12 2010 +1000

       - djm@cvs.openbsd.org 2010/05/20 11:25:26
         [auth2-pubkey.c]
         fix logspam when key options (from="..." especially) deny non-matching
         keys; reported by henning@ also bz#1765; ok markus@ dtucker@

commit 388f6fc48561851dcedd5433aff75f60af573fb2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 21 14:57:35 2010 +1000

       - markus@cvs.openbsd.org 2010/05/16 12:55:51
         [PROTOCOL.mux clientloop.h mux.c readconf.c readconf.h ssh.1 ssh.c]
         mux support for remote forwarding with dynamic port allocation,
         use with
            LPORT=`ssh -S muxsocket -R0:localhost:25 -O forward somehost`
         feedback and ok djm@

commit d530f5f471491b6be9edb58a063f2590e4dce48d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 21 14:57:10 2010 +1000

       - djm@cvs.openbsd.org 2010/05/14 23:29:23
         [channels.c channels.h mux.c ssh.c]
         Pause the mux channel while waiting for reply from aynch callbacks.
         Prevents misordering of replies if new requests arrive while waiting.
    
         Extend channel open confirm callback to allow signalling failure
         conditions as well as success. Use this to 1) fix a memory leak, 2)
         start using the above pause mechanism and 3) delay sending a success/
         failure message on mux slave session open until we receive a reply from
         the server.
    
         motivated by and with feedback from markus@

commit c6afb5f2c095a6a4380cc13a6480abb7614d949f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 21 14:56:47 2010 +1000

       - djm@cvs.openbsd.org 2010/05/14 00:47:22
         [ssh-add.c]
         check that the certificate matches the corresponding private key before
         grafting it on

commit 3b903827ebe16c97f705cb3b6ef6e9702d770087
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 21 14:56:25 2010 +1000

       - djm@cvs.openbsd.org 2010/05/11 02:58:04
         [auth-rsa.c]
         don't accept certificates marked as "cert-authority" here; ok markus@

commit 3bcce80b544174b70dfd6e0a4e9f1488ca6fa69b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 21 14:48:16 2010 +1000

       - djm@cvs.openbsd.org 2010/05/07 11:31:26
         [regress/Makefile regress/cert-userkey.sh]
         regress tests for AuthorizedPrincipalsFile and "principals=" key option.
         feedback and ok markus@

commit 4b1ec8381b1f459011cb61a6421e7cc45949cc60
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 12 17:49:59 2010 +1000

     - (djm) [openbsd-compat/openssl-compat.h] Fix build breakage on older
       libcrypto by defining OPENSSL_[DR]SA_MAX_MODULUS_BITS if they aren't
       already. ok dtucker@

commit 5b6d0d0eba02657377db1be5ef7abc893439ef6b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed May 12 16:51:38 2010 +1000

     - (dtucker) [Makefile.in] Bug #1770: Link libopenbsd-compat twice to solve
       circular dependency problem on old or odd platforms.  From Tom Lane, ok
       djm@.

commit 81d3fc535b9725d6d0212bea10e86d7c752225db
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 10 11:58:45 2010 +1000

       - jmc@cvs.openbsd.org 2010/05/07 12:49:17
         [sshd_config.5]
         tweak previous;

commit 30da3447d2ef3329cb0eb083cdddf84532659454
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 10 11:58:03 2010 +1000

       - djm@cvs.openbsd.org 2010/05/07 11:30:30
         [auth-options.c auth-options.h auth.c auth.h auth2-pubkey.c]
         [key.c servconf.c servconf.h sshd.8 sshd_config.5]
         add some optional indirection to matching of principal names listed
         in certificates. Currently, a certificate must include the a user's name
         to be accepted for authentication. This change adds the ability to
         specify a list of certificate principal names that are acceptable.
    
         When authenticating using a CA trusted through ~/.ssh/authorized_keys,
         this adds a new principals="name1[,name2,...]" key option.
    
         For CAs listed through sshd_config's TrustedCAKeys option, a new config
         option "AuthorizedPrincipalsFile" specifies a per-user file containing
         the list of acceptable names.
    
         If either option is absent, the current behaviour of requiring the
         username to appear in principals continues to apply.
    
         These options are useful for role accounts, disjoint account namespaces
         and "user@realm"-style naming policies in certificates.
    
         feedback and ok markus@

commit 099fc1634e1cc0f96b77a811e554bf9d796def8f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 10 11:56:50 2010 +1000

       - dtucker@cvs.openbsd.org 2010/05/05 04:22:09
         [sftp.c]
         restore mput and mget which got lost in the tab-completion changes.
         found by Kenneth Whitaker, ok djm@

commit 2725c2193bdc0b7d0396cf8c69f1eb0d2787eee5
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 10 11:56:14 2010 +1000

       - djm@cvs.openbsd.org 2010/05/01 02:50:50
         [PROTOCOL.certkeys]
         typo; jmeltzer@

commit 79442c07c436d0e307fa251d54606d6342b024d3
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 10 11:55:38 2010 +1000

       - djm@cvs.openbsd.org 2010/04/26 22:28:24
         [sshconnect2.c]
         bz#1502: authctxt.success is declared as an int, but passed by
         reference to function that accepts sig_atomic_t*. Convert it to
         the latter; ok markus@ dtucker@

commit bebbb7e8a591b4a2bb297f618ca2ee1f306d3d9c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 10 11:54:38 2010 +1000

       - djm@cvs.openbsd.org 2010/04/23 22:48:31
         [ssh-keygen.c]
         refuse to generate keys longer than OPENSSL_[RD]SA_MAX_MODULUS_BITS,
         since we would refuse to use them anyway. bz#1516; ok dtucker@

commit 22a29880bb324983a997f6bc03484879cae1f912
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 10 11:53:54 2010 +1000

       - djm@cvs.openbsd.org 2010/04/23 22:42:05
         [session.c]
         set stderr to /dev/null for subsystems rather than just closing it.
         avoids hangs if a subsystem or shell initialisation writes to stderr.
         bz#1750; ok markus@

commit 85c50d7858424aa38a560142c04c93a70d50dff7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 10 11:53:02 2010 +1000

       - djm@cvs.openbsd.org 2010/04/23 22:27:38
         [mux.c]
         set "detach_close" flag when registering channel cleanup callbacks.
         This causes the channel to close normally when its fds close and
         hangs when terminating a mux slave using ~. bz#1758; ok markus@

commit 50af79b1186b26425d100b1cf1ba615b72124c0e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 10 11:52:00 2010 +1000

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2010/04/23 01:47:41
         [ssh-keygen.c]
         bz#1740: display a more helpful error message when $HOME is
         inaccessible while trying to create .ssh directory. Based on patch
         from jchadima AT redhat.com; ok dtucker@

commit 9f8703b5735f372e04d4ad550aed70508843e67f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 23 11:12:06 2010 +1000

     - (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir
       in the openssl install directory (some newer openssl versions do this on at
       least some amd64 platforms).

commit e25a9bd740031a212a14f0ee82bfe0f4c5ac504c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Apr 18 13:35:00 2010 +1000

     - (dtucker) [contrib/aix/buildbff.sh] Fix creation of ssh_prng_cmds.default
       file.

commit 53f4bb65999cef5634fba2bb4fbef3a70650ce4c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 18 08:15:14 2010 +1000

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2010/04/16 01:58:45
         [regress/cert-hostkey.sh regress/cert-userkey.sh]
         regression tests for v01 certificate format
         includes interop tests for v00 certs

commit c617aa9ff541d00df413846835ad31e556e71b31
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 18 08:08:20 2010 +1000

       - djm@cvs.openbsd.org 2010/04/16 21:14:27
         [sshconnect.c]
         oops, %r => remote username, not %u

commit 1f181425e9c66781043c205339098c1b89aaac70
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 18 08:08:03 2010 +1000

       - jmc@cvs.openbsd.org 2010/04/16 06:47:04
         [ssh-keygen.1 ssh-keygen.c]
         tweak previous; ok djm

commit c4eddee1b7281dc076f8539569ca78291dde8103
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 18 08:07:43 2010 +1000

     - OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2010/04/16 06:45:01
         [ssh_config.5]
         tweak previous; ok djm

commit 4e270b05dd9d850fb9e2e0ac43f33cb4090d3ebc
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 15:56:21 2010 +1000

       - djm@cvs.openbsd.org 2010/04/16 01:47:26
         [PROTOCOL.certkeys auth-options.c auth-options.h auth-rsa.c]
         [auth2-pubkey.c authfd.c key.c key.h myproposal.h ssh-add.c]
         [ssh-agent.c ssh-dss.c ssh-keygen.1 ssh-keygen.c ssh-rsa.c]
         [sshconnect.c sshconnect2.c sshd.c]
         revised certificate format ssh-{dss,rsa}-cert-v01@openssh.com with the
         following changes:
    
         move the nonce field to the beginning of the certificate where it can
         better protect against chosen-prefix attacks on the signature hash
    
         Rename "constraints" field to "critical options"
    
         Add a new non-critical "extensions" field
    
         Add a serial number
    
         The older format is still support for authentication and cert generation
         (use "ssh-keygen -t v00 -s ca_key ..." to generate a v00 certificate)
    
         ok markus@

commit 031c9100dfe3ee65a29084ebbd61965a76b3ad26
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 15:54:44 2010 +1000

       - markus@cvs.openbsd.org 2010/04/15 20:32:55
         [ssh-pkcs11.c]
         retry lookup for private key if there's no matching key with CKA_SIGN
         attribute enabled; this fixes fixes MuscleCard support (bugzilla #1736)
         ok djm@

commit b1b17047e39b88f640a6e55141cd1073ee6e55e4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 15:54:19 2010 +1000

       - djm@cvs.openbsd.org 2010/04/14 22:27:42
         [ssh_config.5 sshconnect.c]
         expand %r => remote username in ssh_config:ProxyCommand;
         ok deraadt markus

commit 601a23c02cb1612e9596f4ce7bfa261525363c5d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 15:54:01 2010 +1000

       - djm@cvs.openbsd.org 2010/04/10 05:48:16
         [mux.c]
         fix NULL dereference; from matthew.haub AT alumni.adelaide.edu.au

commit 88680654ad2378ebb4fa7aa326552aec760132ed
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 15:53:43 2010 +1000

       - djm@cvs.openbsd.org 2010/04/10 02:10:56
         [sshconnect2.c]
         show the key type that we are offering in debug(), helps distinguish
         between certs and plain keys as the path to the private key is usually
         the same.

commit 22c97f1539816e2df00e91d023243b7d8d67a557
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 15:53:23 2010 +1000

       - djm@cvs.openbsd.org 2010/04/10 02:08:44
         [clientloop.c]
         bz#1698: kill channel when pty allocation requests fail. Fixed
         stuck client if the server refuses pty allocation.
         ok dtucker@ "think so" markus@

commit 672839994eaadecc95f3fada1cf014487631f068
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 15:53:02 2010 +1000

       - djm@cvs.openbsd.org 2010/04/10 00:04:30
         [sshconnect.c]
         fix terminology: we didn't find a certificate in known_hosts, we found
         a CA key

commit deb5a1423a72cb96c629d5514be58897cd7a24ce
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 15:52:43 2010 +1000

       - djm@cvs.openbsd.org 2010/04/10 00:00:16
         [ssh.c]
         bz#1746 - suppress spurious tty warning when using -O and stdin
         is not a tty; ok dtucker@ markus@

commit 544378da56f8ad4620874183a14100b6ef1a464c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 15:52:24 2010 +1000

       - jmc@cvs.openbsd.org 2010/03/27 14:26:55
         [ssh_config.5]
         tweak previous; ok dtucker

commit 67f30d70d94ba36cc63bdcd2e674bf1ec6f4bfc0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 15:52:03 2010 +1000

       - jmc@cvs.openbsd.org 2010/03/26 06:54:36
         [ssh.1]
         tweak previous;

commit d6fc3065dab4ee42ad728070f14c0293c55fe86b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 15:51:45 2010 +1000

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2010/03/26 03:13:17
         [bufaux.c]
         allow buffer_get_int_ret/buffer_get_int64_ret to take a NULL pointer
         argument to allow skipping past values in a buffer

commit a45f1c03455d750bf86174ca1a2b243f1d671f55
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 15:51:34 2010 +1000

    openssh-5.5p1 marker

commit 627337d95bee7dd8d4690238a35fffd35072d1fa
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Apr 10 22:58:01 2010 +1000

     - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo
       back so we disable the IPv6 tests if we don't have it.

commit 261d93a5cfe7ceecba3daa0e8f827c21dfdc7f23
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 9 18:13:27 2010 +1000

     - (dtucker) [configure.ac defines.h loginrec.c logintest.c] Bug #1732: enable
       utmpx support on FreeBSD where possible.  Patch from Ed Schouten, ok djm@

commit c4ccb12ee49fc264a95984c2000d2248ad693a2a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 9 14:04:35 2010 +1000

     - (dtucker) [configure.ac] Bug #1744: use pkg-config for libedit flags if we
       have it and the path is not provided to --with-libedit.  Based on a patch
       from Iain Morgan.

commit 537d4dcfa0289e60ab6b964f12b4ede24f633e2e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 9 13:35:23 2010 +1000

     - (dtucker) [contrib/cygwin/Makefile] Don't overwrite files with the wrong
       ones.  Based on a patch from Roumen Petrov.

commit ce3754bbf39ae2a978bdda68cf61fe311b4103d0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Mar 26 12:09:13 2010 +1100

       - dtucker@cvs.openbsd.org 2010/03/26 01:06:13
         [ssh_config.5]
         Reformat default value of PreferredAuthentications entry (current
         formatting implies ", " is acceptable as a separator, which it's not.
         ok djm@

commit 9c60f24f01cda386a210638b036dd16294ad4b76
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 26 11:28:35 2010 +1100

       - djm@cvs.openbsd.org 2010/03/26 00:26:58
         [ssh.1]
         mention that -S none disables connection sharing; from Colin Watson

commit df08341060fe956ec07514c75b93e7140d2ebda0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 26 11:18:27 2010 +1100

     - (djm) [contrib/ssh-copy-id] Don't blow up when the agent has no keys;
       bz#1723 patch from Adeodato Simó via Colin Watson; ok dtucker@

commit ffd1eaadb0b97c1f172ed0ec9eda51fd368617ae
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Mar 26 11:16:39 2010 +1100

     - (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using
       pkg-config, patch from Colin Watson.  Needed for newer linkers (ie gold).

commit 6480c63b759eb8add9387220fd8ed630e0563316
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 26 11:09:44 2010 +1100

     - (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721
       ok dtucker@

commit 8b90642fcf979737dc2f3152660b0561ec5b3a5d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 26 11:04:09 2010 +1100

     - (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms -
       set up SELinux execution context before chroot() call. From Russell
       Coker via Colin watson; bz#1726 ok dtucker@

commit 44451d0af8ecbec2a17d47d75d3cca02d1239cf8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 26 10:40:04 2010 +1100

       - djm@cvs.openbsd.org 2010/03/25 23:38:28
         [servconf.c]
         from portable: getcwd(NULL, 0) doesn't work on all platforms, so
         use a stack buffer; ok dtucker@

commit a83d90fbab8d8987d2086ce1fd5c5a05adb42c97
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Mar 26 10:27:33 2010 +1100

     - (dtucker) [configure.ac] Bug #1741: Add section for Haiku, patch originally
       by Ingo Weinhold via Scott McCreary, ok djm@

commit 7d09b8f8d90fb524e43bab1b675c0f7d5485dc8f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 26 08:52:02 2010 +1100

     - (djm) [openbsd-compat/bsd-arc4random.c] Fix preprocessor detection
       for arc4random_buf() and arc4random_uniform(); from Josh Gilkerson

commit 62131dc6e2aa875b26a4deac097f256a382d816a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 24 13:03:32 2010 +1100

     - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory
       containing the services file explicitely case-insensitive.  This allows to
       tweak the Windows services file reliably.  Patch from vinschen at redhat.

commit b086d4ac70d4a46cd74f66b86b809992bfc0ecb8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 06:11:55 2010 +1100

     - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Crank version numbers

commit 13a9f7247abccd4587822cdd5c95523032727c22
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 05:59:22 2010 +1100

       - djm@cvs.openbsd.org 2010/03/16 16:36:49
         [version.h]
         crank version to openssh-5.5 since we have a few fixes since 5.4;
         requested deraadt@ kettenis@

commit 33334b27bc405607fb257c0b4580a38b3b6e4332
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 05:59:02 2010 +1100

       - stevesk@cvs.openbsd.org 2010/03/16 15:46:52
         [auth-options.c]
         spelling in error message. ok djm kettenis

commit 1cfbfaf4a003749657035b832c30e176dc26d491
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 05:58:24 2010 +1100

       - stevesk@cvs.openbsd.org 2010/03/15 19:40:02
         [key.c key.h ssh-keygen.c]
         also print certificate type (user or host) for ssh-keygen -L
         ok djm kettenis

commit 5a5d94b12f389d24d5fec30a6bd8c8211a65cf43
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 05:57:49 2010 +1100

       - jmc@cvs.openbsd.org 2010/03/13 23:38:13
         [ssh-keygen.1]
         fix a formatting error (args need quoted); noted by stevesk

commit 1b61a2825e20e6d412aeed7ce16d888835e3398a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 05:55:06 2010 +1100

       - djm@cvs.openbsd.org 2010/03/13 21:45:46
         [ssh-keygen.1]
         Certificates are named *-cert.pub, not *_cert.pub; committing a diff
         from stevesk@ ok me

commit 8ddc71c13d3aac3f7eb13b67dc703b5508eae732
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 05:54:02 2010 +1100

       - djm@cvs.openbsd.org 2010/03/13 21:10:38
         [clientloop.c]
         protocol conformance fix: send language tag when disconnecting normally;
         spotted by 1.41421 AT gmail.com, ok markus@ deraadt@

commit 4a5f0d325b723dcfdcc540f83ae8a3c08a589d7e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 05:53:04 2010 +1100

       - markus@cvs.openbsd.org 2010/03/12 11:37:40
         [servconf.c]
         do not prepend AuthorizedKeysFile with getcwd(), unbreaks relative paths
         free() (not xfree()) the buffer returned by getcwd()

commit c4cb47bc53434612c41333695b15350724d60d6a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 05:52:26 2010 +1100

       - djm@cvs.openbsd.org 2010/03/12 01:06:25
         [servconf.c]
         unbreak AuthorizedKeys option with a $HOME-relative path; reported by
         vinschen AT redhat.com, ok dtucker@

commit e513a911952901dc8bcaa76fcfba7bc45f23daae
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 05:51:21 2010 +1100

       - djm@cvs.openbsd.org 2010/03/10 23:27:17
         [auth2-pubkey.c]
         correct certificate logging and make it more consistent between
         authorized_keys and TrustedCAKeys; ok markus@

commit 77497e131857443cce9ec93fdb382e324002691a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 05:50:51 2010 +1100

       - jmc@cvs.openbsd.org 2010/03/10 07:40:35
         [ssh-keygen.1]
         typos; from Ross Richardson
         closes prs 6334 and 6335

commit c59e2443d30cc7ff2eebd57399e88d55748ba422
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 05:50:31 2010 +1100

       - jmc@cvs.openbsd.org 2010/03/08 09:41:27
         [ssh-keygen.1]
         sort the list of constraints (to -O); ok djm

commit 1f574b254663776209951b0327090c19c41c0749
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 14 08:41:34 2010 +1100

     - (djm) [Makefile.in] Respecify -lssh after -lopenbsd-compat for
       ssh-pkcs11-helper to repair static builds (we do the same for
       ssh-keyscan). Reported by felix-mindrot AT fefe.de

commit 47f9a4106a417d57ff784b3a7fcffb803d6df56d
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 14 08:37:49 2010 +1100

     - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix
       compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot
       AT fefe.de

commit 4e0cea82dd75199c4a4f59165b1971d0d7c45919
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 11 22:35:19 2010 -0800

     - (tim) [contrib/cygwin/Makefile] Fix list of documentation files to install
       on a Cygwin installation. Patch from Corinna Vinschen.

commit ded8fa0bc96a8ffe4b51bf2276c468132f4b1416
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 11 22:32:02 2010 -0800

     - (tim) [Makefile.in] Add missing $(EXEEXT) to install targets.
       Patch from Corinna Vinschen.

commit 2bde3eec69dc6df434bac33d82aaf63697563416
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 11 22:18:13 2010 -0800

     - (tim) [openssh/Makefile.in] Now that scard is gone, no need to
       make $(datadir)

commit fa233ba73bdef475c2a509a914e352d544373d07
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Mar 10 16:12:02 2010 -0800

     - (tim) [contrib/suse/openssh.spec] crank version number here too.
       report by imorgan AT nas.nasa.gov

commit c9fe39b1a41030636af326ad327518a4a42575c1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 9 20:42:30 2010 +1100

     - (dtucker) [configure.ac] Use a proper AC_CHECK_DECL for BROKEN_GETADDRINFO
       so setting it in CFLAGS correctly skips IPv6 tests.

commit 081c976e1cac3a1588f484c89f2f48f7a554d1e5
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 8 11:30:00 2010 +1100

       - djm@cvs.openbsd.org 2010/03/08 00:28:55
         [ssh-keygen.1]
         document permit-agent-forwarding certificate constraint; patch from
         stevesk@

commit 958678726c398457036d63c715494e53bd84c5b9
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 8 09:50:17 2010 +1100

     - (djm) Release OpenSSH-5.4p1

commit 6bf31786cfa4518f2c81088ddaa7c34de0b532bf
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 8 09:41:02 2010 +1100

     - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       crank version numbers

commit 3e1ee491f3fa4fa7e44a998799e251a3b08e66d2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 8 09:24:11 2010 +1100

       - djm@cvs.openbsd.org 2010/03/07 22:16:01
         [ssh-keygen.c]
         make internal strptime string match strftime format;
         suggested by vinschen AT redhat.com and markus@

commit b3bc331e09c7b3617579a53980ca59feb99a8dd2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 8 09:03:33 2010 +1100

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2010/03/07 22:01:32
         [version.h]
         openssh-5.4

commit cd70e1b8137023539df57b175b733341d8f4d776
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 7 23:05:17 2010 +1100

       - dtucker@cvs.openbsd.org 2010/03/07 11:57:13
         [auth-rhosts.c monitor.c monitor_wrap.c session.c auth-options.c sshd.c]
         Hold authentication debug messages until after successful authentication.
         Fixes an info leak of environment variables specified in authorized_keys,
         reported by Jacob Appelbaum.  ok djm@

commit ac0c4c9c1d511839b2c86ebe5994298b524ceffd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 7 13:32:16 2010 +1100

     - (dtucker) [session.c] Also initialize creds to NULL for handing to
       setpcred.

commit c738e6c646aa0b588f50e953b4d3931c29e9ab28
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 7 13:21:12 2010 +1100

     - (dtucker) [session.c] Bug #1567: move setpcred call to before chroot and
       do not set real uid, since that's needed for the chroot, and will be set
       by permanently_set_uid.

commit b3d20a3ff0f822e2b39c3f6d31bfdea89f577465
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 7 11:56:59 2010 +1100

     - (dtucker) [auth.c] Bug #1710: call setauthdb on AIX before getpwuid so that
       it gets the passwd struct from the LAM that knows about the user which is
       not necessarily the default.  Patch from Alexandre Letourneau.

commit 5059d8d7e647ed6202e3d77f623774919b20eefc
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 5 21:31:11 2010 +1100

       - djm@cvs.openbsd.org 2010/03/05 10:28:21
         [ssh-add.1 ssh.1 ssh_config.5]
         mention loading of certificate files from [private]-cert.pub when
         they are present; feedback and ok jmc@

commit 922b541329285cede860607c877f72663f3d2a9f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 5 21:30:54 2010 +1100

       - jmc@cvs.openbsd.org 2010/03/05 08:31:20
         [ssh.1]
         document certificate authentication; help/ok djm

commit 98339054f949ad87f15b4d618a421765d4097cd9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 5 21:30:35 2010 +1100

       - jmc@cvs.openbsd.org 2010/03/05 06:50:35
         [ssh.1 sshd.8]
         tweak previous;

commit 9527f228ae88a1b328163717f5d68904d86c5d98
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 5 15:04:35 2010 +1100

     - (djm) [configure.ac] set -fno-strict-aliasing for gcc4; ok dtucker@

commit b068d0ad6dd1cf63ecd636bb2e24ce4c74406cb2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 5 14:03:03 2010 +1100

       - djm@cvs.openbsd.org 2010/03/05 02:58:11
         [auth.c]
         make the warning for a revoked key louder and more noticable

commit 48b6021721fb2083898be696a72b261a9136c293
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 5 11:40:19 2010 +1100

     - (djm) [ssh-rand-helper.c] declare optind, avoiding compilation failure
       on some platforms

commit 689b872842ba2e64d2bf52abe0c9b1b1f6a6663f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 5 10:42:24 2010 +1100

       - djm@cvs.openbsd.org 2010/03/04 23:27:25
         [auth-options.c ssh-keygen.c]
         "force-command" is not spelled "forced-command"; spotted by
         imorgan AT nas.nasa.gov

commit a7dab8bfe571e6ee0b53e0852336f8a758b95c61
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 5 10:42:05 2010 +1100

       - djm@cvs.openbsd.org 2010/03/04 23:19:29
         [ssh.1 sshd.8]
         move section on CA and revoked keys from ssh.1 to sshd.8's known hosts
         format section and rework it a bit; requested by jmc@

commit c6db99ec14f511d8ee5efb3c1fee42ab1ab61c8e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 5 10:41:45 2010 +1100

       - djm@cvs.openbsd.org 2010/03/04 23:17:25
         [sshd_config.5]
         missing word; spotted by jmc@

commit 8f6c337563f2217b6704f0f40bed68cee349f8c4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 5 10:41:26 2010 +1100

       - jmc@cvs.openbsd.org 2010/03/04 22:52:40
         [ssh-keygen.1]
         fix Bk/Ek;

commit 179eee081a560f3e10506ae3a2facdc1c766f0f6
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 4 12:48:05 2010 -0800

     - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older
       compilers. OK djm@

commit f2b70cad7585a67f7098119ccb6ae31573f2dc60
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 5 07:39:35 2010 +1100

       - djm@cvs.openbsd.org 2010/03/04 20:35:08
         [ssh-keygen.1 ssh-keygen.c]
         Add a -L flag to print the contents of a certificate; ok markus@

commit 72b33820af596f78a7ea7ee1200ae4c46b6167e5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 5 07:39:01 2010 +1100

       - jmc@cvs.openbsd.org 2010/03/04 12:51:25
         [ssh.1 sshd_config.5]
         tweak previous;

commit 700dcfa3e0a98be44f2e3675849055984f04a70a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 4 21:58:01 2010 +1100

       - djm@cvs.openbsd.org 2010/03/04 10:38:23
         [regress/cert-hostkey.sh regress/cert-userkey.sh]
         additional regression tests for revoked keys and TrustedUserCAKeys

commit 017d1e777ef197eab866b9d0046e000a46baf10b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 4 21:57:21 2010 +1100

       - djm@cvs.openbsd.org 2010/03/03 00:47:23
         [regress/cert-hostkey.sh regress/cert-userkey.sh]
         add an extra test to ensure that authentication with the wrong
         certificate fails as it should (and it does)

commit 1aed65eb27feec505997c98621bdf158f9ab8b99
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 4 21:53:35 2010 +1100

       - djm@cvs.openbsd.org 2010/03/04 10:36:03
         [auth-rh-rsa.c auth-rsa.c auth.c auth.h auth2-hostbased.c auth2-pubkey.c]
         [authfile.c authfile.h hostfile.c hostfile.h servconf.c servconf.h]
         [ssh-keygen.c ssh.1 sshconnect.c sshd_config.5]
         Add a TrustedUserCAKeys option to sshd_config to specify CA keys that
         are trusted to authenticate users (in addition than doing it per-user
         in authorized_keys).
    
         Add a RevokedKeys option to sshd_config and a @revoked marker to
         known_hosts to allow keys to me revoked and banned for user or host
         authentication.
    
         feedback and ok markus@

commit 2befbad9b3c8fc6e4e564c062870229bc722734c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 4 21:52:18 2010 +1100

       - djm@cvs.openbsd.org 2010/03/04 01:44:57
         [key.c]
         use buffer_get_string_ptr_ret() where we are checking the return
         value explicitly instead of the fatal()-causing buffer_get_string_ptr()

commit fe588e3c8434e6c9017b649dad71ef282a5dac01
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 4 21:52:00 2010 +1100

       - djm@cvs.openbsd.org 2010/03/03 22:50:40
         [PROTOCOL.certkeys]
         s/similar same/similar/; from imorgan AT nas.nasa.gov

commit cd38c9c5551094261775b99994fa0c12d333c94c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 4 21:51:37 2010 +1100

       - djm@cvs.openbsd.org 2010/03/03 22:49:50
         [sshd.8]
         the authorized_keys option for CA keys is "cert-authority", not
         "from=cert-authority". spotted by imorgan AT nas.nasa.gov

commit 41396573afc94d64973d9eb824ca510d39260b3e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 4 21:51:11 2010 +1100

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2010/03/03 01:44:36
         [auth-options.c key.c]
         reject strings with embedded ASCII nul chars in certificate key IDs,
         principal names and constraints

commit e1abf4d6bc4bea0bb76e6ff89ca6048122e90d81
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 4 21:41:29 2010 +1100

     - (djm) [regress/Makefile] Cleanup sshd_proxy_orig

commit d45f3b6cc75e5cf8b31f1ee2f51164c7410b2669
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 4 21:09:46 2010 +1100

     - (djm) [.cvsignore] Ignore ssh-pkcs11-helper

commit 661ffc1fd6d7c2d1f99ee0ab6918b10e53fe4f82
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 4 21:09:24 2010 +1100

     - (djm) [contrib/redhat/openssh.spec] Replace obsolete BuildPreReq
       on XFree86-devel with neutral /usr/include/X11/Xlib.h;
       imorgan AT nas.nasa.gov in bz#1731

commit 910f209c1d08b9b91f744c571fbf805206f04729
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 4 14:17:22 2010 +1100

     - (djm) [ssh-keygen.c] Use correct local variable, instead of
       maybe-undefined global "optarg"

commit 386dbc05e9c8c34dde5abe62a7804b4747b0de06
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 3 13:22:41 2010 +1100

     - (djm) [regress/cert-userkey.sh] s/echo -n/echon/ here too

commit 2ca342b84bca89e35931cbe34f19d7ab4d200d9b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 3 12:14:15 2010 +1100

       - djm@cvs.openbsd.org 2010/03/02 23:20:57
         [ssh-keygen.c]
         POSIX strptime is stricter than OpenBSD's so do a little dance to
         appease it.

commit fb84e5950e34a65e53ecb893af2fa2a3d6cce229
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 3 10:26:04 2010 +1100

       - djm@cvs.openbsd.org 2010/03/02 23:20:57
         [ssh-keygen.c]
         POSIX strptime is stricter than OpenBSD's so do a little dance to
         appease it.

commit 0bd41861bb695824f2070ad7dbe3ed08d6c27e0a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 3 10:25:41 2010 +1100

       - otto@cvs.openbsd.org 2010/03/01 11:07:06
         [ssh-add.c]
         zap what seems to be a left-over debug message; ok markus@

commit 15f5b560b1542fa087d7462be416616104ab0be8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 3 10:25:21 2010 +1100

       - jmc@cvs.openbsd.org 2010/02/26 22:09:28
         [ssh-keygen.1 ssh.1 sshd.8]
         tweak previous;

commit 25b97dd454600dde697634c1c871a97f64045d5f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 3 10:24:00 2010 +1100

     - (djm) [PROTOCOL.certkeys] Add RCS Ident

commit c5b0cb3b7d4f784ef95461d5848219d991264027
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Mar 1 15:57:42 2010 -0800

     - (tim) [config.guess config.sub] Bug 1722: Update to latest versions from
       http://git.savannah.gnu.org/gitweb/ (2009-12-30 and 2010-01-22
       respectively).

commit 9af0cb9accbf42aca8f87d3f3bfffcac20c2f5b4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 1 15:52:49 2010 +1100

     - (dtucker) [openbsd-compat/port-linux.c] Make failure to write to the OOM
       adjust log at verbose only, since according to cjwatson in bug #1470
       some virtualization platforms don't allow writes.

commit c614c78c53a38d2a603fb1b01fb419b965b24e50
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 1 12:49:05 2010 +1100

     - (dtucker) [regress/{cert-hostkey,cfgmatch,cipher-speed}.sh} Replace
       "echo -n" with "echon" for portability.

commit bff24b8ad29f4b5427ffbe017acafdb3efc1b951
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Feb 28 14:51:56 2010 -0800

     - (tim) [ssh-pkcs11-helper.c] Move declarations before calling functions
       to make older compilers (gcc 2.95) happy.

commit acc9b29486dfd649dfda474e5c1a03b317449f1c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 1 04:36:54 2010 +1100

     - (djm) [auth.c] On Cygwin, refuse usernames that have differences in
       case from that matched in the system password database. On this
       platform, passwords are stored case-insensitively, but sshd requires
       exact case matching for Match blocks in sshd_config(5). Based on
       a patch from vinschen AT redhat.com.

commit d05951fceee3fe19fc0bea29006a6409419b609f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 28 03:29:33 2010 +1100

     - (djm) [openbsd-compat/bsd-cygwin_util.c] Reduce the set of environment
       variables copied into sshd child processes. From vinschen AT redhat.com

commit 09a24db2d7e89c2fe72c1754181b6cc6e62949d7
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 28 03:28:05 2010 +1100

    - (djm) [ssh-pkcs11-helper.c ] Ensure RNG is initialised and seeded

commit 58ac6de9648ea1e4d99061013965e0581abff101
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 27 07:57:12 2010 +1100

       - djm@cvs.openbsd.org 2010/02/26 20:33:21
         [Makefile regress/cert-hostkey.sh regress/cert-userkey.sh]
         regression tests for certified keys

commit 0a80ca190a39943029719facf7edb990def7ae62
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 27 07:55:05 2010 +1100

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2010/02/26 20:29:54
         [PROTOCOL PROTOCOL.agent PROTOCOL.certkeys addrmatch.c auth-options.c]
         [auth-options.h auth.h auth2-pubkey.c authfd.c dns.c dns.h hostfile.c]
         [hostfile.h kex.h kexdhs.c kexgexs.c key.c key.h match.h monitor.c]
         [myproposal.h servconf.c servconf.h ssh-add.c ssh-agent.c ssh-dss.c]
         [ssh-keygen.1 ssh-keygen.c ssh-rsa.c ssh.1 ssh.c ssh2.h sshconnect.c]
         [sshconnect2.c sshd.8 sshd.c sshd_config.5]
         Add support for certificate key types for users and hosts.
    
         OpenSSH certificate key types are not X.509 certificates, but a much
         simpler format that encodes a public key, identity information and
         some validity constraints and signs it with a CA key. CA keys are
         regular SSH keys. This certificate style avoids the attack surface
         of X.509 certificates and is very easy to deploy.
    
         Certified host keys allow automatic acceptance of new host keys
         when a CA certificate is marked as sh/known_hosts.
         see VERIFYING HOST KEYS in ssh(1) for details.
    
         Certified user keys allow authentication of users when the signing
         CA key is marked as trusted in authorized_keys. See "AUTHORIZED_KEYS
         FILE FORMAT" in sshd(8) for details.
    
         Certificates are minted using ssh-keygen(1), documentation is in
         the "CERTIFICATES" section of that manpage.
    
         Documentation on the format of certificates is in the file
         PROTOCOL.certkeys
    
         feedback and ok markus@

commit d27d85d5320bb946d4bb734dcf45a8d20bad6020
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 24 18:21:45 2010 +1100

    contrib/caldera/openssh.spec
    contrib/redhat/openssh.spec
    contrib/suse/openssh.spec

commit 43001b3b3b51ab55755a0c75c4f49b2d752e1635
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 24 18:18:51 2010 +1100

     - (djm) [Makefile.in ssh-pkcs11-helper.8] Add manpage for PKCS#11 helper

commit 8eff8e8f59de5807e1db73bdfd86a0780595f01c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 24 17:33:30 2010 +1100

       - dtucker@cvs.openbsd.org 2009/11/09 04:20:04
         [regress/Makefile keygen-convert.sh]
         add regression test for ssh-keygen pubkey conversions

commit cfa42d2fd2077cce168b81c77f63776bd87a68b3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 24 17:31:20 2010 +1100

       - markus@cvs.openbsd.org 2010/02/08 10:52:47
         [regress/agent-pkcs11.sh]
         test for PKCS#11 support (currently disabled)

commit c1739211a6ce790e72262db90ba4b1d0ce79d1f4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 24 17:29:34 2010 +1100

       - djm@cvs.openbsd.org 2010/02/24 06:21:56
         [regress/test-exec.sh]
         wait for sshd to fully stop in cleanup() function; avoids races in tests
         that do multiple start_sshd/cleanup cycles; "I hate pidfiles" deraadt@

commit 8f9492c90d02f97cf7248147961b3f2a9de075d8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 24 17:28:45 2010 +1100

       - djm@cvs.openbsd.org 2010/02/09 06:29:02
         [regress/Makefile]
         turn on all the malloc(3) checking options when running regression
         tests. this has caught a few bugs for me in the past; ok dtucker@

commit bb4ae5583bffe27d9485198e199bea9767701bb1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 24 17:26:38 2010 +1100

       - djm@cvs.openbsd.org 2010/02/09 04:57:36
         [regress/addrmatch.sh]
         clean up droppings

commit 0dff9c7e6d1fd0025ad7b137d2201f9f8bdaadc5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 24 17:25:58 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/11 02:53:44
         [regress/forwarding.sh]
         regress test for stdio forwarding

commit b6bd3c2ca8a52a6ff777c8d7a69a8c2e7e51a1f8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 24 17:24:56 2010 +1100

       - dtucker@cvs.openbsd.org 2009/11/09 04:20:04
         [regress/Makefile]
         add regression test for ssh-keygen pubkey conversions

commit a80f1404bb8f9164f65daacd246231e7a476d7b9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 24 17:17:58 2010 +1100

       - djm@cvs.openbsd.org 2010/02/11 20:37:47
         [pathnames.h]
         correct comment

commit 05abd2c96876b959f4a2f71671652064fcedda0d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 24 17:16:08 2010 +1100

     - (djm) [pkcs11.h ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c]
       [ssh-pkcs11.h] Add $OpenBSD$ RCS idents so we can sync portable

commit b3c9f78711bde96415d22046af2c0f8c071a7e6f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 12 10:11:34 2010 +1100

    - (djm) [configure.ac] Enable PKCS#11 support only when we find a working
      dlopen()

commit dfa4156dbd4aa45464b2ea6b867bcaa483bed134
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 12 10:06:28 2010 +1100

     - (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c]
       Use ssh_get_progname to fill __progname

commit 8ad0fbd98e5ffd98c25f88881981336508ae90d7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 12 09:49:06 2010 +1100

     - (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c]
       Make it compile on OSX

commit d8f60022727f1d57efe7261b856d5e84a4b28cbe
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 12 09:34:22 2010 +1100

     - (djm) [INSTALL Makefile.in README.smartcard configure.ac scard-opensc.c]
       [scard.c scard.h pkcs11.h scard/Makefile.in scard/Ssh.bin.uu scard/Ssh.java]
       Remove obsolete smartcard support

commit d400da5ba8d7e5822647c472c7dfbfecb55c2152
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 12 09:26:23 2010 +1100

       - jmc@cvs.openbsd.org 2010/02/11 13:23:29
         [ssh.1]
         libarary -> library;

commit a76184445530cb13ded5827546756471d7d423e2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 12 09:26:02 2010 +1100

       - markus@cvs.openbsd.org 2010/02/10 23:20:38
         [ssh-add.1 ssh-keygen.1 ssh.1 ssh_config.5]
         pkcs#11 is no longer optional; improve wording; ok jmc@

commit 47cf16b8df67ce02866eefbe855174fa7dfbd359
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 12 09:25:29 2010 +1100

       - djm@cvs.openbsd.org 2010/02/09 06:18:46
         [auth.c]
         unbreak ChrootDirectory+internal-sftp by skipping check for executable
         shell when chrooting; reported by danh AT wzrd.com; ok dtucker@

commit 8922106fe9df50810e4149a05f7e3f9585ec08cc
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 12 09:23:40 2010 +1100

       - djm@cvs.openbsd.org 2010/02/09 03:56:28
         [buffer.c buffer.h]
         constify the arguments to buffer_len, buffer_ptr and buffer_dump

commit 86cbb44d47c49b108b94854b02dd5c3eae19123d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 12 09:22:57 2010 +1100

       - djm@cvs.openbsd.org 2010/02/09 00:50:59
         [ssh-keygen.c]
         fix -Wall

commit a183c6edee2f5238e28607955e8ac95cef7f0d8c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 12 09:22:31 2010 +1100

       - djm@cvs.openbsd.org 2010/02/09 00:50:36
         [ssh-agent.c]
         fallout from PKCS#11: unbreak -D

commit 048dc93617b7d005d8f7d42da1d52d8982408bdd
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 12 09:22:04 2010 +1100

       - jmc@cvs.openbsd.org 2010/02/08 22:03:05
         [ssh-add.1 ssh-keygen.1 ssh.1 ssh.c]
         tweak previous; ok markus

commit 7ea845e48df6d34a333ebbe79380cba0938d02a5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 12 09:21:02 2010 +1100

       - markus@cvs.openbsd.org 2010/02/08 10:50:20
         [pathnames.h readconf.c readconf.h scp.1 sftp.1 ssh-add.1 ssh-add.c]
         [ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh.1 ssh.c ssh_config.5]
         replace our obsolete smartcard code with PKCS#11.
            ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs-11v2-20.pdf
         ssh(1) and ssh-keygen(1) use dlopen(3) directly to talk to a PKCS#11
         provider (shared library) while ssh-agent(1) delegates PKCS#11 to
         a forked a ssh-pkcs11-helper process.
         PKCS#11 is currently a compile time option.
         feedback and ok djm@; inspired by patches from Alon Bar-Lev
    `

commit 17751bcab25681d341442fdc2386a30a6bea345e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 12 07:35:08 2010 +1100

       - djm@cvs.openbsd.org 2010/02/02 22:49:34
         [bufaux.c]
         make buffer_get_string_ret() really non-fatal in all cases (it was
         using buffer_get_int(), which could fatal() on buffer empty);
         ok markus dtucker

commit 1d2bfc41180087391303145f1bec9f4f4f7cd8fb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 10 10:19:29 2010 +1100

     - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for
       getseuserbyname; patch from calebcase AT gmail.com via
       cjwatson AT debian.org

commit b401f922b20347b60ef55ae032611d09734016c8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 10 10:17:49 2010 +1100

    This should have gone in with the multiplexing merge, but I dropped it
    at the time.

commit d636943d088349d13eae228871132849b8d5174c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 2 17:02:07 2010 +1100

       - djm@cvs.openbsd.org 2010/01/30 21:12:08
         [channels.c]
         fake local addr:port when stdio fowarding as some servers (Tectia at
         least) validate that they are well-formed;
         reported by imorgan AT nas.nasa.gov
         ok dtucker

commit 74d9825c0fb714398667200c6ca5ef8d2431ed8b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 2 17:01:46 2010 +1100

       - djm@cvs.openbsd.org 2010/01/30 21:08:33
         [sshd.8]
         debug output goes to stderr, not "the system log"; ok markus dtucker

commit c3ca35f42421d6cdc66411f29c0220068475efa7
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 30 17:42:01 2010 +1100

       - djm@cvs.openbsd.org 2010/01/30 02:54:53
         [mux.c]
         don't mark channel as read failed if it is already closing; suppresses
         harmless error messages when connecting to SSH.COM Tectia server
         report by imorgan AT nas.nasa.gov

commit 0dac03febdb52ccf0dfe19dcb1d7e895264b218a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 30 17:36:33 2010 +1100

       - djm@cvs.openbsd.org 2010/01/29 20:16:17
         [mux.c]
         kill correct channel (was killing already-dead mux channel, not
         its session channel)

commit 133d9d313e1058ed5d028abb450de253c00a4c5d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 30 17:30:04 2010 +1100

       - djm@cvs.openbsd.org 2010/01/29 00:20:41
         [sshd.c]
         set FD_CLOEXEC on sock_in/sock_out; bz#1706 from jchadima AT redhat.com
         ok dtucker@

commit 36f57ebf3b5ecf697c5ae868dbc0992792890e06
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 30 17:28:34 2010 +1100

       - djm@cvs.openbsd.org 2010/01/28 00:21:18
         [clientloop.c]
         downgrade an error() to a debug() - this particular case can be hit in
         normal operation for certain sequences of mux slave vs session closure
         and is harmless

commit 19d32cb9348baec8e86bb4b19de513ff8d7fa3ce
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 29 10:54:11 2010 +1100

     - (dtucker) [openbsd-compat/openssl-compat.c] Bug #1707: Call OPENSSL_config()
       after registering the hardware engines, which causes the openssl.cnf file to
       be processed.  See OpenSSL's man page for OPENSSL_config(3) for details.
       Patch from Solomon Peachy, ok djm@.

commit a1162985a51321158a625a214424a7ec51030a7d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 28 06:27:54 2010 +1100

       - djm@cvs.openbsd.org 2010/01/27 19:21:39
         [sftp.c]
         add missing "p" flag to getopt optstring;
         bz#1704 from imorgan AT nas.nasa.gov

commit a21cdfac2fd89360b5c60152bda60b4150ad35fc
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 28 06:26:59 2010 +1100

       - djm@cvs.openbsd.org 2010/01/27 13:26:17
         [mux.c]
         fix bug introduced in mux rewrite:
    
         In a mux master, when a socket to a mux slave closes before its server
         session (as may occur when the slave has been signalled), gracefully
         close the server session rather than deleting its channel immediately.
         A server may have more messages on that channel to send (e.g. an exit
         message) that will fatal() the client if they are sent to a channel that
         has been prematurely deleted.
    
         spotted by imorgan AT nas.nasa.gov

commit 45a81a0e18fe988f20794622390146c7e3975d6f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 28 06:26:20 2010 +1100

       - djm@cvs.openbsd.org 2010/01/26 02:15:20
         [mux.c]
         -Wuninitialized and remove a // comment; from portable
         (Id sync only)

commit e1537f951fa87e4d070adda82b474b25cf4902ec
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 26 13:26:22 2010 +1100

       - djm@cvs.openbsd.org 2010/01/26 01:28:35
         [channels.c channels.h clientloop.c clientloop.h mux.c nchan.c ssh.c]
         rewrite ssh(1) multiplexing code to a more sensible protocol.
    
         The new multiplexing code uses channels for the listener and
         accepted control sockets to make the mux master non-blocking, so
         no stalls when processing messages from a slave.
    
         avoid use of fatal() in mux master protocol parsing so an errant slave
         process cannot take down a running master.
    
         implement requesting of port-forwards over multiplexed sessions. Any
         port forwards requested by the slave are added to those the master has
         established.
    
         add support for stdio forwarding ("ssh -W host:port ...") in mux slaves.
    
         document master/slave mux protocol so that other tools can use it to
         control a running ssh(1). Note: there are no guarantees that this
         protocol won't be incompatibly changed (though it is versioned).
    
         feedback Salvador Fandino, dtucker@
         channel changes ok markus@

commit f589fd1ea8c352e6bf819733ecd505119a694c51
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 26 12:53:06 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/18 01:50:27
         [roaming_client.c]
         s/long long unsigned/unsigned long long/, from tim via portable
         (Id sync only, change already in portable)

commit 2e68d793d6967e01faa9ead98b0e527bd19a8d16
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 26 12:51:13 2010 +1100

       - tedu@cvs.openbsd.org 2010/01/17 21:49:09
         [ssh-agent.1]
         Correct and clarify ssh-add's password asking behavior.
         Improved text dtucker and ok jmc

commit 6761c7417d362fb8c0d71ddc60c3914f97e88c28
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Jan 22 10:25:15 2010 -0800

     - (tim) [configure.ac] Due to constraints in Windows Sockets in terms of
       socket inheritance, reduce the default SO_RCVBUF/SO_SNDBUF buffer size
       in Cygwin to 65535. Patch from Corinna Vinschen.

commit 7bb7471b80af905452cd7e3a5b3ad1c5cbed9595
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jan 17 22:49:57 2010 -0800

    Reword comment in last commit for additional clearity.

commit 641ebf1f86b4f254cab71f9496e8915940248004
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jan 17 17:05:39 2010 -0800

     - (tim) [configure.ac] Use the C99-conforming functions snprintf() and
       vsnprintf() named _xsnprintf() and _xvsnprintf() on SVR5 systems.

commit 7ab7b9346d658f86cbd08bd0e7f5f41dbf6ee880
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jan 17 12:48:22 2010 -0800

     - (tim) [configure.ac] OpenServer 5 needs BROKEN_GETADDRINFO too.

commit 33e48ac7b234bd52426184a945e5d1a2c99d99ba
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jan 17 07:12:40 2010 -0800

    Oops, forgot to document second change to roaming_client.c
     s/long long unsigned/unsigned long long/ to keep USL compilers happy.

commit f37756759fef9ad9a65080424f50cbcfdbc6e512
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Jan 16 16:48:39 2010 -0800

     - (tim) [roaming_client.c] Use of <sys/queue.h> is not really portable so
       we use "openbsd-compat/sys-queue.h"

commit 4a7db1ca2fbd794ffa41bad2bb8e0aec0f1595f0
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Jan 16 12:23:25 2010 -0800

     - (tim) [configure.ac] Define BROKEN_GETADDRINFO on SVR5 systems. The native
       getaddrinfo() is too old and limited for addr_pton() in addrmatch.c.

commit 999aaf4182fe7f0b21600299826139520b1b8212
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Jan 16 11:37:53 2010 -0800

     - (tim) [regress/portnum.sh] Shell portability fix.

commit 4e218554222592a99991fe6320eae6277f3109a6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 16 23:58:37 2010 +1100

     - (dtucker) [openbsd-compat/openbsd-compat.h] Typo.

commit 612e400c68e644054e476082cb757b0a157a564b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 16 13:53:52 2010 +1100

     - (dtucker) [openbsd-compat/pwcache.c] Shrink ifdef area to prevent unused
       variable warnings.

commit dab129bef57139232133a870430a9284858909bf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 16 13:43:50 2010 +1100

       - markus@cvs.openbsd.org 2010/01/15 09:24:23
         [sftp-common.c]
         unused

commit 69371b511b998f2637fdf4bf708e15462162bc0d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 16 13:30:30 2010 +1100

     - (dtucker) [openbsd-compat/openbsd-compat.h] Fix prototypes, spotted by
       Tim.

commit 2563e3f2729b90b62cc0a53137a516d2f009dc53
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 16 11:53:07 2010 +1100

     - (dtucker) [openbsd-compat/openbsd-compat.h] Prototypes for user_from_uid
       and group_from_gid.

commit ca94485a484a2f33a50bc293a5bf6e8c26b6d2b5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 16 11:48:27 2010 +1100

     - (dtucker) [openbsd-compat/pwcache.c] Pull in includes.h and thus defines.h
       so we correctly detect whether or not we have a native user_from_uid.

commit 7fa3a856ea36d63d7e42243c4428013677255b93
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 15 13:12:10 2010 +1100

    typo

commit 909a390bb812b49f283a4b02e0cc8d582f020fb2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 15 12:38:30 2010 +1100

     - (dtucker) [configure.ac openbsd-compat/{Makefile.in,pwcache.c} Portability
       for pwcache.  Also, added caching of negative hits.

commit 9d1fd5bc1017c09bc9ff8b28511b0851fd3472a4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 15 12:14:45 2010 +1100

     - (dtucker) [openbsd-compat.c/pwcache.c] Pull in pwcache.c from OpenBSD (no
       changes yet but there will be some to come).

commit b8b17e984acab330b13c66460e6570e72c55ded9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 15 11:46:03 2010 +1100

       - guenther@cvs.openbsd.org 2010/01/15 00:05:22
         [sftp.c]
         Reset SIGTERM to SIG_DFL before executing ssh, so that even if sftp
         inherited SIGTERM as ignored it will still be able to kill the ssh it
         starts.
         ok dtucker@

commit a788de206647e1ffa51b0a95bac1951a02880f76
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 15 11:45:33 2010 +1100

      - dtucker@cvs.openbsd.org 2010/01/14 23:41:49
         [sftp-common.c]
         use user_from{uid,gid} to lookup up ids since it keeps a small cache.
         ok djm

commit 94881d8dbb228e170d476d35fb523425c0c4c001
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 15 11:44:46 2010 +1100

       - djm@cvs.openbsd.org 2010/01/13 23:47:26
         [auth.c]
         when using ChrootDirectory, make sure we test for the existence of the
         user's shell inside the chroot; bz #1679, patch from alex AT rtfs.hu;
         ok dtucker

commit 75fe626489bbafd966332db1b4801fee0c179ffd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 15 11:42:51 2010 +1100

       - jmc@cvs.openbsd.org 2010/01/13 12:48:34
         [sftp.1 sftp.c]
         sftp.1: put ls -h in the right place
         sftp.c: as above, plus add -p to get/put, and shorten their arg names
         to keep the help usage nicely aligned
         ok djm

commit 6abc9f68aa19288a4673f5e3030706e31d606407
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 14 12:44:16 2010 +1100

     - (djm) [platform.h] Add missing prototype for
       platform_krb5_get_principal_name

commit d4a7fcbc462b2af134f6e59a6068fbe5b35fba80
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jan 13 15:44:34 2010 -0800

     - (tim) [defines.h] openbsd-compat/readpassphrase.c now needs _NSIG.
       feedback and ok dtucker@

commit 096630d06c75f762efeb778f8b43def6f85976c0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 13 23:00:38 2010 +1100

     - (dtucker) [sftp-common.c] Wrap include of util.h in an ifdef.

commit 9c3ba07f60434e68657630fec0d7ab0dd7f984a3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 13 22:45:03 2010 +1100

       - djm@cvs.openbsd.org 2010/01/13 04:10:50
         [sftp.c]
         don't append a space after inserting a completion of a directory (i.e.
         a path ending in '/') for a slightly better user experience; ok dtucker@

commit 88b6fb2b55a5c8bb9aeadec185991c5bfae780c0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 13 22:44:29 2010 +1100

       - djm@cvs.openbsd.org 2010/01/13 03:48:13
         [servconf.c servconf.h sshd.c]
         avoid run-time failures when specifying hostkeys via a relative
         path by prepending the cwd in these cases; bz#1290; ok dtucker@

commit 2901e2daebe3a0890209f31d05d5bb9338cbed5b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 13 22:44:06 2010 +1100

       - djm@cvs.openbsd.org 2010/01/13 01:40:16
         [sftp.c sftp-server.c sftp.1 sftp-common.c sftp-common.h]
         support '-h' (human-readable units) for sftp's ls command, just like
         ls(1); ok dtucker@

commit daaa4500519627abee7c6d1969bc33df6572c1e8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 13 22:43:33 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/13 01:20:20
         [canohost.c ssh-keysign.c sshconnect2.c]
         Make HostBased authentication work with a ProxyCommand.  bz #1569, patch
         from imorgan at nas nasa gov, ok djm@

commit 561724f38dd8b4e56ec918a70f9314f41c34b46a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 13 22:43:05 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/13 01:10:56
         [key.c]
         Ignore and log any Protocol 1 keys where the claimed size is not equal to
         the actual size.  Noted by Derek Martin, ok djm@

commit e2b36741725c2214f72a3ef07bc0788191ac7ea9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 13 22:42:34 2010 +1100

     - (dtucker) OpenBSD CVS Sync
       - dtucker@cvs.openbsd.org 2010/01/13 00:19:04
         [sshconnect.c auth.c]
         Fix a couple of typos/mispellings in comments

commit d59487a33bfaadc3ced41a1c604ec603d716df42
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 13 21:32:44 2010 +1100

     - (dtucker) [openbsd-compat/readpassphrase.c] Update to OpenBSD's r1.22.
       Fixes bz #1590, where sometimes you could not interrupt a connection while
       ssh was prompting for a passphrase or password.

commit 1035cb4729857ec00d1a976476b840bfe0351312
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 13 18:32:59 2010 +1100

     - (dtucker) [openbsd-compat/readpassphrase.c] Update to OpenBSD's r1.21.

commit ab3c2cab18a6c5ae9dd93cacb1a179e48d245228
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 13 18:27:32 2010 +1100

     - (dtucker) [openbsd-compat/readpassphrase.c] Resync against OpenBSD's r1.18:    missing restore of SIGTTOU and some whitespace.

commit a8f20cff82ec514df8aa60bc5248dcad6f90066c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 13 10:54:46 2010 +1100

     - (dtucker) [monitor_fdpass.c] Wrap poll.h include in ifdefs.

commit 09aa4c000e16cdb23628d563920f48294997945e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 12 19:51:48 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/12 08:33:17
         [session.c]
         Add explicit stat so we reliably detect nologin with bad perms.
         ok djm markus

commit ebc71d908cc10cafea05e1aaaa7886d3f8b0bf80
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 12 19:45:59 2010 +1100

       - djm@cvs.openbsd.org 2010/01/12 01:36:08
         [buffer.h bufaux.c]
         add a buffer_get_string_ptr_ret() that does the same as
         buffer_get_string_ptr() but does not fatal() on error; ok dtucker@

commit 1b0c2455daf26b9eca30210f7628b7e4667501ad
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 12 19:45:26 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/12 01:31:05
         [session.c]
         Do not allow logins if /etc/nologin exists but is not readable by the user
         logging in.  Noted by Jan.Pechanec at Sun, ok djm@ deraadt@

commit c6cc90b4653ad605072f11986cdbfc8a9d968185
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 12 19:43:46 2010 +1100

       - djm@cvs.openbsd.org 2010/01/12 00:59:29
         [roaming_common.c]
         delete with extreme prejudice a debug() that fired with every keypress;
         ok dtucker deraadt

commit e371a13238c6e5ebc0949a987830d21162f4bbac
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 12 19:43:12 2010 +1100

       - djm@cvs.openbsd.org 2010/01/12 00:58:25
         [monitor_fdpass.c]
         avoid spinning when fd passing on nonblocking sockets by calling poll()
         in the EINTR/EAGAIN path, much like we do in atomicio; ok dtucker@

commit 69c01b1c4a9068478174b9cc39eb9957e78416a6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 12 19:42:29 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/12 00:16:47
         [authfile.c]
         Fix bug introduced in r1.78 (incorrect brace location) that broke key auth.
         Patch from joachim joachimschipper nl.

commit d04758dc4c001104933ce3e2088ac46d461ec1f1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 12 19:41:57 2010 +1100

       - djm@cvs.openbsd.org 2010/01/11 10:51:07
         [ssh-keygen.c]
         when converting keys, truncate key comments at 72 chars as per RFC4716;
         bz#1630 reported by tj AT castaglia.org; ok markus@

commit d4c86b13254d7c84b27b7cb8d32dcc7036ca3788
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 12 19:41:22 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/11 04:46:45
         [authfile.c sshconnect2.c]
         Do not prompt for a passphrase if we fail to open a keyfile, and log the
         reason the open failed to debug.
         bz #1693, found by tj AT castaglia org, ok djm@

commit 7ad8dd21da5e2a2687fdff14142b70f1587f96ce
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 12 19:40:27 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/11 01:39:46
         [ssh_config channels.c ssh.1 channels.h ssh.c]
         Add a 'netcat mode' (ssh -W).  This connects stdio on the client to a
         single port forward on the server.  This allows, for example, using ssh as
         a ProxyCommand to route connections via intermediate servers.
         bz #1618, man page help from jmc@, ok markus@

commit 43551527dc1cc9f18561c4816960440de2ce289b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 10 19:27:17 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/10 07:15:56
         [auth.c]
         Output a debug if we can't open an existing keyfile.  bz#1694, ok djm@

commit d3300454d84715a921978163895e961d24b6deaa
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 10 19:26:43 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/10 03:51:17
         [servconf.c]
         Add ChrootDirectory to sshd.c test-mode output

commit 7bd98e7f74ebd8bd32157b607acedcb68201b7de
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 10 10:31:12 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/09 23:04:13
         [channels.c ssh.1 servconf.c sshd_config.5 sshd.c channels.h servconf.h
         ssh-keyscan.1 ssh-keyscan.c readconf.c sshconnect.c misc.c ssh.c
         readconf.h scp.1 sftp.1 ssh_config.5 misc.h]
         Remove RoutingDomain from ssh since it's now not needed.  It can be
         replaced with "route exec" or "nc -V" as a proxycommand.  "route exec"
         also ensures that trafic such as DNS lookups stays withing the specified
         routingdomain.  For example (from reyk):
         # route -T 2 exec /usr/sbin/sshd
         or inherited from the parent process
         $ route -T 2 exec sh
         $ ssh 10.1.2.3
         ok deraadt@ markus@ stevesk@ reyk@

commit 8c65f646a93ed2f61da65ba0ecf65a99bd585b79
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 10 10:26:57 2010 +1100

     - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c]
       Remove hacks add for RoutingDomain in preparation for its removal.

commit 269275c90cd2ffda85f32114bfaeff978298e346
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 9 22:33:37 2010 +1100

     - (dtucker) [defines.h] Remove now-undeeded PRIu64 define.

commit 2c671bf6a8b93489624fafa79a40cb69d7a53ba3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 9 22:28:43 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/09 11:17:56
         [sshd.c]
         Afer sshd receives a SIGHUP, ignore subsequent HUPs while sshd re-execs
         itself.  Prevents two HUPs in quick succession from resulting in sshd
         dying.  bz#1692, patch from Colin Watson via Ubuntu.

commit 70cc092817a61af78c751b8f7a8ac5dcabfeae00
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 9 22:28:03 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/09 11:13:02
         [sftp.c]
         Prevent sftp from derefing a null pointer when given a "-" without a
         command.  Also, allow whitespace to follow a "-".  bz#1691, path from
         Colin Watson via Debian.  ok djm@ deraadt@

commit 4b28251df4f1b653e7b3e015138c3da53a05bd58
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 9 22:27:06 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/09 05:17:00
         [roaming_client.c]
         Remove a PRIu64 format string that snuck in with roaming.  ok djm@

commit 37c1b3d6fc9043123f33e64051ea56656a5e7ef4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 9 22:26:23 2010 +1100

       - djm@cvs.openbsd.org 2010/01/09 05:04:24
         [mux.c sshpty.h clientloop.c sshtty.c]
         quell tc[gs]etattr warnings when forcing a tty (ssh -tt), since we
         usually don't actually have a tty to read/set; bz#1686 ok dtucker@

commit 838891fe85308399c4f350f8174013987b6a2f85
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 9 22:25:46 2010 +1100

       - jmc@cvs.openbsd.org 2010/01/09 03:36:00
         [sftp-server.8]
         bad place to forget a comma...

commit a2e10485c5ef4b650536e156cc86d4bbd9bf146d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 9 22:25:14 2010 +1100

       - djm@cvs.openbsd.org 2010/01/09 00:57:10
         [PROTOCOL]
         tweak language

commit db7bf82544800c21a471a89781466bbf4ac08731
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 9 22:24:33 2010 +1100

       - djm@cvs.openbsd.org 2010/01/09 00:20:26
         [sftp-server.c sftp-server.8]
         add a 'read-only' mode to sftp-server(8) that disables open in write mode
         and all other fs-modifying protocol methods. bz#430 ok dtucker@

commit 0b8a2262ac9ee2b2395cf85e3dfa065385c25b5a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 9 18:18:04 2010 +1100

     - (dtucker) [loginrec.c] Use the SUSv3 specified name for the user name
       when using utmpx.  Patch from Ed Schouten.

commit 11b5c07941f206d955184ff1e4c1ff6fba37d157
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 9 16:40:48 2010 +1100

     - (dtucker) [roaming_client.c] Wrap inttypes.h in an ifdef.

commit 709d0ce67201e980258c84928fda46edd1c8d38f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 9 09:25:54 2010 +1100

     - (dtucker) [defines.h] define PRIu64 for platforms that don't have it.

commit 9eba40cec9de097b41f3f1c84799476f14260920
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 9 09:02:07 2010 +1100

     - (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't
       have it.

commit 340d1688e658e85a3c45270bc3fca4e6d1aee9b1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jan 9 08:54:31 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/08 21:50:49
         [sftp.c]
         Fix two warnings: possibly used unitialized and use a nul byte instead of
         NULL pointer.  ok djm@

commit 1a8f535b970738f8de7599d5815d3be3beaa3b48
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 20:45:42 2010 +1100

     - (dtucker) [roaming_serv.c] Include includes.h for u_intXX_t types.

commit cb5a1b6f7028dc3e3bf9f5875aee4a071eefe359
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 20:09:01 2010 +1100

     - (dtucker] [misc.c] Shrink the area covered by USE_ROUTINGDOMAIN more
       to eliminate an unused variable warning.

commit e83c3ea4b8086c04c9ba0d012808d9c65c0bbe65
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 20:03:56 2010 +1100

     - (dtucker) [misc.c] Move the routingdomain ifdef to allow the socket to
       be created.

commit 843f0fa16d7e8aca36c1b14d933da2a1844d5a74
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 19:56:33 2010 +1100

     - (dtucker) [sftp.c] Expand ifdef for libedit to cover complete_is_remote
       too.

commit 1f5e3dc274fe4616435ff451b5216b5bde217c0d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 19:53:52 2010 +1100

     - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c] Make
       RoutingDomain an unsupported option on platforms that don't have it.

commit e67f7db968e376c9971dd3a4d4ab3fae4a06bf78
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 19:50:02 2010 +1100

     - (dtucker) [sftp.c] ifdef out the sftp completion bits for platforms that
       don't have libedit.

commit dce7a92c7a1dbdfc280d6274eb5dfa5fce062acf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 19:27:57 2010 +1100

     - (dtucker) [Makefile.in] .c files do not belong in the OBJ lines.

commit 8cbd403fde20dda880a7ff3262bf2c36f6582eac
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 19:13:25 2010 +1100

     - (dtucker) [Makefile.in added roaming_client.c roaming_serv.c] Import new
       files for roaming and add to Makefile.

commit aaf51d2d5b76c25cc549559a200a802e92b2d8aa
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 19:04:49 2010 +1100

       - djm@cvs.openbsd.org 2010/01/04 02:25:15
         [sftp-server.c]
         bz#1566 don't unnecessarily dup() in and out fds for sftp-server;
         ok markus@

commit 909d858d6b86c789003b809a636c2c228d3f30c5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 19:02:40 2010 +1100

       - djm@cvs.openbsd.org 2010/01/04 02:03:57
         [sftp.c]
         Implement tab-completion of commands, local and remote filenames for sftp.
         Hacked on and off for some time by myself, mouring, Carlos Silva (via 2009
         Google Summer of Code) and polished to a fine sheen by myself again.
         It should deal more-or-less correctly with the ikky corner-cases presented
         by quoted filenames, but the UI could still be slightly improved.
         In particular, it is quite slow for remote completion on large directories.
         bz#200; ok markus@

commit 0c348f5b9eb4ac9f763cb3f55a252d86e2cfc57b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 18:58:05 2010 +1100

       - dtucker@cvs.openbsd.org 2010/01/04 01:45:30
         [sshconnect2.c]
         Don't escape backslashes in the SSH2 banner.  bz#1533, patch from
         Michal Gorny via Gentoo.

commit 98e5d9a0d3beabc706982260fec70f823ff764b7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 18:57:39 2010 +1100

       - jmc@cvs.openbsd.org 2009/12/29 18:03:32
         [sshd_config.5 ssh_config.5]
         sort previous;

commit 535b5e172166c2515500bc20f3ea89216bd1f42b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 18:56:48 2010 +1100

       - stevesk@cvs.openbsd.org 2009/12/29 16:38:41
         [sshd_config.5 readconf.c ssh_config.5 scp.1 servconf.c sftp.1 ssh.1]
         Rename RDomain config option to RoutingDomain to be more clear and
         consistent with other options.
         NOTE: if you currently use RDomain in the ssh client or server config,
         or ssh/sshd -o, you must update to use RoutingDomain.
         ok markus@ djm@

commit 75456e8ab2df99061a6aa69bcc914d05c2f4f98c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 18:55:58 2010 +1100

       - stevesk@cvs.openbsd.org 2009/12/25 19:40:21
         [readconf.c servconf.c misc.h ssh-keyscan.c misc.c]
         validate routing domain is in range 0-RT_TABLEID_MAX.
         'Looks right' deraadt@

commit f2705c8b7d0b6a9cc33c244bdf041f2a1087e08a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 18:54:17 2010 +1100

       - djm@cvs.openbsd.org 2009/12/20 23:20:40
         [PROTOCOL]
         fix an incorrect magic number and typo in PROTOCOL; bz#1688
         report and fix from ueno AT unixuser.org

commit b8c884a0ba4050e4267be786414127c0f09d5544
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 18:53:43 2010 +1100

       - guenther@cvs.openbsd.org 2009/12/20 07:28:36
         [ssh.c sftp.c scp.c]
         When passing user-controlled options with arguments to other programs,
         pass the option and option argument as separate argv entries and
         not smashed into one (e.g., as -l foo and not -lfoo).  Also, always
         pass a "--" argument to stop option parsing, so that a positional
         argument that starts with a '-' isn't treated as an option.  This
         fixes some error cases as well as the handling of hostnames and
         filenames that start with a '-'.
         Based on a diff by halex@
         ok halex@ djm@ deraadt@

commit 57e0d01260d3c1c7bf9366eed58c54a96eedbc81
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 18:52:27 2010 +1100

       - markus@cvs.openbsd.org 2009/12/11 18:16:33
         [key.c]
         switch from 35 to the more common value of RSA_F4 == (2**16)+1 == 65537
         for the RSA public exponent; discussed with provos; ok djm@

commit b5082e90a13c9c9f96f1aed894f70f6f00737396
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 18:51:47 2010 +1100

       - dtucker@cvs.openbsd.org 2009/12/06 23:53:54
         [sftp.c]
         fix potential divide-by-zero in sftp's "df" output when talking to a server
         that reports zero files on the filesystem (Unix filesystems always have at
         least the root inode).  From Steve McClellan at radisys, ok djm@

commit 75694dbe77c56c127a2d2cfd443a0d591f441a55
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 18:51:14 2010 +1100

       - djm@cvs.openbsd.org 2009/12/06 23:53:45
         [roaming_common.c]
         use socklen_t for getsockopt optlen parameter; reported by
         Steve.McClellan AT radisys.com, ok dtucker@

commit 5246df47a4e01fb4c17c672fea31f041c88205e9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 18:50:46 2010 +1100

       - dtucker@cvs.openbsd.org 2009/12/06 23:41:15
         [sshconnect2.c]
         zap unused variable and strlen; from Steve McClellan, ok djm

commit c4dc4f5bac9e19a99a4d391e98d012c94c647ca4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 18:50:04 2010 +1100

       - halex@cvs.openbsd.org 2009/11/22 13:18:00
         [sftp.c]
         make passing of zero-length arguments to ssh safe by
         passing "-<switch>" "<value>" rather than "-<switch><value>"
         ok dtucker@, guenther@, djm@

commit 70d87693f4880c7acd6f50bf2aa8697b722024e7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 18:49:16 2010 +1100

       - djm@cvs.openbsd.org 2009/11/20 03:24:07
         [misc.c]
         correct off-by-one in percent_expand(): we would fatal() when trying
         to expand EXPAND_MAX_KEYS, allowing only EXPAND_MAX_KEYS-1 to actually
         work.  Note that nothing in OpenSSH actually uses close to this limit at
         present.  bz#1607 from Jan.Pechanec AT Sun.COM

commit ab79169e2971ca4c9f98e0a98ac9f0e797b5eb18
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 18:48:02 2010 +1100

       - dtucker@cvs.openbsd.org 2009/11/20 00:59:36
         [sshconnect2.c]
         Use the HostKeyAlias when prompting for passwords.  bz#1039, ok djm@

commit 210631922f86192e99aefe6cf985155d61f44965
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 17:10:36 2010 +1100

       - djm@cvs.openbsd.org 2009/11/20 00:54:01
         [sftp.c]
         bz#1588 change "Connecting to host..." message to "Connected to host."
         and delay it until after the sftp protocol connection has been established.
         Avoids confusing sequence of messages when the underlying ssh connection
         experiences problems. ok dtucker@

commit c3dc404113c4bb3d3a86bdee47f15e5c881d12a4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 17:09:50 2010 +1100

       - dtucker@cvs.openbsd.org 2009/11/20 00:15:41
         [session.c]
         Warn but do not fail if stat()ing the subsystem binary fails.  This helps
         with chrootdirectory+forcecommand=sftp-server and restricted shells.
         bz #1599, ok djm.

commit d6b06a9f39cde8708a7c6b276635cdea5dcd3820
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 17:09:11 2010 +1100

       - djm@cvs.openbsd.org 2009/11/19 23:39:50
         [session.c]
         bz#1606: error when an attempt is made to connect to a server
         with ForceCommand=internal-sftp with a shell session (i.e. not a
         subsystem session). Avoids stuck client when attempting to ssh to such a
         service. ok dtucker@

commit 2944082b3f84b5260a748a529f90cd18a6187610
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 17:08:35 2010 +1100

       - djm@cvs.openbsd.org 2009/11/17 05:31:44
         [clientloop.c]
         fix incorrect exit status when multiplexing and channel ID 0 is recycled
         bz#1570 reported by peter.oliver AT eon-is.co.uk; ok dtucker

commit 876045b0fb273ee11b02c535833b076c875253dc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 17:08:00 2010 +1100

       - markus@cvs.openbsd.org 2009/11/11 21:37:03
         [channels.c channels.h]
         fix race condition in x11/agent channel allocation: don't read after
         the end of the select read/write fdset and make sure a reused FD
         is not touched before the pre-handlers are called.
         with and ok djm@

commit 6e7fe1c01b8a69099ffc42e653cc478509e84781
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 17:07:22 2010 +1100

       - dtucker@cvs.openbsd.org 2009/11/10 04:30:45
         [sshconnect2.c channels.c sshconnect.c]
         Set close-on-exec on various descriptors so they don't get leaked to
         child processes.  bz #1643, patch from jchadima at redhat, ok deraadt.

commit f788a91624601857c586a4dd97c66083946e7781
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 17:06:47 2010 +1100

       - djm@cvs.openbsd.org 2009/11/10 02:58:56
         [sshd_config.5]
         clarify that StrictModes does not apply to ChrootDirectory. Permissions
         and ownership are always checked when chrooting. bz#1532

commit 78be8c54d65e151a3d8a5855ce5067c72f915799
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 17:05:59 2010 +1100

       - djm@cvs.openbsd.org 2009/11/10 02:56:22
         [ssh_config.5]
         explain the constraints on LocalCommand some more so people don't
         try to abuse it.

commit cc117f0deb26a3491aa90614974517ac2f18dc45
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 17:05:26 2010 +1100

       - jmc@cvs.openbsd.org 2009/10/28 21:45:08
         [sshd_config.5 sftp.1]
         tweak previous;

commit 34e314da1b832fee576e4ebd8b177154a45fec15
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 17:03:46 2010 +1100

       - reyk@cvs.openbsd.org 2009/10/28 16:38:18
         [ssh_config.5 sshd.c misc.h ssh-keyscan.1 readconf.h sshconnect.c
         channels.c channels.h servconf.h servconf.c ssh.1 ssh-keyscan.c scp.1
         sftp.1 sshd_config.5 readconf.c ssh.c misc.c]
         Allow to set the rdomain in ssh/sftp/scp/sshd and ssh-keyscan.
         ok markus@

commit f1de4e5228ad86b191c3297bf6c528753587be5e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 16:54:59 2010 +1100

       - andreas@cvs.openbsd.org 2009/10/24 11:23:42
         [ssh.c]
         Request roaming to be enabled if UseRoaming is true and the server
         supports it.
         ok markus@

commit e730118bf41c70bd519e595a7dda39df551852eb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 16:53:31 2010 +1100

       - andreas@cvs.openbsd.org 2009/10/24 11:22:37
         [roaming_common.c]
         Do the actual suspend/resume in the client. This won't be useful until
         the server side supports roaming.
         Most code from Martin Forssen, maf at appgate dot com. Some changes by
         me and markus@
         ok markus@

commit f9e6eb8f226675389c79fb9c44fcc29038ab9ff7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 16:52:32 2010 +1100

       - andreas@cvs.openbsd.org 2009/10/24 11:19:17
         [ssh2.h]
         Define the KEX messages used when resuming a suspended connection.
         ok markus@

commit e32cf43106ee53e180bc855cdb60b6d414547d84
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 16:51:40 2010 +1100

       - andreas@cvs.openbsd.org 2009/10/24 11:15:29
         [clientloop.c]
         client_loop() must detect if the session has been suspended and resumed,
         and take appropriate action in that case.
         From Martin Forssen, maf at appgate dot com
         ok markus@

commit 36331b5d6cf8f776a27fe6fc3ed19da4f4c2ad91
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 16:50:41 2010 +1100

       - andreas@cvs.openbsd.org 2009/10/24 11:13:54
         [sshconnect2.c kex.h kex.c]
         Let the client detect if the server supports roaming by looking
         for the resume@appgate.com kex algorithm.
         ok markus@

commit b7b17be4c0e235b670fb642a394abfe2e9b68cef
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 8 16:49:52 2010 +1100

       - andreas@cvs.openbsd.org 2009/10/24 11:11:58
         [roaming.h]
         Declarations needed for upcoming changes.
         ok markus@

commit 880ab0d84e1c7d7957ff38d6506ff92868407a77
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Dec 26 15:40:47 2009 -0800

     - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
       Gzip all man pages. Patch from Corinna Vinschen.

commit 1bf3503c9d5f0c79a108ea0060bcec3e0efe2b37
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 21 10:49:21 2009 +1100

     - (dtucker) [auth-krb5.c platform.{c,h} openbsd-compat/port-aix.{c,h}]
       Bug #1583: Use system's kerberos principal name on AIX if it's available.
       Based on a patch from and tested by Miguel Sanders.

commit c8802aac28470714ec204d00342f6ecbca45908f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 8 13:39:48 2009 +1100

     - (dtucker) Bug #1470: Disable OOM-killing of the listening sshd on Linux,
       based on a patch from Vaclav Ovsik and Colin Watson.  ok djm.

commit d35e0ef61658aa3116eebb1606fcfe6f849fdcca
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 7 11:32:36 2009 +1100

     - (dtucker) Bug #1677: add conditionals around the source for ssh-askpass.

commit 1533311f4ca27adf382a158e30fbb1d2c4882a62
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 7 11:15:43 2009 +1100

     - (dtucker) Bug #1160: use pkg-config for opensc config if it's available.
       Tested by Martin Paljak.

commit 53e9974007661fe4026a9512ae1a7e1ea43face8
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Nov 20 19:32:15 2009 -0800

     - (tim) [opensshd.init.in] If PidFile is set in sshd_config, use it.
       Bug 1628. OK dtucker@

commit 409661f0d99bf9bc82543eb7bab1f502c9170281
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 20 15:16:35 2009 +1100

     - (djm) [ssh-rand-helper.c] Print error and usage() when passed command-
       line arguments as none are supported. Exit when passed unrecognised
       commandline flags. bz#1568 from gson AT araneus.fi

commit 2191e04549839502631f3f97ededd301a1498cd0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 18 17:51:59 2009 +1100

     - (djm) [contrib/gnome-ssh-askpass2.c] Make askpass dialog desktop-modal.
       bz#1645, patch from jchadima AT redhat.com

commit 04ee0f8f12ff3a1227439c5f67623547d7a5bd11
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 18 17:48:30 2009 +1100

     - (djm) [channels.c misc.c misc.h sshd.c] add missing setsockopt() to
       set IPV6_V6ONLY for local forwarding with GatwayPorts=yes. Unify
       setting IPV6_V6ONLY behind a new function misc.c:sock_set_v6only()
       report and fix from jan.kratochvil AT redhat.com

commit df6578bb4df17210f792c3bc98a72bed473e7e11
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 7 16:03:14 2009 +1100

     - (dtucker) [authfile.c] Fall back to 3DES for the encryption of private
        keys when built with OpenSSL versions that don't do AES.

commit e89ed1cfcae65705b48d3741873d8ab1f76a6cf7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 5 20:43:16 2009 +1100

     - (dtucker) [authfile.c] Add OpenSSL compat header so this still builds with
       older versions of OpenSSL.

commit 4d6656b1030c2090f8769ce9cce0a9e5dd135945
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 24 15:04:12 2009 +1100

     - (dtucker) [session.c openbsd-compat/port-linux.{c,h}] Bug #1637: if selinux
       is enabled set the security context to "sftpd_t" before running the
       internal sftp server   Based on a patch from jchadima at redhat.

commit 6ac91a7c83a7343e9fdf24c2857b301b50e21a9c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 24 11:52:42 2009 +1100

     - (dtucker) [mdoc2man.awk] Teach it to understand the .Ux macro.

commit 199ee6ff0727cd339c246b6b859a0ded14b366a4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 24 11:50:17 2009 +1100

       - dtucker@cvs.openbsd.org 2009/10/24 00:48:34
         [ssh-keygen.1]
         ssh-keygen now uses AES-128 for private keys

commit 2f29a8caba867a2b0c32772de705657de726dcca
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 24 11:47:58 2009 +1100

       - djm@cvs.openbsd.org 2009/10/23 01:57:11
         [sshconnect2.c]
         disallow a hostile server from checking jpake auth by sending an
         out-of-sequence success message. (doesn't affect code enabled by default)

commit dfb9b716500f777563a8f6f36072210fea167530
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 24 11:46:43 2009 +1100

       - djm@cvs.openbsd.org 2009/10/22 22:26:13
         [authfile.c]
         switch from 3DES to AES-128 for encryption of passphrase-protected
         SSH protocol 2 private keys; ok several

commit 98c9aec30e75ba890ed36227793e1e5ea6a23d45
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 24 11:42:44 2009 +1100

       - sobrado@cvs.openbsd.org 2009/10/22 15:02:12
         [ssh-agent.1 ssh-add.1 ssh.1]
         write UNIX-domain in a more consistent way; while here, replace a
         few remaining ".Tn UNIX" macros with ".Ux" ones.
         pointed out by ratchov@, thanks!
         ok jmc@

commit ae69e1d010ddf367fdd8ecf7f006c54cfe3f9728
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 24 11:41:34 2009 +1100

       - sobrado@cvs.openbsd.org 2009/10/22 12:35:53
         [ssh.1 ssh-agent.1 ssh-add.1]
         use the UNIX-related macros (.At and .Ux) where appropriate.
         ok jmc@

commit 49b7e235455bf20227877624f8c60c34a6e78458
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 24 11:41:05 2009 +1100

       - sobrado@cvs.openbsd.org 2009/10/17 12:10:39
         [sftp-server.c]
         sort flags.

commit 1b118881b8f71a84458e42de07708c863f70093f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 24 11:40:32 2009 +1100

     - (dtucker) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2009/10/11 23:03:15
         [hostfile.c]
         mention the host name that we are looking for in check_host_in_hostfile()

commit e23a79cbed41a3d10533a9d5caefdcee058a066b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 12 09:37:22 2009 +1100

       - markus@cvs.openbsd.org 2009/10/08 18:04:27
         [regress/test-exec.sh]
         re-enable protocol v1 for the tests.

commit 438b47320cf075fa51aa0e840882998c24db176b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 11 21:52:10 2009 +1100

       - dtucker@cvs.openbsd.org 2009/10/11 10:41:26
         [sftp-client.c]
         d_type isn't portable so use lstat to get dirent modes.  Suggested by and
         "looks sane" deraadt@

commit 7a4a76579e5321f52b773fc84f7bbe0f07adc5f2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 11 21:51:40 2009 +1100

       - jmc@cvs.openbsd.org 2009/10/08 20:42:12
         [sshd_config.5 ssh_config.5 sshd.8 ssh.1]
         some tweaks now that protocol 1 is not offered by default; ok markus

commit bad5076bb5d5587cf8b889cd9ce495c39282786b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 11 21:51:08 2009 +1100

     - (dtucker) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2009/10/08 14:03:41
         [sshd_config readconf.c ssh_config.5 servconf.c sshd_config.5]
         disable protocol 1 by default (after a transition period of about 10 years)
         ok deraadt

commit c182d993762f86fbdf9e54dd5b0e3e3d229ebc13
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 11 21:50:20 2009 +1100

     - (dtucker) [configure.ac sftp-client.c] Remove the gyrations required for
       dirent d_type and DTTOIF as we've switched OpenBSD to the more portable
       lstat.

commit 538738d861cefb25d78615b1c299d7b618db870c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 18:56:10 2009 +1100

     - (dtucker) d_type is not mandated by POSIX, so add fallback code using
        stat(), needed on at least cygwin.

commit 4adeac764e110e12ab481dc72c7c67dbf4b7110a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 15:49:48 2009 +1100

     - (dtucker) [configure.ac sftp-client.c] DOTTIF is in fs/ffs/dir.h on at
       least dragonflybsd.

commit a25ab018459dc366061ac98086705c561b856a19
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 11:00:58 2009 +1100

     - (dtucker) [regress/portnum.sh] Import new test.

commit b99c6e14990e56eaac0b7afa8303a27bb20fc6d3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 10:58:40 2009 +1100

    fix id

commit b707a243822f28d07702ce4fc2c1d6cf305bc631
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 10:54:31 2009 +1100

       - dtucker@cvs.openbsd.org 2009/10/06 23:51:49
         [regress/ssh2putty.sh]
         Add OpenBSD tag to make syncs easier

commit c863895e0ab7f9430402736e953e62dae46be458
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 10:46:29 2009 +1100

       - djm@cvs.openbsd.org 2009/08/20 18:43:07
         [ssh-com-sftp.sh]
         fix one sftp -D ... => sftp -P ... conversion that I missed; from Carlos
         Silva for Google Summer of Code

commit ed6b0c5fc21807ff771a499fd042a24f963f7291
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 10:43:57 2009 +1100

       - djm@cvs.openbsd.org 2009/08/13 01:11:55
         [sftp-batch.sh sftp-badcmds.sh sftp.sh sftp-cmds.sh sftp-glob.sh]
         date: 2009/08/13 01:11:19;  author: djm;  state: Exp;  lines: +10 -7
         Swizzle options: "-P sftp_server_path" moves to "-D sftp_server_path",
         add "-P port" to match scp(1). Fortunately, the -P option is only really
         used by our regression scripts.
         part of larger patch from carlosvsilvapt@gmail.com for his Google Summer
         of Code work; ok deraadt markus

commit 287b9329c5fc2e1a177f9608209a35a6c5bf852a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 10:31:56 2009 +1100

       - djm@cvs.openbsd.org 2009/08/13 00:57:17
         [regress/Makefile]
         regression test for port number parsing. written as part of the a2port
         change that went into 5.2 but I forgot to commit it at the time...

commit 798855358538931da4f3d7ee6a111b3b4fbd338c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 10:30:57 2009 +1100

       - dtucker@cvs.openbsd.org 2009/05/05 07:51:36
         [regress/multiplex.sh]
         Always specify ssh_config for multiplex tests: prevents breakage caused
         by options in ~/.ssh/config.  From Dan Peterson.

commit 7023d161d86211fa6a4c7dfacdad37a53f468512
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 10:30:06 2009 +1100

       - djm@cvs.openbsd.org 2008/12/07 22:17:48
         [regress/addrmatch.sh]
         match string "passwordauthentication" only at start of line, not anywhere
         in sshd -T output

commit 695ed397a5216189629aa717d03d72ad21cdee1a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 09:02:18 2009 +1100

       - djm@cvs.openbsd.org 2009/10/06 04:46:40
         [session.c]
         bz#1596: fflush(NULL) before exec() to ensure that everying (motd
         in particular) has made it out before the streams go away.

commit 759cb2a49aefe2757ec7b023024881f5d00efef5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 09:01:50 2009 +1100

       - grunk@cvs.openbsd.org 2009/10/01 11:37:33
         [dh.c]
         fix a cast
         ok djm@ markus@

commit 72473c6b09b61b5ea2a7bda7728062b89a46b394
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 09:01:03 2009 +1100

       - djm@cvs.openbsd.org 2009/09/01 14:43:17
         [ssh-agent.c]
         fix a race condition in ssh-agent that could result in a wedged or
         spinning agent: don't read off the end of the allocated fd_sets, and
         don't issue blocking read/write on agent sockets - just fall back to
         select() on retriable read/write errors. bz#1633 reported and tested
         by "noodle10000 AT googlemail.com"; ok dtucker@ markus@

commit 7bee06ab3b84c9f141666cc47abb349067551ef6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:47:47 2009 +1100

       - djm@cvs.openbsd.org 2009/08/31 21:01:29
         [sftp-server.8]
         document -e and -h; prodded by jmc@

commit 30359e19ecd93a494493501a8eacb4f7d36b2e3f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:47:24 2009 +1100

       - djm@cvs.openbsd.org 2009/08/31 20:56:02
         [sftp-server.c]
         check correct variable for error message, spotted by martynas@

commit 893d73549d7cfa277434bf0113688a5a14055408
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:47:02 2009 +1100

       - djm@cvs.openbsd.org 2009/08/27 17:44:52
         [authfd.c ssh-add.c authfd.h]
         Do not fall back to adding keys without contraints (ssh-add -c / -t ...)
         when the agent refuses the constrained add request. This was a useful
         migration measure back in 2002 when constraints were new, but just
         adds risk now.
         bz #1612, report and patch from dkg AT fifthhorseman.net; ok markus@

commit 6b286a46821fa230258f1da82d0e013cfe3bf685
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:46:21 2009 +1100

       - djm@cvs.openbsd.org 2009/08/27 17:43:00
         [sftp-server.8]
         allow setting an explicit umask on the commandline to override whatever
         default the user has. bz#1229; ok dtucker@ deraadt@ markus@

commit 9bcd25b78b8764ab27cd807f267ff5d82720a0cf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:45:48 2009 +1100

       - djm@cvs.openbsd.org 2009/08/27 17:33:49
         [ssh-keygen.c]
         force use of correct hash function for random-art signature display
         as it was inheriting the wrong one when bubblebabble signatures were
         activated; bz#1611 report and patch from fwojcik+openssh AT besh.com;
         ok markus@

commit 7dc4850ce85a676ede0c070db6e46e022bd852fe
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:44:42 2009 +1100

       - djm@cvs.openbsd.org 2009/08/27 17:28:52
         [sftp-server.c]
         allow setting an explicit umask on the commandline to override whatever
         default the user has. bz#1229; ok dtucker@ deraadt@ markus@

commit 8ec4fd8e3cf5eaf4791d422df1137ecacebc2a34
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:39:57 2009 +1100

       - dtucker@cvs.openbsd.org 2009/08/20 23:54:28
         [mux.c]
         subsystem_flag is defined in ssh.c so it's extern; ok djm

commit b3b40a8b95b3fc8ca952f0958b966a99f78b2ef2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:39:09 2009 +1100

       - jmc@cvs.openbsd.org 2009/08/19 04:56:03
         [sftp.1]
         ether -> either;

commit 05016b2f9983e5489ae6e4dc810f22cc46415f55
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:38:23 2009 +1100

      - djm@cvs.openbsd.org 2009/08/18 21:15:59
         [sftp.1]
         fix "get" command usage, spotted by jmc@

commit 1b0dd175377c86abb7f3a3da2e9b1a89f36c7a1a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:37:48 2009 +1100

       - djm@cvs.openbsd.org 2009/08/18 18:36:21
         [sftp-client.h sftp.1 sftp-client.c sftp.c]
         recursive transfer support for get/put and on the commandline
         work mostly by carlosvsilvapt@gmail.com for the Google Summer of Code
         with some tweaks by me; "go for it" deraadt@

commit 1477ea162c05c09b4b5ebc19ac588fbf469349dc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:36:05 2009 +1100

       - dtucker@cvs.openbsd.org 2009/08/16 23:29:26
         [sshd_config.5]
         Add PubkeyAuthentication to the list allowed in a Match block (bz #1577)

commit e54a036219434260f8efd86c8c110141994fcfa1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:35:32 2009 +1100

       - fgsch@cvs.openbsd.org 2009/08/15 18:56:34
         [auth.h]
         remove unused define. markus@ ok.
         (Id sync only, Portable still uses this.)

commit c22f090a2f4ac309d1d44a6bbafdefb1e8de532a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:24:19 2009 +1100

       - djm@cvs.openbsd.org 2009/08/14 18:17:49
         [sftp-client.c]
         make the "get_handle: ..." error messages vaguely useful by allowing
         callers to specify their own error message strings.

commit c07138e6f6a9173d0315cceb123e3bc4abbd1528
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:23:44 2009 +1100

       - jmc@cvs.openbsd.org 2009/08/13 13:39:54
         [sftp.1 sftp.c]
         sync synopsis and usage();

commit 282b4026cb5c5a229e2c5b33e4ad3ac31fcf3189
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:23:06 2009 +1100

       - djm@cvs.openbsd.org 2009/08/13 01:11:19
         [sftp.1 sftp.c]
         Swizzle options: "-P sftp_server_path" moves to "-D sftp_server_path",
         add "-P port" to match scp(1). Fortunately, the -P option is only really
         used by our regression scripts.
         part of larger patch from carlosvsilvapt@gmail.com for his Google Summer
         of Code work; ok deraadt markus

commit adba1ba51474d43e708de2b986c36199fa8f167e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:22:20 2009 +1100

      - jmc@cvs.openbsd.org 2009/08/12 06:31:42
         [sftp.1]
         sort options;

commit 46bbbe3326d69a84d94caca656c40a4521c10c45
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 7 08:21:48 2009 +1100

       - djm@cvs.openbsd.org 2009/08/12 00:13:00
         [sftp.c sftp.1]
         support most of scp(1)'s commandline arguments in sftp(1), as a first
         step towards making sftp(1) a drop-in replacement for scp(1).
         One conflicting option (-P) has not been changed, pending further
         discussion.
         Patch from carlosvsilvapt@gmail.com as part of his work in the
         Google Summer of Code

commit 350666d30069c163c0dc1fa2503740b9d970ecc8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 2 11:50:55 2009 +1000

     - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps.
       spotted by des AT des.no

commit ea43742e77ca5a14b625ebf073ba696b75cd7330
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 2 11:49:03 2009 +1000

    pull in 5.3 release changes from branch:
    
    20090926
     - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
             [contrib/suse/openssh.spec] Update for release
     - (djm) [README] update relnotes URL
     - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere
     - (djm) Release 5.3p1

commit e02b49a80643e8e22566c72bf39b76e89acdf312
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 11 14:56:08 2009 +1000

     - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X
       10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query).  Patch
       from jbasney at ncsa uiuc edu.

commit e5d5a17fe16b5bb22259cb84ef13cd47e60d77d7
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 9 11:07:28 2009 +1000

     - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port
       (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@

commit dad48e7a96385f8a1bdadd9196e00cefa2a9b702
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 1 18:26:00 2009 +1000

     - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for
       krb5-config if it's not in the location specified by --with-kerberos5.
       Patch from jchadima at redhat.

commit 427adf1538d3e6e3c2ec059c52fa116942bf334a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 29 09:14:48 2009 +1000

     - (dtucker) [README.platform] Add text about development packages, based on
       text from Chris Pepper in bug #1631.

commit ac9f1b9b89b17c2fbe9361ecd849a1b7df2aa1ee
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 28 15:01:20 2009 +1000

     - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry.

commit 86e30a0166f9c9e65983d2c4066873c4181d08c8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 28 11:21:06 2009 +1000

     - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer
       size a compile-time option and set it to 64k on Cygwin, since Corinna
       reports that it makes a significant difference to performance.  ok djm@

commit 3980b636312516ee823e84e884dadbc86e6795d3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 28 11:02:37 2009 +1000

     - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on
        the pty master on Solaris, since it never succeeds and can hang if large
        amounts of data is sent to the slave (eg a copy-paste).  Based on a patch
        originally from Doke Scott, ok djm@

commit 7d4a2685f78440f09d25bf3fc7236a5f99af208a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 28 10:47:38 2009 +1000

     - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables
       in argv, so pass them in the environment; ok dtucker@

commit 0e26551f7fa8371ef067dec63ff46918bf87ad8d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 28 10:43:13 2009 +1000

    - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when
      attempting atomic rename(); ok dtucker@

commit 8aac993af6423f0989e4c5fd39acaf9e20a68f0b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 28 10:40:30 2009 +1000

     - (djm) [sshd_config.5] downgrade mention of login.conf to be an example
       and mention PAM as another provider for ChallengeResponseAuthentication;
       bz#1408; ok dtucker@

commit 9c7bf8dfc8c54129fd3c62c4a1d678a18a9ad1f7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 28 10:27:08 2009 +1000

    downgrade mention of login.conf to be an example and mention PAM as
    another provider for ChallengeResponseAuthentication; bz#1408; ok dtucker@

commit 28b973ea267e790e566da7a11bd36d5c90ed5841
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 28 10:16:44 2009 +1000

     - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently
       causes problems in some Tru64 configurations.

commit 82edf23fffc4accf7686da08367e9fd5b5baa487
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 20 16:20:50 2009 +1000

     - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move
       the setpcred call on AIX to immediately before the permanently_set_uid().
       Ensures that we still have privileges when we call chroot and
       pam_open_sesson.  Based on a patch from David Leonard.

commit 2a5588daeb27c118a3a55a203a7be14978d96bf7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 20 16:16:01 2009 +1000

     - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not
       using it since the type conflicts can cause problems on FreeBSD.  Patch
       from Jonathan Chen.

commit b5d5ee1ab0a2df1d5c6aea7ac8dadc4e8782bdd0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 17 09:40:00 2009 +1000

     - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make
       PrintLastLog work on AIX.  Based in part on a patch from Miguel Sanders.

commit 83d8f2833611c8bb3646eeae918788e946e4e190
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 17 09:35:22 2009 +1000

     - (dtucker) [configure.ac] Check for headers before libraries for openssl an
       zlib, which should make the errors slightly more meaningful on platforms
       where there's separate "-devel" packages for those.

commit caeb16498409fb0570e665a7400ce88c9c4d17be
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jul 29 07:21:13 2009 -0700

     - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error
       function. Patch from Corinna Vinschen.

commit 440089afe071817443c15d8914097a43e0485a89
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 13 11:38:23 2009 +1000

     - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it
       fits into 16 bits to work around a bug in glibc's resolver where it masks
       off the buffer size at 16 bits.  Patch from Hauke Lampe, ok djm jakob.

commit 916fdda4016781ad19aca0996feda4ef07fbbd49
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jul 12 22:12:28 2009 +1000

    add credit for bug #1534 patch

commit 622d5c561bf940c0c2d329d8001ca1e60b862ca2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jul 12 22:07:21 2009 +1000

     - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on
       logout to after the session close.  Patch from Anicka Bernathova, ok djm.

commit 8fdcba5caf124bec3d17e6c6688ca2f1857329c3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jul 12 21:58:42 2009 +1000

     - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch
       from Corinna Vinschen.

commit c4b22ca1c82f9f21add785c01fcb90001d87ddb2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jul 12 21:56:29 2009 +1000

     - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test,
       prevents configure complaining on older BSDs.

commit 4d4fdc0f7dc25e081d8da2e7a525ecb2a6f871f4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 7 21:19:11 2009 +1000

     - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated
       scripts and fix usage of eval.  Patch from Corinna Vinschen.

commit de0c025e3cfe5bfd384e759daa8b95cc245efa33
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 6 07:17:35 2009 +1000

       - stevesk@cvs.openbsd.org 2009/07/05 19:28:33
         [clientloop.c]
         only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@
         ok deraadt@ markus@

commit 199b1340a85de9f241935bc0fe56b71258839220
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 6 07:16:56 2009 +1000

       - dtucker@cvs.openbsd.org 2009/07/02 02:11:47
         [ssh.c]
         allow for long home dir paths (bz #1615).  ok deraadt
         (based in part on a patch from jchadima at redhat)

commit cd6b1a27cbb9400565811f908ca536937d875b8f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 6 07:13:04 2009 +1000

       - markus@cvs.openbsd.org 2009/06/30 14:54:40
         [version.h]
         crank version; ok deraadt

commit 71e4d54dc7e7868708334bea526cd3f94cd9d1d3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 6 07:12:27 2009 +1000

       - andreas@cvs.openbsd.org 2009/06/27 09:35:06
         [readconf.h readconf.c]
         Add client option UseRoaming. It doesn't do anything yet but will
         control whether the client tries to use roaming if enabled on the
         server. From Martin Forssen.
         ok markus@

commit 466df219615d72e48ff9103ec67521447f23a158
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 6 07:11:52 2009 +1000

       - andreas@cvs.openbsd.org 2009/06/27 09:32:43
         [roaming_common.c roaming.h]
         It may be necessary to retransmit some data when resuming, so add it
         to a buffer when roaming is enabled.
         Most of this code was written by Martin Forssen, maf at appgate dot com.
         ok markus@

commit e841eb065426d9c9c9e107e76d816107d68554a7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 6 07:11:13 2009 +1000

       - andreas@cvs.openbsd.org 2009/06/27 09:29:06
         [packet.h packet.c]
         packet_bacup_state() and packet_restore_state() will be used to
         temporarily save the current state ren resuming a suspended connection.
         ok markus@

commit 821d3dbe36faa1e53a269e434487d0617a0a1578
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 22 16:11:06 2009 +1000

       - dtucker@cvs.openbsd.org 2009/06/22 05:39:28
         [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c]
         alphabetize includes; reduces diff vs portable and style(9).
         ok stevesk djm
         (Id sync only; these were already in order in -portable)

commit 828c96d48fce9040a75b0e9e66ecd02c96dee11e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 22:22:08 2009 +1000

     - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include <inttypes.h> in
       ifdef.

commit 64cee36713d8094af37e3e2e5a7d38a8d25dff80
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 20:26:17 2009 +1000

     - (dtucker) [servconf.c sshd.c] More whitespace sync.

commit 43e7a358ff9476fb77bc1b475530ce4c6b152ccc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 19:50:08 2009 +1000

     - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and
       header-order changes to reduce diff vs OpenBSD.

commit e6b590e8d40e2b2ab0aab9da1b7d34cd357caf6a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 19:08:48 2009 +1000

       - dtucker@cvs.openbsd.org 2009/06/21 09:04:03
         [roaming.h roaming_common.c roaming_dummy.c]
         Add  tags for the benefit of the sync scripts
         Also: pull in the changes for 1.1->1.2 missed in the previous sync.

commit 6ae35ac5762b6abcbd416e7db9246e730b401f10
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 19:00:20 2009 +1000

       - dtucker@cvs.openbsd.org 2009/06/21 07:37:15
         [kexdhs.c kexgexs.c]
         abort if key_sign fails, preventing possible null deref.  Based on report
         from Paolo Ganci, ok markus@ djm@

commit 7b935c79f4f31da21989cc441caee247af417b3b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 18:59:36 2009 +1000

       - andreas@cvs.openbsd.org 2009/06/12 20:58:32
         [packet.c]
         Move some more statics into session_state
         ok markus@ djm@

commit b422afa41f75229da03a90a52b0f30206b5797a1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 18:58:46 2009 +1000

       - andreas@cvs.openbsd.org 2009/06/12 20:43:22
         [monitor.c packet.c]
         Fix warnings found by chl@ and djm@ and change roaming_atomicio's
         return type to match atomicio's
         Diff from djm@, ok markus@

commit c5564e1c4c41ae9af96973e2996e2a4285acbae8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 18:53:53 2009 +1000

       - andreas@cvs.openbsd.org 2009/05/28 16:50:16
         [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c
         monitor.c Added roaming.h roaming_common.c roaming_dummy.c]
         Keep track of number of bytes read and written. Needed for upcoming
         changes. Most code from Martin Forssen, maf at appgate dot com.
         ok markus@
         Also, applied appropriate changes to Makefile.in

commit 1cc55d7a607455d75db0204b5acebce47667b0f8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 18:17:19 2009 +1000

       - andreas@cvs.openbsd.org 2009/05/28 16:50:16
         [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c
         monitor.c]
         Keep track of number of bytes read and written. Needed for upcoming
         changes. Most code from Martin Forssen, maf at appgate dot com.
         ok markus@

commit 761c38918aecbbe2df97d13aea29c6bbf9212617
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 18:16:26 2009 +1000

       - andreas@cvs.openbsd.org 2009/05/27 06:38:16
         [sshconnect.h sshconnect.c]
         Un-static ssh_exchange_identification(), part of a larger change from
         Martin Forssen and needed for upcoming changes.
         ok markus@

commit 5b48cdd882579f60217b9aa9a0c09e61e739a917
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 18:15:25 2009 +1000

       - andreas@cvs.openbsd.org 2009/05/27 06:36:07
         [packet.h packet.c]
         Add packet_put_int64() and packet_get_int64(), part of a larger change
         from Martin Forssen.

commit 12b4a6504b3f7bad3c144761714fb429669f56d0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 18:14:48 2009 +1000

       - andreas@cvs.openbsd.org 2009/05/27 06:34:36
         [kex.c kex.h]
         Move the KEX_COOKIE_LEN define to kex.h
         ok markus@

commit 39c7632c1b07417fe5704b763c02d4cff147c885
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 18:13:57 2009 +1000

       - andreas@cvs.openbsd.org 2009/05/27 06:33:39
         [clientloop.c]
         Send SSH2_MSG_DISCONNECT when the client disconnects. From a larger
         change from Martin Forssen, maf at appgate dot com.
         ok markus@

commit f7288d77e4e705cbbc12c2ad55ed50f9de9a87e2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 18:12:20 2009 +1000

       - andreas@cvs.openbsd.org 2009/05/27 06:31:25
         [canohost.h canohost.c]
         Add clear_cached_addr(), needed for upcoming changes allowing the peer
         address to change.
         ok markus@

commit 51dbe503bf92ee38f003ffde4bb0a0d85c438ea7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 17:56:51 2009 +1000

       - stevesk@cvs.openbsd.org 2009/04/21 15:13:17
         [sshd_config.5]
         clarify we cd to user's home after chroot; ok markus@ on
         earlier version; tweaks and ok jmc@

commit f92077f05c7e1ebaf944da909e5a7ca7932443e0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 17:56:25 2009 +1000

       - jmc@cvs.openbsd.org 2009/04/18 18:39:10
         [sshd_config.5]
         tweak previous; ok stevesk

commit 00fcd719a5877c6e02a0d6c66bd2de651fee728c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 17:56:00 2009 +1000

       - stevesk@cvs.openbsd.org 2009/04/17 19:40:17
         [sshd_config.5]
         clarify that even internal-sftp needs /dev/log for logging to work; ok
         markus@

commit ac46a915e83c6a69237d683a136bc919049b22d5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 17:55:23 2009 +1000

       - stevesk@cvs.openbsd.org 2009/04/17 19:23:06
         [session.c]
         use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server;
         ok djm@ markus@

commit 3b59dfa161b52b41e5e0cacaf3db1510cfaaa319
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 17:54:47 2009 +1000

       - jj@cvs.openbsd.org 2009/04/14 21:10:54
         [servconf.c]
         Fixed a few the-the misspellings in comments. Skipped a bunch in
         binutils,gcc and so on. ok jmc@

commit b62f1a856d3dc0b6d091e013500aa65c6173e0e5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 17:53:48 2009 +1000

       - stevesk@cvs.openbsd.org 2009/04/14 16:33:42
         [sftp-server.c]
         remove unused option character from getopt() optstring; ok markus@

commit af501cfce456004e1bce8557bbb24b230442b324
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 17:53:04 2009 +1000

       - stevesk@cvs.openbsd.org 2009/04/13 19:07:44
         [sshd_config.5]
         fix possessive; ok djm@

commit 5837b51aecf162b1fcc87c978806e3798e005c95
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 17:52:27 2009 +1000

       - sobrado@cvs.openbsd.org 2009/03/26 08:38:39
         [sftp-server.8 sshd.8 ssh-agent.1]
         fix a few typographical errors found by spell(1).
         ok dtucker@, jmc@

commit 9013323644d2ecd77567543479bbab2c1150af6c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 17:50:15 2009 +1000

       - tobias@cvs.openbsd.org 2009/03/23 19:38:04
         [ssh-agent.c]
         My previous commit didn't fix the problem at all, so stick at my first
         version of the fix presented to dtucker.
         Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de).
         ok dtucker

commit a0964504e19598ca5a45dbf0ed0c677e4f24c132
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 17:49:36 2009 +1000

       - tobias@cvs.openbsd.org 2009/03/23 08:31:19
         [ssh-agent.c]
         Fixed a possible out-of-bounds memory access if the environment variable
         SHELL is shorter than 3 characters.
         with input by and ok dtucker

commit 3a6a51f3874209046df3ac6ca11180b9ca31062d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 17:48:52 2009 +1000

      - jmc@cvs.openbsd.org 2009/03/19 15:15:09
         [ssh.1]
         for "Ciphers", just point the reader to the keyword in ssh_config(5), just
         as we do for "MACs": this stops us getting out of sync when the lists
         change;
         fixes documentation/6102, submitted by Peter J. Philipp
         alternative fix proposed by djm
         ok markus

commit 72efd74d2fd3d871210322e8a48f38e2baafc207
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 21 17:48:00 2009 +1000

     - (dtucker) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2009/03/17 21:37:00
         [ssh.c]
         pass correct argv[0] to openlog(); ok djm@

commit 3278062bf3e2e435163998feca90c13e80d53d5d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 16 16:11:02 2009 +1000

     - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
       is a struct with a __val member.  Fixes build on, eg, Redhat 6.2.

commit a422d9756e3fbe932db063592b5303aae7cc0b28
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 4 12:52:47 2009 +1000

     - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include
       variable declarations.  Should prevent unused warnings anywhere it's set
       (only Crays as far as I can tell) and be a no-op everywhere else.

commit a74000eb9e04c726bee13ae8abce51386ba0dfbf
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Mar 18 11:25:02 2009 -0700

     - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem
       that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005.
       Based on patch from vinschen at redhat com.

commit 9d86e5d5704092072822336af6d0bee468c25966
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 8 11:40:27 2009 +1100

     - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c
       auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h}
       openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old
       version of Cygwin.  Patch from vinschen at redhat com.

commit 3e7e15f1bdc2ddd8fe4a389212c6b8db58e2b511
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Mar 7 22:22:35 2009 +1100

     - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}]
       EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg
       in openssl 0.9.6) so add an explicit test for it.

commit 30ed668de0f7755934971f2e7e80b62073091624
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Mar 7 18:06:22 2009 +1100

     - (dtucker) [configure.ac] Missing comma in type list.

commit ccfee058820699bc6d5f5e10e8f546c1e95b4c1d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Mar 7 12:32:22 2009 +1100

     - (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed.

commit 8aae6ff0d9e3b78204288f1db671ccd60614e10b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Mar 7 12:01:47 2009 +1100

     - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add
       EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c
       to use them.  Allows building with older OpenSSL versions.

commit 558d6ca949e36811259c05bac1416b6f317beef8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Mar 7 10:22:10 2009 +1100

     - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it
       exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS
       has a /dev/random).

commit 60ccbf2f2fc545dba9029e9ccfde7ce7bc0bb03b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 6 01:03:30 2009 +1100

       - djm@cvs.openbsd.org 2009/03/05 07:18:19
         [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c]
         [sshconnect2.c]
         refactor the (disabled) Schnorr proof code to make it a little more
         generally useful

commit 447e38787229c5153c8602b4ee79e9b24345529a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 6 00:58:39 2009 +1100

       - djm@cvs.openbsd.org 2009/03/05 11:30:50
         [uuencode.c]
         document what these functions do so I don't ever have to recuse into
         b64_pton/ntop to remember their return values

commit cee85233149eb16c45132170d3f067496f17c368
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 6 00:58:22 2009 +1100

       - djm@cvs.openbsd.org 2009/03/05 07:18:19
         [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c]
         [sshconnect2.c]
         refactor the (disabled) Schnorr proof code to make it a little more
         generally useful

commit faec50b554730338c0e9f34966c11368920b6a78
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 23 11:12:29 2009 +1100

     - (djm) Release openssh-5.2p1

commit 5d0d530c8c1cce0fdd1581ac1f7cfa6d709b99cd
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 23 11:11:57 2009 +1100

     - (djm) [README] update for 5.2

commit 09d19045b8ae9e2433f7d970aacec522adef649b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 23 11:11:12 2009 +1100

    trim

commit 582ca6b1712ef6efd9650200bd820a067331fec1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 23 11:09:25 2009 +1100

       - djm@cvs.openbsd.org 2009/02/23 00:06:15
         [version.h]
         openssh-5.2

commit 0296ae85ec0da7f7bcf51578ed960d66a1541613
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 23 11:00:24 2009 +1100

       - djm@cvs.openbsd.org 2009/02/22 23:59:25
         [sshd_config.5]
         missing period

commit 19913847640ac7df423f01f641abfce0f364238f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 23 10:53:58 2009 +1100

       - djm@cvs.openbsd.org 2009/02/22 23:50:57
         [ssh_config.5 sshd_config.5]
         don't advertise experimental options

commit 9eab9564d5185b52f33f4a265914d32a3147338e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 22 08:47:02 2009 +1100

     - (djm) OpenBSD CVS Sync
       - tobias@cvs.openbsd.org 2009/02/21 19:32:04
         [misc.c sftp-server-main.c ssh-keygen.c]
         Added missing newlines in error messages.
         ok dtucker

commit 7691e5fa44a54b193f00380634c3978a961480d2
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 21 18:03:04 2009 +1100

     - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Prepare for 5.2p1

commit 25918381ad4375f71836a44e3cc2b6a653c8979c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 21 12:45:18 2009 +1100

       - djm@cvs.openbsd.org 2009/02/18 04:31:21
         [schnorr.c]
         signature should hash over the entire group, not just the generator
         (this is still disabled code)

commit e8001d4820bb9d292695bcb8c5f20c04f2f17d61
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 21 12:45:02 2009 +1100

       - djm@cvs.openbsd.org 2009/02/17 01:28:32
         [ssh_config]
         sync with revised default ciphers; pointed out by dkrause@

commit 9055172d0387bae9304aa284b3c08ea107d9133f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 16 15:37:03 2009 +1100

     - (djm) [configure.ac] support GNU/kFreeBSD and GNU/kOpensolaris
       systems; patch from Aurelien Jarno via rmh AT aybabtu.com

commit 3f94aaf38c815f0aa72c3c7bf40491c8d456e929
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 16 15:21:39 2009 +1100

     - (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh]
       [regress/putty-kex.sh regress/putty-transfer.sh] Downgrade disabled
       interop tests from FATAL error to a warning. Allows some interop
       tests to proceed if others are missing necessary prerequisites.

commit 6385e758dfbc72d461a68cd19819e5f9d41e555c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 14 18:00:52 2009 +1100

       - djm@cvs.openbsd.org 2009/02/14 06:35:49
         [PROTOCOL]
         mention that eow and no-more-sessions extensions are sent only to
         OpenSSH peers

commit 61433bec808fc90de066902e793147fd5015a2cc
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 14 16:35:01 2009 +1100

       - markus@cvs.openbsd.org 2009/02/13 11:50:21
         [packet.c]
         check for enc !=NULL in packet_start_discard

commit e379e1083748ab84cc199f2cbf7029621e2cb75c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 14 16:34:39 2009 +1100

       - jmc@cvs.openbsd.org 2009/02/12 07:34:20
         [ssh_config.5]
         kill trailing whitespace;

commit 85c6d8a991826fcc1217f5743b0108668c12f7cb
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 14 16:34:21 2009 +1100

       - djm@cvs.openbsd.org 2009/02/12 03:46:17
         [ssh_config.5]
         document RemoteForward usage with 0 listen port

commit 65fa4cab4cf8e795bb624866a27794cae2845210
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 14 16:34:05 2009 +1100

       - djm@cvs.openbsd.org 2009/02/12 03:44:25
         [ssh.1]
         consistency: Dq => Ql

commit e2f4cc5016f63a0ccee02056f33b79e12e0fd31b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 14 16:33:49 2009 +1100

       - djm@cvs.openbsd.org 2009/02/12 03:42:09
         [ssh.1]
         document -R0:... usage

commit 923e8bb7dc921b3136320f126976bfeee11c9e41
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 14 16:33:31 2009 +1100

       - djm@cvs.openbsd.org 2009/02/12 03:26:22
         [monitor.c]
         some paranoia: check that the serialised key is really KEY_RSA before
         diddling its internals

commit 330d58587f05fd34f3b1d20a64d254ea0470a6cc
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 14 16:33:09 2009 +1100

       - djm@cvs.openbsd.org 2009/02/12 03:16:01
         [serverloop.c]
         tighten check for -R0:... forwarding: only allow dynamic allocation
         if want_reply is set in the packet

commit 4bf648f7766ba764d7a78b1dbb26df4f0d42a8c9
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 14 16:28:21 2009 +1100

       - djm@cvs.openbsd.org 2009/02/12 03:00:56
         [canohost.c canohost.h channels.c channels.h clientloop.c readconf.c]
         [readconf.h serverloop.c ssh.c]
         support remote port forwarding with a zero listen port (-R0:...) to
         dyamically allocate a listen port at runtime (this is actually
         specified in rfc4254); bz#1003 ok markus@

commit fdd66fc750228b5d040c45bc36565299374b72c8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 14 16:26:19 2009 +1100

       - dtucker@cvs.openbsd.org 2009/02/02 11:15:14
         [sftp.c]
         Initialize a few variables to prevent spurious "may be used
         uninitialized" warnings from newer gcc's.  ok djm@

commit 20e231f9f8445ad072b319c9c47f3d9897a1f284
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 12 13:12:21 2009 +1100

     - (djm) [configure.ac loginrec.c] bz#1421: fix lastlog support for OSX.
       OSX provides a getlastlogxbyname function that automates the reading of
       a lastlog file. Also, the pututxline function will update lastlog so
       there is no need for loginrec.c to do it explicitly. Collapse some
       overly verbose code while I'm in there.

commit 2de762456e8cdb92b85c1e573cbf2b4b70eee847
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 12 12:19:20 2009 +1100

     - (djm) [sshpty.c] bz#1419: OSX uses cloning ptys that automagically
       set ownership and modes, so avoid explicitly setting them

commit 642ebe5b51112862f4c041abf6064fe711f56009
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 1 22:19:54 2009 +1100

     - (dtucker) [defines.h sshconnect.c] INET6_ADDRSTRLEN is now needed in
       channels.c too, so move the definition for non-IP6 platforms to defines.h
       where it can be shared.

commit 0d8f2f3afa1663386ac80a0b7835b6776d5bcae1
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jan 29 12:40:30 2009 -0800

     - (tim) [contrib/cygwin/ssh-host-config] Whitespace cleanup. No code changes.

commit 6a3253496843abf7b10d1aadb46847e8b11039ec
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jan 29 12:30:01 2009 -0800

     - (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen.
       If the CYGWIN environment variable is empty, the installer script
       should not install the service with an empty CYGWIN variable, but
       rather without setting CYGWNI entirely.

commit ca3692d1a9f8c384d3cf799369dcb9c54bb5ec55
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jan 28 12:50:04 2009 -0800

     - (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen.
       Changes to work on Cygwin 1.5.x as well as on the new Cygwin 1.7.x.
       The information given for the setting of the CYGWIN environment variable
       is wrong for both releases so I just removed it, together with the
       unnecessary (Cygwin 1.5.x) or wrong (Cygwin 1.7.x) default setting.

commit 13ae44ce5865b720708aae9cb1d2e2f08a0d90cb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:38:41 2009 +1100

       - markus@cvs.openbsd.org 2009/01/26 09:58:15
         [cipher.c cipher.h packet.c]
         Work around the CPNI-957037 Plaintext Recovery Attack by always
         reading 256K of data on packet size or HMAC errors (in CBC mode only).
         Help, feedback and ok djm@
         Feedback from Martin Albrecht and Paterson Kenny

commit 9aa72ba57af907af8f7228f64fca8a474797898f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:34:00 2009 +1100

       - naddy@cvs.openbsd.org 2009/01/24 17:10:22
         [ssh_config.5 sshd_config.5]
         sync list of preferred ciphers; ok djm@

commit 67081b5148f73c9af21e933b460f5bc1affb5661
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:33:31 2009 +1100

       - djm@cvs.openbsd.org 2009/01/23 07:58:11
         [myproposal.h]
         prefer CTR modes and revised arcfour (i.e w/ discard) modes to CBC
         modes; ok markus@

commit e37dde06a6a1ce6c2d2ce853d9834b715af82d47
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:33:01 2009 +1100

       - djm@cvs.openbsd.org 2009/01/22 10:09:16
         [auth-options.c]
         another chunk of a2port() diff that got away. wtfdjm??

commit 3dc71ad8653bab5591fc75bb1d3e6aa8fb9360df
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:31:22 2009 +1100

       - djm@cvs.openbsd.org 2009/01/22 10:02:34
         [clientloop.c misc.c readconf.c readconf.h servconf.c servconf.h]
         [serverloop.c ssh-keyscan.c ssh.c sshd.c]
         make a2port() return -1 when it encounters an invalid port number
         rather than 0, which it will now treat as valid (needed for future work)
         adjust current consumers of a2port() to check its return value is <= 0,
         which in turn required some things to be converted from u_short => int
         make use of int vs. u_short consistent in some other places too
         feedback & ok markus@

commit 9576ac4afc7124415183dd9fe73d410165dbfe82
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:30:33 2009 +1100

       - djm@cvs.openbsd.org 2009/01/22 09:49:57
         [channels.c]
         oops! I committed the wrong version of the Channel->path diff,
         it was missing some tweaks suggested by stevesk@

commit a1c1b6c86d506c10daac0161f7fc56368cc6ef6e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:29:49 2009 +1100

       - djm@cvs.openbsd.org 2009/01/22 09:46:01
         [channels.c channels.h session.c]
         make Channel->path an allocated string, saving a few bytes here and
         there and fixing bz#1380 in the process; ok markus@

commit 5bc6aae3dbeda2e6b23361238b16fbadbfcd2ce5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:27:31 2009 +1100

       - stevesk@cvs.openbsd.org 2009/01/15 17:38:43
         [readconf.c]
         1) use obsolete instead of alias for consistency
         2) oUserKnownHostsFile not obsolete but oGlobalKnownHostsFile2 is
            so move the comment.
         3) reorder so like options are together
         ok djm@

commit 1781f53d7540778fa50991d9b5aaf8f4b4a2eafd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:24:41 2009 +1100

       - djm@cvs.openbsd.org 2009/01/14 01:38:06
         [channels.c]
         support SOCKS4A protocol, from dwmw2 AT infradead.org via bz#1482;
         "looks ok" markus@

commit ccf7e224ab73a8134175504ff09d72655ba50fb2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:23:06 2009 +1100

       - djm@cvs.openbsd.org 2009/01/01 21:17:36
         [kexgexs.c]
         fix hash calculation for KEXGEX: hash over the original client-supplied
         values and not the sanity checked versions that we acutally use;
         bz#1540 reported by john.smith AT arrows.demon.co.uk
         ok markus@

commit 7a60621d13de221d3de77784ea14baf72e0233f4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:22:34 2009 +1100

       - djm@cvs.openbsd.org 2009/01/01 21:14:35
         [channels.c]
         call channel destroy callbacks on receipt of open failure messages.
         fixes client hangs when connecting to a server that has MaxSessions=0
         set spotted by imorgan AT nas.nasa.gov; ok markus@

commit 17819015f0debf7dc6a4e908b6e830ff105e4685
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:20:17 2009 +1100

       - okan@cvs.openbsd.org 2008/12/30 00:46:56
         [sshd_config.5]
         add AllowAgentForwarding to available Match keywords list
         ok djm

commit a70ac76a87a7e45488fbc4cdc0d538b4c8483078
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:19:52 2009 +1100

       - stevesk@cvs.openbsd.org 2008/12/29 02:23:26
         [pathnames.h]
         no need to escape single quotes in comments

commit b2c17d4b173103fa8621f5a11de0ba56840e86af
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:18:03 2009 +1100

       - stevesk@cvs.openbsd.org 2008/12/29 01:12:36
         [ssh-keyscan.1]
         fix example, default key type is rsa for 3+ years; from
         frederic.perrin@resel.fr

commit 7375fe2c6d42e62b30a90e7a874f188c891061d5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:16:00 2009 +1100

       - stevesk@cvs.openbsd.org 2008/12/10 03:55:20
         [addrmatch.c]
         o cannot be NULL here but use xfree() to be consistent; ok djm@

commit b3f2c9fcaf082077ba42f86272011fe08ece3afa
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:15:30 2009 +1100

       - stevesk@cvs.openbsd.org 2008/12/09 22:37:33
         [clientloop.c]
         fix typo in error message

commit 62fd18a2b7e840fa3b961dafefae4ffdc5efeba6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:14:09 2009 +1100

       - sobrado@cvs.openbsd.org 2008/12/09 15:35:00
         [sftp.1 sftp.c]
         update for the synopses displayed by the 'help' command, there are a
         few missing flags; add 'bye' to the output of 'help'; sorting and spacing.
         jmc@ suggested replacing .Oo/.Oc with a single .Op macro.
         ok jmc@

commit c30def96e2c7cf3cb7f11182603d457fe8d093cf
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:13:39 2009 +1100

       - djm@cvs.openbsd.org 2008/12/09 04:32:22
         [auth2-chall.c]
         replace by-hand string building with xasprinf(); ok deraadt@

commit b53d8a18823cfa689b6a2353c6f82aaf364047bf
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 28 16:13:04 2009 +1100

       - stevesk@cvs.openbsd.org 2008/12/09 03:20:42
         [channels.c servconf.c]
         channel_print_adm_permitted_opens() should deal with all the printing
         for that config option.  suggested by markus@; ok markus@ djm@
         dtucker@

commit 0266677f0feb72b092f87480a4c8695c71db9684
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 21 20:29:20 2009 +1100

     - (djm) [contrib/ssh-copy-id.1 contrib/ssh-copy-id] bz#1492: Make
       ssh-copy-id copy id_rsa.pub by default (instead of the legacy "identity"
       key). Patch from cjwatson AT debian.org

commit 819dbb633af6e1970c6b3275882c85d458441500
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 21 16:46:26 2009 +1100

     - (djm) [channels.c] bz#1419: support "on demand" X11 forwarding via
       launchd on OS X; patch from vgiffin AT apple.com, slightly tweaked;
       ok dtucker@

commit 1598d6bc559b766e1fde83d9d9e4929d2694b090
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 21 16:04:24 2009 +1100

     - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X.
       Patch based on one from vgiffin AT apple.com; ok dtucker@

commit 2676791c38e16497c3d078d86c0a7608c4d946f1
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jan 7 20:50:08 2009 -0800

     - (tim) [configure.ac] Move check_for_libcrypt_later=1 in *-*-sysv5*) section.
       OpenServer 6 doesn't need libcrypt.

commit 351529ce3089bbfdc65488961016153c4e8fee03
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jan 7 10:04:12 2009 -0800

     - (tim) [configure.ac defines.h openbsd-compat/port-uw.c
       openbsd-compat/xcrypt.c] Add SECUREWARE support to OpenServer 6 SVR5 ABI.
       OK djm@ dtucker@

commit 7ebfad789f4e739cf5269860722cd44aab2929fb
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 9 14:12:33 2008 +1100

       - djm@cvs.openbsd.org 2008/12/09 03:02:37
         [sftp.1 sftp.c]
         correct sftp(1) and corresponding usage syntax;
         bz#1518 patch from imorgan AT nas.nasa.gov; ok deraadt@ improved diff jmc@

commit 0d772d9d11ceedd9432383019a75859813149673
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 9 14:12:05 2008 +1100

       - djm@cvs.openbsd.org 2008/12/09 02:58:16
         [readconf.c]
         don't leave junk (free'd) pointers around in Forward *fwd argument on
         failure; avoids double-free in ~C -L handler when given an invalid
         forwarding specification; bz#1539 report from adejong AT debian.org
         via Colin Watson; ok markus@ dtucker@

commit 1be2cc44961177897c3380ed7a8ec3641d5fd8ad
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 9 14:11:49 2008 +1100

       - djm@cvs.openbsd.org 2008/12/09 02:39:59
         [sftp.c]
         Deal correctly with failures in remote stat() operation in sftp,
         correcting fail-on-error behaviour in batchmode. bz#1541 report and
         fix from anedvedicky AT gmail.com; ok markus@

commit 586b00532f89e6166e6a74bdf3e801cc59449b84
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 9 14:11:32 2008 +1100

       - djm@cvs.openbsd.org 2008/12/09 02:38:18
         [clientloop.c]
         The ~C escape handler does not work correctly for multiplexed sessions -
         it opens a commandline on the master session, instead of on the slave
         that requested it. Disable it on slave sessions until such time as it
         is fixed; bz#1543 report from Adrian Bridgett via Colin Watson
         ok markus@

commit 16a73076b7a6e23989b76621e36c7adf8a587432
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 8 09:55:25 2008 +1100

       - markus@cvs.openbsd.org 2008/12/02 19:09:38
         [channels.c]
         s/remote_id/id/ to be more consistent with other code; ok djm@

commit 5a33ec68bc7cf35e4ad5f19e101fd41266ea9e18
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 8 09:55:02 2008 +1100

       - markus@cvs.openbsd.org 2008/12/02 19:08:59
         [serverloop.c]
         backout 1.149, since it's not necessary and openssh clients send
         broken CHANNEL_FAILURE/SUCCESS messages since about 2004; ok djm@

commit 8533c7801d598fa048a7a0ef33d4404ae5d67b3e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 8 09:54:40 2008 +1100

       - markus@cvs.openbsd.org 2008/12/02 19:01:07
         [clientloop.c]
         we have to use the recipient's channel number (RFC 4254) for
         SSH2_MSG_CHANNEL_SUCCESS/SSH2_MSG_CHANNEL_FAILURE messages,
         otherwise we trigger 'Non-public channel' error messages on sshd
         systems with clientkeepalive enabled; noticed by sturm; ok djm;

commit 7df2e400745219a87f9a9e445a9b89661d6fec42
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 8 09:35:36 2008 +1100

     - (djm) [configure.ac] bz#1538: better test for ProPolice/SSP: actually
       use some stack in main().
       Report and suggested fix from vapier AT gentoo.org

commit 23645649bb97d510a7eab33d36882ef34d2e2d1f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 1 21:42:13 2008 +1100

       - dtucker@cvs.openbsd.org 2008/11/30 11:59:26
         [monitor_fdpass.c]
         Retry sendmsg/recvmsg on EAGAIN and EINTR; ok djm@

commit 99d11a3ed2eb13e2f3ba13280d416369c45a30a6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 1 21:40:48 2008 +1100

       - markus@cvs.openbsd.org 2008/11/21 15:47:38
         [packet.c]
         packet_disconnect() on padding error, too.  should reduce the success
         probability for the CPNI-957037 Plaintext Recovery Attack to 2^-18
         ok djm@

commit 83795d61d277df3f090f12336ea3e21b6946ef4f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 1 21:34:28 2008 +1100

     - (dtucker) [contrib/cygwin/{Makefile,ssh-host-config}]  Add new doc files
       and tweak the is-sshd-running check in ssh-host-config.  Patch from
       vinschen at redhat com.

commit d3782b4e76481aaa12a32b7f239b815916615650
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Nov 23 19:05:53 2008 +1100

    cmsg thing was originally spotted by des

commit 69087eae6d44c2266b1bea1a3b3de5a7b7e551e1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Nov 23 14:03:19 2008 +1100

     - (dtucker) [monitor_fdpass.c] Reduce diff vs OpenBSD by moving some
        declarations, removing an unnecessary union member and adding whitespace.
        ok djm some time ago.

commit 0f4d2c02f275ad9f80ccd7435ffb407a8be61e9a
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Nov 18 21:26:41 2008 -0800

     - (tim) [addrmatch.c configure.ac] Some platforms do not have sin6_scope_id
       member of sockaddr_in6. Also reported in Bug 1491 by David Leonard. OK and
       feedback by djm@

commit edecb37a4b7e1b31f69139344af927e602f31c11
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 19 11:54:24 2008 +1100

    test commit

commit 4a6f62d4ae64ff8f868613a8e459720d4ebe263d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 11 16:55:25 2008 +1100

       - djm@cvs.openbsd.org 2008/11/10 02:06:35
         [regress/putty-ciphers.sh]
         PuTTY supports AES CTR modes, so interop test against them too

commit 22662e880f9c61f00908fe3dc27a6988ac2cccd0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 11 16:40:22 2008 +1100

       - stevesk@cvs.openbsd.org 2008/11/11 03:55:11
         [channels.c]
         for sshd -T print 'permitopen any' vs. 'permitopen' for case of no
         permitopen's; ok and input dtucker@

commit 49c31c42250e99af9170623094585d8851838a62
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 11 16:39:44 2008 +1100

       - stevesk@cvs.openbsd.org 2008/11/11 02:58:09
         [servconf.c]
         USE_AFS not referenced so remove #ifdef.  fixes sshd -T not printing
         kerberosgetafstoken. ok dtucker@
         (Id sync only, we still want the ifdef in portable)

commit 63917bd0dae6189147dc4cafaeaf6f1d91b14cfe
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 11 16:33:48 2008 +1100

       - tobias@cvs.openbsd.org 2008/11/09 12:34:47
         [session.c ssh.1]
         typo fixed (overriden -> overridden)
         ok espie, jmc

commit c6d744e9cdce63c250da4f87279d7da459ff4423
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 11 16:33:03 2008 +1100

       - dtucker@cvs.openbsd.org 2008/11/07 23:34:48
         [auth2-jpake.c]
         Move JPAKE define to make life easier for portable.  ok djm@

commit b57fab6b0b7b30d279bea89409a684b2793fd924
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 11 16:32:25 2008 +1100

       - stevesk@cvs.openbsd.org 2008/11/07 18:50:18
         [nchan.c]
         add space to some log/debug messages for readability; ok djm@ markus@

commit e15fb09847aca6ffaed30eb443e97d82930d509c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 11 16:31:43 2008 +1100

       - stevesk@cvs.openbsd.org 2008/11/07 00:42:12
         [ssh-keygen.c]
         spelling/typo in comment

commit ff4350e1b8b43bf55cfe91caa807574b02d9d02e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 11 16:31:05 2008 +1100

     - (dtucker) OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2008/11/05 11:22:54
         [servconf.c]
         passord -> password;
         fixes user/5975 from Rene Maroufi

commit 0164cb8a87cf3060f13954ce4e842ecbe8316817
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 5 16:30:31 2008 +1100

       - stevesk@cvs.openbsd.org 2008/11/05 03:23:09
         [clientloop.c ssh.1]
         add dynamic forward escape command line; ok djm@

commit 1a0442fce894dc09c50d882d9d19f8ed95977a3f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 5 16:30:06 2008 +1100

       - stevesk@cvs.openbsd.org 2008/11/04 19:18:00
         [readconf.c]
         because parse_forward() is now used to parse all forward types (DLR),
         and it malloc's space for host variables, we don't need to malloc
         here.  fixes small memory leaks.
    
         previously dynamic forwards were not parsed in parse_forward() and
         space was not malloc'd in that case.
    
         ok djm@

commit 01ed2272a1545336173bf3aef66fbccc3494c8d8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 5 16:20:46 2008 +1100

       - djm@cvs.openbsd.org 2008/11/04 08:22:13
         [auth.h auth2.c monitor.c monitor.h monitor_wrap.c monitor_wrap.h]
         [readconf.c readconf.h servconf.c servconf.h ssh2.h ssh_config.5]
         [sshconnect2.c sshd_config.5 jpake.c jpake.h schnorr.c auth2-jpake.c]
         [Makefile.in]
         Add support for an experimental zero-knowledge password authentication
         method using the J-PAKE protocol described in F. Hao, P. Ryan,
         "Password Authenticated Key Exchange by Juggling", 16th Workshop on
         Security Protocols, Cambridge, April 2008.
    
         This method allows password-based authentication without exposing
         the password to the server. Instead, the client and server exchange
         cryptographic proofs to demonstrate of knowledge of the password while
         revealing nothing useful to an attacker or compromised endpoint.
    
         This is experimental, work-in-progress code and is presently
         compiled-time disabled (turn on -DJPAKE in Makefile.inc).
    
         "just commit it.  It isn't too intrusive." deraadt@

commit 6f66d34308af787613d5525729953665f26367ee
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 5 16:12:54 2008 +1100

       - djm@cvs.openbsd.org 2008/11/04 07:58:09
         [auth.c]
         need unistd.h for close() prototype
         (ID sync only)

commit 7fc5c0f62158614eb42cac2a16fab8a23826ec74
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 5 16:12:11 2008 +1100

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2008/11/03 08:59:41
         [servconf.c]
         include MaxSessions in sshd -T output; patch from imorgan AT nas.nasa.gov

commit 250071fd776ecc8ef6b87b6aa9e75c28adaf7e06
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 20:18:12 2008 +1100

     - (djm) [contrib/sshd.pam.generic contrib/caldera/sshd.pam]
       [contrib/redhat/sshd.pam] Move pam_nologin to account group from
       incorrect auth group in example files;
       patch from imorgan AT nas.nasa.gov

commit 85dec7346395fcc14887a8cff91b81dc4d2e5304
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 20:16:01 2008 +1100

     - (djm) [contrib/caldera/ssh-host-keygen contrib/suse/rc.sshd]
       Make example scripts generate keys with default sizes rather than fixed,
       non-default 1024 bits; patch from imorgan AT nas.nasa.gov

commit f4b39538f45a6d8487fff3cf6b9e80e1293da06d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:28:21 2008 +1100

       - stevesk@cvs.openbsd.org 2008/11/03 02:44:41
         [readconf.c]
         fix comment

commit a279d252ab3be71bdcc0ccc3c691c95ca9a04c24
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:28:07 2008 +1100

       - stevesk@cvs.openbsd.org 2008/11/03 01:07:02
         [readconf.c]
         remove valueless comment

commit 660d7dabc080bb25c48b786e79f8f970d72dfbcd
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:27:52 2008 +1100

       - stevesk@cvs.openbsd.org 2008/11/02 00:16:16
         [ttymodes.c]
         protocol 2 tty modes support is now 7.5 years old so remove these
         debug3()s; ok deraadt@

commit a699d952e5e20be83fada0ff10ba8e02ad4dcd81
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:27:34 2008 +1100

       - stevesk@cvs.openbsd.org 2008/11/01 17:40:33
         [clientloop.c readconf.c readconf.h ssh.c]
         merge dynamic forward parsing into parse_forward(); 'i think this is OK' djm@

commit c1719f7f0d3f828ae5ca0ac339813a64169becef
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:27:07 2008 +1100

       - sobrado@cvs.openbsd.org 2008/11/01 11:14:36
         [ssh-keyscan.1 ssh-keyscan.c]
         the ellipsis is not an optional argument; while here, improve spacing.

commit a009433333ccb10b30e840435755eccd1e3fefd6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:26:35 2008 +1100

       - stevesk@cvs.openbsd.org 2008/11/01 06:43:33
         [channels.c]
         fix some typos in log messages; ok djm@

commit f7475d7e97900323195b918942d0cf8d0489279f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:26:18 2008 +1100

       - djm@cvs.openbsd.org 2008/11/01 04:50:08
         [sshconnect2.c]
         sprinkle ARGSUSED on dispatch handlers
         nuke stale unusued prototype

commit 2b20a92b7b404abe44d141461196a1d862214e06
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:26:00 2008 +1100

       - stevesk@cvs.openbsd.org 2008/10/31 15:05:34
         [dispatch.c]
         remove unused #define DISPATCH_MIN; ok markus@

commit e7261c7e368fe7d6694918e62fe23e24aa3e1fca
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:25:40 2008 +1100

       - stevesk@cvs.openbsd.org 2008/10/30 19:31:16
         [clientloop.c sshd.c]
         don't need to #include "monitor_fdpass.h"

commit a414cd3b196538a9ba5a0f0877bbf15f2dd4042d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:25:21 2008 +1100

       - stevesk@cvs.openbsd.org 2008/10/17 18:36:24
         [ssh_config.5]
         correct and clarify VisualHostKey; ok jmc@

commit ece92c8c5e03b1f927d0f8a8e6b3b37919c951c1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:25:03 2008 +1100

       - stevesk@cvs.openbsd.org 2008/10/14 18:11:33
         [sshconnect.c]
         use #define ROQUIET here; no binary change. ok dtucker@

commit de7532e1d42a5af8d1766e3b693a3d0f45d11160
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:24:45 2008 +1100

       - stevesk@cvs.openbsd.org 2008/10/10 16:43:27
         [ssh_config.5]
         use 'Privileged ports can be forwarded only when logging in as root on
         the remote machine.' for RemoteForward just like ssh.1 -R.
         ok djm@ jmc@

commit 2f54adabbb1e563ad639616ce7a93ffd17cc2de1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:24:16 2008 +1100

       - stevesk@cvs.openbsd.org 2008/10/10 05:00:12
         [key.c]
         typo in error message; ok djm@

commit b4acb47f5f2302efe74c71b51db2729f872c0766
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:23:45 2008 +1100

       - stevesk@cvs.openbsd.org 2008/10/10 04:55:16
         [scp.c]
         spelling in comment; ok djm@

commit c13c3ee44ad2bfbff925b0863095d8fcba5612ae
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:23:28 2008 +1100

       - jmc@cvs.openbsd.org 2008/10/09 06:54:22
         [ssh.c]
         add -y to usage();

commit 51bde6000ac9887e071dcbbaa99bce68ee42020f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:23:10 2008 +1100

       - djm@cvs.openbsd.org 2008/10/09 03:50:54
         [servconf.c sshd_config.5]
         support setting PermitEmptyPasswords in a Match block
         requested in PR3891; ok dtucker@

commit e272a5bb2937f1a8297c412c9312c38133f829c1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:22:37 2008 +1100

       - djm@cvs.openbsd.org 2008/10/08 23:34:03
         [ssh.1 ssh.c]
         Add -y option to force logging via syslog rather than stderr.
         Useful for daemonised ssh connection (ssh -f). Patch originally from
         and ok'd by markus@

commit c4d1b36cc2fb89566fe01b990abf8b635e0dce74
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:22:09 2008 +1100

    aadt@cvs.openbsd.org 2008/10/03 23:56:28
         [sshconnect2.c]
         Repair strnvis() buffersize of 4*n+1, with termination gauranteed by the
         function.
         spotted by des@freebsd, who commited an incorrect fix to the freebsd tree
         and (as is fairly typical) did not report the problem to us.  But this fix
         is correct.
         ok djm

commit 49b78d4fbc138a252fc083c67d6b3750477d92a1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:21:21 2008 +1100

      - jmc@cvs.openbsd.org 2008/10/03 13:08:12
         [sshd.8]
         do not give an example of how to chmod files: we can presume the user
         knows that. removes an ambiguity in the permission of authorized_keys;
         ok deraadt

commit d58f56000c95f2c4eca22b4f89f19c557e23d919
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:20:49 2008 +1100

       - millert@cvs.openbsd.org 2008/10/02 14:39:35
         [session.c]
         Convert an unchecked strdup to xstrdup.  OK deraadt@

commit 456e6f0ebb27b4851363422aa9974b0848d4b168
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:20:10 2008 +1100

       - markus@cvs.openbsd.org 2008/09/11 14:22:37
         [compat.c compat.h nchan.c ssh.c]
         only send eow and no-more-sessions requests to openssh 5 and newer;
         fixes interop problems with broken ssh v2 implementations; ok djm@

commit 15bce6b8f0e7280aaf26b97a316a991990fc0ca0
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:19:12 2008 +1100

       - djm@cvs.openbsd.org 2008/09/06 12:24:13
         [kex.c]
         OpenSSL 0.9.8h supplies a real EVP_sha256 so we do not need our
         replacement anymore
         (ID sync only for portable - we still need this)

commit ad793d59a95a3b69f705c46bcf4f6e720b65f32f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:17:57 2008 +1100

       - djm@cvs.openbsd.org 2008/08/21 04:09:57
         [session.c]
         allow ForceCommand internal-sftp with arguments. based on patch from
         michael.barabanov AT gmail.com; ok markus@

commit fa51b1626c56b848d488d356be897dc41751b490
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:17:33 2008 +1100

       - krw@cvs.openbsd.org 2008/08/02 04:29:51
         [ssh_config.5]
         whitepsace -> whitespace. From Matthew Clarke via bugs@.

commit c674d580dc9626ed3bb8886f34bd9dffef851a0a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:16:57 2008 +1100

      - markus@cvs.openbsd.org 2008/07/31 14:48:28
         [sshconnect2.c]
         don't allocate space for empty banners; report t8m at centrum.cz;
         ok deraadt

commit c6aadd994d0ed79f5606b7061d576d514fd71cd7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:16:20 2008 +1100

       - grunk@cvs.openbsd.org 2008/07/25 07:05:16
         [key.c]
         In random art visualization, make sure to use the end marker only at the
         end.  Initial diff by Dirk Loss, tweaks and ok djm@

commit 9f6fb56ab83da2e795e4a8eb863992701fd83516
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:15:44 2008 +1100

       - grunk@cvs.openbsd.org 2008/07/25 06:56:35
         [ssh_config]
         Add VisualHostKey to example file, ok djm@

commit 718ed5040196266d623a98aa61873bb50a7bf564
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 3 19:15:20 2008 +1100

       - sthen@cvs.openbsd.org 2008/07/24 23:55:30
         [ssh-keygen.1]
         Add "ssh-keygen -F -l" to synopsis (displays fingerprint from
         known_hosts).  ok djm@

commit c570ff7fa4a68f57ff8938ba0672ddba9c9a23f9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 6 18:20:57 2008 +1000

     - (dtucker) [config.guess config.sub] Update to latest versions from
       http://git.savannah.gnu.org/gitweb/ (2008-04-14 and 2008-06-16
       respectively).

commit 661f63b7d2a89d91c29691ba8d01b825600e6789
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 30 07:32:37 2008 +1000

     - (dtucker) [openbsd-compat/bsd-poll.c] correctly check for number of FDs
       larger than FD_SETSIZE (OpenSSH only ever uses poll with one fd).  Patch
       from Nicholas Marriott.

commit 212f0b08790c415648db250797b1b060b62a015d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 23 17:42:29 2008 +1000

     - (djm) [servconf.c] Print UsePAM option in config test mode (when it
       has been compiled in); report from nix-corp AT esperi.org.uk
       ok dtucker@

commit 6ef430dcc357f9e8fe02a057840538939b45602a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 23 17:40:04 2008 +1000

       - djm@cvs.openbsd.org 2008/07/23 07:36:55
         [servconf.c]
         do not try to print options that have been compile-time disabled
         in config test mode (sshd -T); report from nix-corp AT esperi.org.uk
         ok dtucker@

commit 8f42e9b75a55401fa9dfdf14d49fbe5396c6ce92
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 21 18:22:25 2008 +1000

     - (djm) Release OpenSSH-5.1

commit 1f8909c2c270ebd8a1c949452b9222300b2ffda1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 21 18:21:52 2008 +1000

     - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Update version number in README and RPM specs

commit aaae43e7d3b6d73f0d9a10f214b4c31e5211da24
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 21 18:21:05 2008 +1000

       - djm@cvs.openbsd.org 2008/07/21 08:19:07
         [version.h]
         openssh-5.1

commit aa5f433287ca3ab37b8c60eb029cf11a7d5b3971
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 21 18:20:39 2008 +1000

       - jmc@cvs.openbsd.org 2008/07/18 22:51:01
         [sftp-server.8]
         no need for .Pp before or after .Sh;

commit 2e28d8622d7b2227669a12630ea2c340e651c204
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 17 19:15:43 2008 +1000

     - (djm) [sshconnect2.c] vis.h isn't available everywhere

commit 9a3f2b4cc3f9eb03613e5fe022b7afa9d2fe950a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 17 19:03:49 2008 +1000

     - (dtucker) [openbsd-compat/bsd-cygwin_util.c]  Remove long-unneeded compat
       code, replace with equivalent cygwin library call.  Patch from vinschen
       at redhat.comi, ok djm@.

commit a1d03a50692a2edbe5a6e1e652c5a12e1de07721
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 17 18:57:19 2008 +1000

       - djm@cvs.openbsd.org 2008/07/17 08:51:07
         [auth2-hostbased.c]
         strip trailing '.' from hostname when HostbasedUsesNameFromPacketOnly=yes
         report and patch from res AT qoxp.net (bz#1200); ok markus@

commit 7ba0ca7f6fa0c517822051412cf9f0e7b35304d4
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 17 18:57:06 2008 +1000

       - djm@cvs.openbsd.org 2008/07/17 08:48:00
         [sshconnect2.c]
         strnvis preauth banner; pointed out by mpf@ ok markus@

commit 6ef17495e9c867ef01860a7c97fc1f24ef7aa8db
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 16 22:42:06 2008 +1000

       - djm@cvs.openbsd.org 2008/07/16 11:52:19
         [channels.c]
         this loop index should be automatic, not static

commit b9d3bee0031e9f6acef85556eb6418a728e605f5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 16 22:40:52 2008 +1000

       - djm@cvs.openbsd.org 2008/07/16 11:51:14
         [clientloop.c]
         rename variable first_gc -> last_gc (since it is actually the last
         in the list).

commit 94717b0be1860c0c1abc9331388689e3ffbedea3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 16 21:17:23 2008 +1000

       - djm@cvs.openbsd.org 2008/07/15 02:23:14
         [sftp.1]
         number of pipelined requests is now 64;
         prodded by Iain.Morgan AT nasa.gov

commit c4657ef1818c67e91115389a69ef783412fd54b7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 14 21:37:36 2008 +1000

     - (djm) [openbsd-compat/fake-rfc2553.c openbsd-compat/fake-rfc2553.h]
       return EAI_FAMILY when trying to lookup unsupported address family;
       from vinschen AT redhat.com

commit 1fc231cbb50f899a1aa6c919c4d7750876b01f2e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 14 12:12:52 2008 +1000

     - (djm) [contrib/cygwin/Makefile contrib/cygwin/ssh-host-config]
       [contrib/cygwin/ssh-user-config contrib/cygwin/sshd-inetd]
       Revamped and simplified Cygwin ssh-host-config script that uses
       unified csih configuration tool. Requires recent Cygwin.
       Patch from vinschen AT redhat.com

commit 276571c29d0e8a0c0e2d75e18ff57d63eb26f68c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 14 12:09:57 2008 +1000

       - djm@cvs.openbsd.org 2008/07/14 01:55:56
         [sftp-server.8]
         mention requirement for /dev/log inside chroot when using sftp-server
         with ChrootDirectory

commit 36d7056f4de36fa40cf9e16d7d21c64ae8763f80
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 14 12:04:43 2008 +1000

     - (djm) [umac.c] Rename variable s/buffer_ptr/bufp/ to avoid clash;
       reported by cristian.ionescu-idbohrn AT axis.com

commit 639ce593d4f00a1414dce59b45036385cfd4c627
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 14 12:03:27 2008 +1000

     - (djm) [openbsd-compat/rresvport.c] Add unistd.h for missing close()
       prototype; reported by cristian.ionescu-idbohrn AT axis.com

commit ce02e5e09eb50ed9a67a3067a001092b73c0d514
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 14 12:02:24 2008 +1000

     - (djm) [openbsd-compat/bindresvport.c] Rename variables s/sin/in/ to
       avoid clash with sin(3) function; reported by
       cristian.ionescu-idbohrn AT axis.com

commit 7f980d1ac760ac7bdec1de467c6ee7071057370a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 14 11:29:24 2008 +1000

       - djm@cvs.openbsd.org 2008/07/13 22:16:03
         [sftp.c]
         increase number of piplelined requests so they properly fill the
         (recently increased) channel window. prompted by rapier AT psc.edu;
         ok markus@

commit 163886ff7170f031b59b36d0a76165757d680070
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 14 11:28:58 2008 +1000

       - djm@cvs.openbsd.org 2008/07/13 22:13:07
         [channels.c]
         use struct sockaddr_storage instead of struct sockaddr for accept(2)
         address argument. from visibilis AT yahoo.com in bz#1485; ok markus@

commit 81dec0589a487b14054657cc5f3aff62d56511da
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 14 11:28:29 2008 +1000

       - sthen@cvs.openbsd.org 2008/07/13 21:22:52
         [ssh-keygen.c]
         Change "ssh-keygen -F [host] -l" to not display random art unless
         -v is also specified, making it consistent with the manual and other
         uses of -l.
         ok grunk@

commit a034baf1b958a029a608b231ae4ce95cc24f70e1
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 12 17:12:49 2008 +1000

       - djm@cvs.openbsd.org 2008/07/12 05:33:41
         [scp.1]
         better description for -i flag:
         s/RSA authentication/public key authentication/

commit 2bcb866327ed909916c77bcb36fd4770b09fe534
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 12 17:12:29 2008 +1000

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2008/07/12 04:52:50
         [channels.c]
         unbreak; move clearing of cctx struct to before first use
         reported by dkrause@

commit b61f3fc31ff6eb1693431e21fb1086c33eb66549
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 11 17:36:48 2008 +1000

       - markus@cvs.openbsd.org 2008/07/10 18:08:11
         [clientloop.c monitor.c monitor_wrap.c packet.c packet.h sshd.c]
         sync v1 and v2 traffic accounting; add it to sshd, too;
         ok djm@, dtucker@

commit dda5fffb847cd98164cb4020e3287a9960c37aaa
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 11 17:35:37 2008 +1000

       - markus@cvs.openbsd.org 2008/07/10 18:05:58
         [channels.c]
         missing bzero; from mickey; ok djm@

commit 87dd5f2804a93010e289b1cbf53916688ddc1bc8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 11 17:35:09 2008 +1000

       - stevesk@cvs.openbsd.org 2008/07/07 23:32:51
         [key.c]
         /*NOTREACHED*/ for lint warning:
           warning: function key_equal falls off bottom without returning value
         ok djm@

commit 2f7faf19d55b8b0f591f86f1c0bd35f527c4b351
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 11 17:34:35 2008 +1000

       - stevesk@cvs.openbsd.org 2008/07/07 00:31:41
         [ttymodes.c]
         we don't need arg after the debug3() was removed.  from lint.
         ok djm@

commit 73193b369333e9c2409aeef6caa9f4cefa8118a1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 9 21:07:19 2008 +1000

     - (djm) [configure.ac] Add -Wformat-security to CFLAGS for gcc 3.x and 4.x

commit 7acf550aeb4a0197095282bcbc845ec917599540
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 9 20:54:37 2008 +1000

     - (djm) [auth.c] Missing unistd.h for close()

commit 773a7b98f9d4e0767dfdd270a339e9f31ca4edea
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 9 20:54:05 2008 +1000

     - (djm) [auth1.c] Fix format string vulnerability in protocol 1 PAM
       account check failure path. The vulnerable format buffer is supplied
       from PAM and should not contain attacker-supplied data.

commit d9648eee7cacf633c79ad0f50d7e3215200d2920
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 9 00:21:12 2008 +1000

     - (djm) [Makefile.in] Print "all tests passed" when all regress tests pass

commit c9c96f2e28a70b01f5739159f274f845a396cea9
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 5 15:17:48 2008 +1000

       - djm@cvs.openbsd.org 2008/07/05 05:16:01
         [PROTOCOL]
         grammar

commit ff2e492028609279e6de882985433c130518944f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 5 09:52:03 2008 +1000

     - (djm) [configure.ac] unbreak: remove extra closing brace

commit 42743cb6baad2308d96c4cf63a9bc2ad56a06e59
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 5 09:50:23 2008 +1000

     - (djm) [Makefile.in] Pass though pass to conch for interop tests

commit 0b4d48ba74cca40e983d96ba13e66908cf5b5666
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 5 09:44:53 2008 +1000

       - djm@cvs.openbsd.org 2008/07/04 23:30:16
         [auth1.c auth2.c]
         Make protocol 1 MaxAuthTries logic match protocol 2's.
         Do not treat the first protocol 2 authentication attempt as
         a failure IFF it is for method "none".
         Makes MaxAuthTries' user-visible behaviour identical for
         protocol 1 vs 2.
         ok dtucker@

commit d874fa517be97bdd57b631fd409c337761f1ab46
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 5 09:40:56 2008 +1000

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2008/07/04 23:08:25
         [packet.c]
         handle EINTR in packet_write_poll()l ok dtucker@

commit 20d16947190d17f9ed8db983bee6cb7bd20722b5
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 5 09:36:58 2008 +1000

     - (djm) [atomicio.c configure.ac] Disable poll() fallback in atomiciov for
       Tru64. readv doesn't seem to be a comparable object there.
       bz#1386, patch from dtucker@ ok me

commit 22989f1b5e845830abb2f0598907a9894e9fcb4b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 5 08:59:43 2008 +1000

     - (djm) [auth.c] Fixed test for locked account on HP/UX with shadowed
       passwords disabled. bz#1083 report & patch from senthilkumar_sen AT
       hotpop.com, w/ dtucker@

commit d8968adb5faef58508bb5e7dab7cdbaf5b0e90d5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 4 23:10:49 2008 +1000

     - (djm) [atomicio.c channels.c clientloop.c defines.h includes.h]
       [packet.c scp.c serverloop.c sftp-client.c ssh-agent.c ssh-keyscan.c]
       [sshd.c] Explicitly handle EWOULDBLOCK wherever we handle EAGAIN, on
       some platforms (HP nonstop) it is a distinct errno;
       bz#1467 reported by sconeu AT yahoo.com; ok dtucker@

commit b01bac109bd2fc6b3093fe4aeb31a125be8f2a4e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 4 17:11:30 2008 +1000

       - djm@cvs.openbsd.org 2008/06/30 10:43:03
         [regress/conch-ciphers.sh]
         explicitly disable conch options that could interfere with the test

commit 5d6d70a8429824b3d0fb3a0faf70333c062c8925
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 4 17:10:30 2008 +1000

       - djm@cvs.openbsd.org 2008/06/30 10:31:11
         [putty-transfer.sh putty-kex.sh putty-ciphers.sh]
         remove "set -e" left over from debugging

commit 8c7a14ea2897c384d4c2ebbb0d96eb8f84544d6a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 4 17:08:58 2008 +1000

       - djm@cvs.openbsd.org 2008/06/30 08:07:34
         [key-options.sh]
         shell portability: use "=" instead of "==" in test(1) expressions,
         double-quote string with backslash escaped /

commit f7fa706e70cc3d005acca995d022d65227185dcd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 4 14:10:19 2008 +1000

     - (dtucker) [sftp-server.c] Bug #1447: fall back to racy rename if link
       returns EXDEV.  Patch from Mike Garrison, ok djm@

commit 2784f1fcc3b6c41cdeb8e7d850044c5ee61cbbcd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 4 13:51:45 2008 +1000

       - dtucker@cvs.openbsd.org 2008/07/04 03:47:02
         [monitor.c]
         Make debug a little clearer.  ok djm@

commit b03fd02aede5cb796aea417a7a68e42e7f998d62
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 4 13:51:12 2008 +1000

       - djm@cvs.openbsd.org 2008/07/04 03:44:59
         [servconf.c groupaccess.h groupaccess.c]
         support negation of groups in "Match group" block (bz#1315); ok dtucker@

commit f5cafb0c850a3b6cc7db27fa79afbd4fb185f8f2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 4 12:54:25 2008 +1000

       - otto@cvs.openbsd.org 2008/07/03 21:46:58
         [auth2-pubkey.c]
         avoid nasty double free; ok dtucker@ djm@

commit 9a2a60986bf33414acf63b6d92d93a2f690c3a17
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 4 12:53:50 2008 +1000

       - djm@cvs.openbsd.org 2008/07/02 13:47:39
         [ssh.1 ssh.c]
         When forking after authentication ("ssh -f") with ExitOnForwardFailure
         enabled, delay the fork until after replies for any -R forwards have
         been seen. Allows for robust detection of -R forward failure when
         using -f (similar to bz#92); ok dtucker@

commit 7c99b1ceda9f6bfb1dc36bae30de0c6a49c6ec69
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 4 12:53:23 2008 +1000

       - djm@cvs.openbsd.org 2008/07/02 13:30:34
         [auth2.c]
         really really remove the freebie "none" auth try for protocol 2

commit 4230a5dc305d1b39bc118befcc1ccfe933281b75
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 2 22:56:09 2008 +1000

       - djm@cvs.openbsd.org 2008/07/02 12:36:39
         [auth2-none.c auth2.c]
         Make protocol 2 MaxAuthTries behaviour a little more sensible:
         Check whether client has exceeded MaxAuthTries before running
         an authentication method and skip it if they have, previously it
         would always allow one try (for "none" auth).
         Preincrement failure count before post-auth test - previously this
         checked and postincremented, also to allow one "none" try.
         Together, these two changes always count the "none" auth method
         which could be skipped by a malicious client (e.g. an SSH worm)
         to get an extra attempt at a real auth method. They also make
         MaxAuthTries=0 a useful way to block users entirely (esp. in a
         sshd_config Match block).
         Also, move sending of any preauth banner from "none" auth method
         to the first call to input_userauth_request(), so worms that skip
         the "none" method get to see it too.

commit 33c787f23c0267c679ad3e3f8bc4679c6ced5ea3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 2 22:37:30 2008 +1000

       - dtucker@cvs.openbsd.org 2008/07/02 12:03:51
         [auth-rsa.c auth.c auth2-pubkey.c auth.h]
         Merge duplicate host key file checks, based in part on a patch from Rob
         Holland via bz #1348 .  Also checks for non-regular files during protocol
         1 RSA auth.  ok djm@

commit 7499b0cca021f14c615cbfef170aba3e24cf8d4d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 2 22:35:43 2008 +1000

       - djm@cvs.openbsd.org 2008/07/02 02:24:18
         [sshd_config sshd_config.5 sshd.8 servconf.c]
         increase default size of ssh protocol 1 ephemeral key from 768 to 1024
         bits; prodded by & ok dtucker@ ok deraadt@

commit f2e21dec685ac9bd265f442173a7c4f00972efcd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 2 22:35:00 2008 +1000

       - stevesk@cvs.openbsd.org 2008/07/01 23:12:47
         [PROTOCOL.agent]
         fix some typos; ok djm@

commit d7bdc0c8e8acc5f0621046a6b47066d72ad3462f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 2 22:34:30 2008 +1000

       - dtucker@cvs.openbsd.org 2008/07/01 07:24:22
         [sshconnect.c sshd.c]
         Send CR LF during protocol banner exchanges, but only for Protocol 2 only,
         in order to comply with RFC 4253.  bz #1443, ok djm@

commit 068e01f53f80e94491fd525f689c33b21948f8dd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 2 22:33:55 2008 +1000

       - dtucker@cvs.openbsd.org 2008/07/01 07:20:52
         [sshconnect.c]
         Check ExitOnForwardFailure if forwardings are disabled due to a failed
         host key check.  ok djm@

commit 1f781b194fb83f8bc40d448de8162890d1eea93f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 2 22:33:16 2008 +1000

       - djm@cvs.openbsd.org 2008/06/30 12:18:34
         [PROTOCOL]
         clarify that eow@openssh.com is only sent on session channels

commit 8748b965224cea8811d30c8fe9b5d2113d7e49de
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 2 22:32:43 2008 +1000

       - djm@cvs.openbsd.org 2008/06/30 12:16:02
         [nchan.c]
         only send eow@openssh.com notifications for session channels; ok! markus@

commit 8810dd41b9c5903452badac57aee3dee24c20be5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 2 22:32:14 2008 +1000

       - djm@cvs.openbsd.org 2008/06/30 12:15:39
         [serverloop.c]
         only pass channel requests on session channels through to the session
         channel handler, avoiding spurious log messages; ok! markus@

commit 00f00f0451087cf8593f11758e0973fa7d9349bc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 2 22:31:31 2008 +1000

        - djm@cvs.openbsd.org 2008/06/30 08:05:59
          [PROTOCOL.agent]
          typo: s/constraint_date/constraint_data/

commit a766cea689dede98f2e2988119e27b5321144e84
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 30 08:12:37 2008 +1000

     - (djm) [regress/Makefile] search for conch by path, like we do putty

commit 4268a136d4da035a3d53dd6bc52ff1221240d9d8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 30 08:07:56 2008 +1000

       - djm@cvs.openbsd.org 2008/06/28 13:57:25
         [regress/Makefile regress/test-exec.sh regress/conch-ciphers.sh]
         very basic regress test against Twisted Conch in "make interop"
         target (conch is available in ports/devel/py-twisted/conch);
         ok markus@

commit d9bfce83b73409f1e37cb051aaa28c307e0e28e1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 30 08:06:51 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/11 23:11:40
         [Makefile]
         Don't run cipher-speed test by default; mistakenly enabled by me

commit 2e80cf2b63ada08b7ff7d6a80fca254c231559aa
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 30 08:06:25 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/10 23:13:43
         [regress/Makefile regress/key-options.sh]
         Add regress test for key options.  ok djm@

commit 1e18beb1e72276e4d240560725fa916c1b068ff3
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 30 00:07:00 2008 +1000

       - djm@cvs.openbsd.org 2008/06/28 14:08:30
         [PROTOCOL PROTOCOL.agent]
         document the protocol used by ssh-agent; "looks ok" markus@

commit 471db5c2eb4c25b9e7c9257e811b07067ef731a4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 30 00:05:48 2008 +1000

       - djm@cvs.openbsd.org 2008/06/28 14:05:15
         [ssh-agent.c]
         reset global compat flag after processing a protocol 2 signature
         request with the legacy DSA encoding flag set; ok markus

commit 1cfadabc0e84551a3caa87c24cba6a0f2db43945
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 30 00:05:21 2008 +1000

       - djm@cvs.openbsd.org 2008/06/28 13:58:23
         [ssh-agent.c]
         refuse to add a key that has unknown constraints specified;
         ok markus

commit bd45afb5ad470ad78b462e3a34faa56b68c98abf
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 30 00:04:57 2008 +1000

       - djm@cvs.openbsd.org 2008/06/28 07:25:07
         [PROTOCOL]
         spelling fixes

commit 8639920a9b2322b6f54c5511be74b1295591c4c5
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 30 00:04:31 2008 +1000

       - jmc@cvs.openbsd.org 2008/06/26 21:11:46
         [ssh.1]
         add VisualHostKey to the list of options listed in -o;

commit 1028824e5c456dc3d8a57fe5bae539beb4a95432
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 30 00:04:03 2008 +1000

       - grunk@cvs.openbsd.org 2008/06/26 11:46:31
         [readconf.c readconf.h ssh.1 ssh_config.5 sshconnect.c]
         Move SSH Fingerprint Visualization away from sharing the config option
         CheckHostIP to an own config option named VisualHostKey.
         While there, fix the behaviour that ssh would draw a random art picture
         on every newly seen host even when the option was not enabled.
         prodded by deraadt@, discussions,
         help and ok markus@ djm@ dtucker@

commit 2e9cf4906926fba123d415fdac8465b94bcd38b3
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 29 22:47:04 2008 +1000

       - djm@cvs.openbsd.org 2008/06/26 09:19:40
         [dh.c dh.h moduli.c]
         when loading moduli from /etc/moduli in sshd(8), check that they
         are of the expected "safe prime" structure and have had
         appropriate primality tests performed;
         feedback and ok dtucker@

commit 9e720284fe63aa8e59983b880447ed4ae768387c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 29 22:46:35 2008 +1000

       - djm@cvs.openbsd.org 2008/06/26 06:10:09
         [sftp-client.c sftp-server.c]
         allow the sftp chmod(2)-equivalent operation to set set[ug]id/sticky
         bits. Note that this only affects explicit setting of modes (e.g. via
         sftp(1)'s chmod command) and not file transfers. (bz#1310)
         ok deraadt@ at c2k8

commit 007132a7c92e603ffb76862cedb28f3165582731
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 29 22:45:37 2008 +1000

       - otto@cvs.openbsd.org 2008/06/25 11:13:43
         [key.c]
         add key length to visual fingerprint; zap magical constants;
         ok grunk@ djm@

commit f184bcf89e0925921583f857858871fdf81ce337
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 29 22:45:13 2008 +1000

     - (djm) OpenBSD CVS Sync
       - martynas@cvs.openbsd.org 2008/06/21 07:46:46
         [sftp.c]
         use optopt to get invalid flag, instead of return value of getopt,
         which is always '?';  ok djm@

commit 493f0324402bc489ba150b0e4c6c8a9f9146cac1
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 28 16:01:35 2008 +1000

     - (djm) [RFC.nroff contrib/cygwin/Makefile contrib/suse/openssh.spec]
       RFC.nroff lacks a license, remove it (it is long gone in OpenBSD).

commit f299ff8c1f412570080192c77845fa1dd40ac945
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 26 16:01:56 2008 +1000

     - (djm) [ contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Include moduli.5 in RPM spec files.

commit 60dcc625356a5f8e7842f299c5845343ed39ac9a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 26 15:59:32 2008 +1000

     - (djm) [Makefile.in moduli.5] Include moduli(5) manpage from OpenBSD.
       (bz#1372)

commit 1a48aecfbca9459ff5bfe07952d0914fda754bcb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 16 23:35:56 2008 +1000

     - (dtucker) [channels.c] isatty -> is_tty here too.

commit ed3cdc0a7c6e2a782c1e4a6781f11c1defa494b1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 16 23:29:18 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/16 13:22:53
         [session.c channels.c]
         Rename the isatty argument to is_tty so we don't shadow
         isatty(3).  ok markus@

commit 87d5e0976c808fc1b5800710529d62ece634ee75
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 16 23:27:34 2008 +1000

    Remove extra  tag

commit d310d51badf6bbd1df56c8a0971d24e2d3e61887
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 16 07:59:23 2008 +1000

       - djm@cvs.openbsd.org 2008/06/15 20:06:26
         [channels.c channels.h session.c]
         don't call isatty() on a pty master, instead pass a flag down to
         channel_set_fds() indicating that te fds refer to a tty. Fixes a
         hang on exit on Solaris (bz#1463) in portable but is actually
         a generic bug; ok dtucker deraadt markus

commit 307c1d10a78218fc2a67c3b285f90e701415004b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 16 07:56:20 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/15 16:58:40
         [servconf.c sshd_config.5]
         Allow MaxAuthTries within a Match block.  ok djm@

commit c62a5af29ab1515f6093d84588f86a398e696a9a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 16 07:55:46 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/15 16:55:38
         [sshd_config.5]
         MaxSessions is allowed in a Match block too

commit c7ce0da3b07a0318fa8407991f47c09a7748f4f6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 16 07:55:06 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/14 19:42:10
         [scp.1]
         Mention that scp follows symlinks during -r.  bz #1466,
         from nectar at apple

commit 6051c94a0a7766111ed16f2936b73098fa354661
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 16 07:53:16 2008 +1000

       - djm@cvs.openbsd.org 2008/06/14 18:33:43
         [session.c]
         suppress the warning message from chdir(homedir) failures
         when chrooted (bz#1461); ok dtucker

commit 6ca16c63c273cf17a8ab10b92f0a5d0a12d23488
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 16 07:50:58 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/14 17:07:11
         [sshd.c]
         ensure default umask disallows at least group and world write; ok djm@

commit 2a6284782de821a5c741d6bcd4f05cf650df34c5
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 16 07:50:24 2008 +1000

     - OpenBSD CVS Sync
       - dtucker@cvs.openbsd.org 2008/06/14 15:49:48
         [sshd.c]
         wrap long line at 80 chars

commit 330c93f68a8cbbf416b2e2c9150e0a9b8964a51b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 16 02:27:48 2008 +1000

     - (dtucker) [configure.ac] Enable -fno-builtin-memset when using gcc.

commit 8b7ab960df02da128c56283ce14b78227ac2d200
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 15 10:55:34 2008 +1000

     - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction
       replacement code; patch from ighighi AT gmail.com in bz#1240;
       ok dtucker

commit 30fd49e606169c57fef2be66594e24991b2fb747
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 14 09:14:46 2008 +1000

     - (dtucker) [configure.ac] Bug #1276: avoid linking against libgssapi, which
       despite its name doesn't seem to implement all of GSSAPI.  Patch from
       Jan Engelhardt, sanity checked by Simon Wilkinson.

commit f6bffb13911564cc80c01c10b71acfba4f315315
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 14 09:04:26 2008 +1000

       - grunk@cvs.openbsd.org 2008/06/13 20:13:26
         [ssh.1]
         Explain the use of SSH fpr visualization using random art, and cite the
         original scientific paper inspiring that technique.
         Much help with English and nroff by jmc@, thanks.

commit 03ccc9b142519ac8167951fac27d977dc280b79a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 14 09:02:25 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/13 18:55:22
         [scp.c]
         Prevent -Wsign-compare warnings on LP64 systems.  bz #1192, ok deraadt@

commit 47e713be94464b6ed7be0186e79c3f7b73f99936
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 14 09:01:54 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/13 17:21:20
         [mux.c]
         Friendlier error messages for mux fallback.  ok djm@

commit d9526a5e96e4515afec28df42b13d08bd02f754a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 14 09:01:24 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/13 14:18:51
         [auth2-pubkey.c auth-rhosts.c]
         Include unistd.h for close(), prevents warnings in -portable

commit f2c16d30b456c3b149999e91d16bf28f82197d3f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 14 08:59:49 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/13 13:56:59
         [monitor.c]
         Clear key options in the monitor on failed authentication, prevents
         applying additional restrictions to non-pubkey authentications in
         the case where pubkey fails but another method subsequently succeeds.
         bz #1472, found by Colin Watson, ok markus@ djm

commit 99bb7619d42476a98be48eae7a0237d6dc750cd3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 22:02:50 2008 +1000

       - deraadt@cvs.openbsd.org 2008/06/13 09:44:36
         [packet.c]
         compile on older gcc; no decl after code

commit f387e59d52151943130670d7eb52e1e77201ae6f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 15:03:14 2008 +1000

      - (dtucker) [openbsd-compat/setenv.c] Make offsets size_t to prevent
        compiler warnings on some platforms.  Based on a discussion with otto@

commit 06db584e9de9d904a09300f09feed7f82026d241
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 14:51:28 2008 +1000

       - djm@cvs.openbsd.org 2008/06/13 04:40:22
         [auth2-pubkey.c auth-rhosts.c]
         refuse to read ~/.shosts or ~/.ssh/authorized_keys that are not
         regular files; report from Solar Designer via Colin Watson in bz#1471
         ok dtucker@ deraadt@

commit 7517b5bd3155a4e29beb6168129a60f022ea9e9f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 14:48:59 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/13 01:38:23
         [misc.c]
         upcast uid to long with matching %ld, prevents warnings in portable

commit 2c91b28a6da35f2e499414f8f6585f4f11410935
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 12:40:55 2008 +1000

      - (dtucker) [umac.c] STORE_UINT32_REVERSED and endian_convert are never used
        on big endian machines, so ifdef them for little endian only to prevent
        unused function warnings.

commit 2c1eb82695ff4628ad61bc5a9e70fb9d7826446f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 11:13:13 2008 +1000

      - (dtucker) [auth-sia.c] Bug #1241: support password expiry on Tru64 SIA
        systems.  Patch from R. Scott Bailey.

commit c7e030fd78594100cce362db230ee75ddb38a852
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 10:58:50 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/13 00:51:47
         [mac.c]
         upcast another size_t to u_long to match format

commit 1adfd368c48f8b9b70a33a7094cff8930bfdf72e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 10:58:10 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/13 00:47:53
         [mux.c]
         upcast size_t to u_long to match format arg; ok djm@

commit 61b0695273134a2eb168171d843132ed874e9971
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 10:28:57 2008 +1000

      - (dtucker) [defines.h] Bug #1112: __dead is, well dead. Based on a patch
        from Todd Vierling.

commit ca19bfe2546f280f10795bae5e0ec296623de880
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 10:24:03 2008 +1000

       - djm@cvs.openbsd.org 2008/06/13 00:16:49
         [mux.c]
         fall back to creating a new TCP connection on most multiplexing errors
         (socket connect fail, invalid version, refused permittion, corrupted
         messages, etc.); bz #1329 ok dtucker@

commit f8b7eb7c3c77625845f4e2a844cc57c0496d414e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 10:22:54 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/13 00:12:02
         [sftp.h log.h]
         replace __dead with __attribute__((noreturn)), makes things
         a little easier to port.  Also, add it to sigdie().  ok djm@

commit ff4454dbda098d98819a108b76d3508402ab3441
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 10:21:51 2008 +1000

       - ian@cvs.openbsd.org 2008/06/12 23:24:58
         [sshconnect.c]
         tweak wording in message, ok deraadt@ jmc@

commit 0f0ef0ab1f7af50e7f48a8bc06cf3f5fc76654c7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 08:58:05 2008 +1000

       - grunk@cvs.openbsd.org 2008/06/12 22:03:36
         [key.c]
         add my copyright, ok djm@

commit b68fb4ad2118483c84c02633029e86fc20f15bf1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 08:57:27 2008 +1000

       - grunk@cvs.openbsd.org 2008/06/12 21:14:46
         [ssh-keygen.c]
         make ssh-keygen -lf show the key type just as ssh-add -l would do it
         ok djm@ markus@

commit babc1d5f73dec4d7636d4fefac02e86c2bb69143
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 08:56:01 2008 +1000

       - djm@cvs.openbsd.org 2008/06/12 21:06:25
         [clientloop.c]
         I was coalescing expected global request confirmation replies at
         the wrong end of the queue - fix; prompted by markus@

commit a64ab33f048fd8649c35e1142592d448e0d9eb6a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 07:01:29 2008 +1000

       - djm@cvs.openbsd.org 2008/06/12 20:47:04
         [sftp-client.c]
         print extension revisions for extensions that we understand

commit 3fc464efdc5111334f42213891521fcd42c0e7a1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 06:42:45 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/12 20:38:28
         [sshd.c sshconnect.c packet.h misc.c misc.h packet.c]
         Make keepalive timeouts apply while waiting for a packet, particularly
         during key renegotiation (bz #1363).  With djm and Matt Day, ok djm@

commit f09e825329d13c5fc31a97fc7ea2312dd4fb5405
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 05:18:03 2008 +1000

       - jmc@cvs.openbsd.org 2008/06/12 19:10:09
         [ssh_config.5 ssh-keygen.1]
         tweak the ascii art text; ok grunk

commit 1cf65ae61d1148cb031798657ac514a479c78382
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 05:09:18 2008 +1000

      - (dtucker) [clientloop.c serverloop.c]  channel_register_filter now
        takes 2 more args.  with djm@

commit f6b01b758f4003a5cc59cf6a27afdc5123eb4fc4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:56:37 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/12 16:35:31
         [ssh_config.5 ssh.c]
         keyword expansion for localcommand.  ok djm@

commit 84c56f536ca664f79172d595e088fce6aa84be21
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:55:46 2008 +1000

       - djm@cvs.openbsd.org 2008/06/12 15:19:17
         [clientloop.h channels.h clientloop.c channels.c mux.c]
         The multiplexing escape char handler commit last night introduced a
         small memory leak per session; plug it.

commit 4b3b9773ec9d5e0de31a1a8e113488497c7113dc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:55:10 2008 +1000

       - grunk@cvs.openbsd.org 2008/06/12 06:32:59
         [key.c]
         We already mark the start of the worm, now also mark the end of the worm
         in our random art drawings.
         ok djm@

commit 987ac84a1777fe4c4ce2424f6d5b0d127083fd54
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:54:40 2008 +1000

       - grunk@cvs.openbsd.org 2008/06/12 05:42:46
         [key.c]
         supply the key type (rsa1, rsa, dsa) as a caption in the frame of the
         random art.  while there, stress the fact that the field base should at
         least be 8 characters for the pictures to make sense.
         comment and ok djm@

commit ba69c7a987ea42b6e26ce512a483d6ba44e3df0c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:54:05 2008 +1000

       - djm@cvs.openbsd.org 2008/06/12 05:32:30
         [mux.c]
         some more TODO for me

commit e5d98290a6bff2352c47bb54b769a605f0794d5d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:53:27 2008 +1000

       - djm@cvs.openbsd.org 2008/06/12 05:15:41
         [PROTOCOL]
         document tun@openssh.com forwarding method

commit d6173c0bd7acf5880640bb3a89cf19cb5d4e092d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:52:53 2008 +1000

       - djm@cvs.openbsd.org 2008/06/12 04:24:06
         [ssh.c]
         thal shalt not code past the eightieth column

commit 4d5cd33a5f3235537f3ab5cc1de8dff6a0f2c799
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:51:14 2008 +1000

       - djm@cvs.openbsd.org 2008/06/12 04:17:47
         [clientloop.c]
         thall shalt not code past the eightieth column

commit 9f407c4422a7f8283eda674e10755d0b4f1c2413
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:50:27 2008 +1000

       - djm@cvs.openbsd.org 2008/06/12 04:06:00
         [clientloop.h ssh.c clientloop.c]
         maintain an ordered queue of outstanding global requests that we
         expect replies to, similar to the per-channel confirmation queue.
         Use this queue to verify success or failure for remote forward
         establishment in a race free way.
         ok dtucker@

commit 2fb66caca2c9e69c6a0584060114fcd52e59d5ff
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:49:33 2008 +1000

       - djm@cvs.openbsd.org 2008/06/12 03:40:52
         [clientloop.h mux.c channels.c clientloop.c channels.h]
         Enable ~ escapes for multiplex slave sessions; give each channel
         its own escape state and hook the escape filters up to muxed
         channels. bz #1331
         Mux slaves do not currently support the ~^Z and ~& escapes.
         NB. this change cranks the mux protocol version, so a new ssh
         mux client will not be able to connect to a running old ssh
         mux master.
         ok dtucker@

commit 267e28bb75e97755ab3bbe128b75623734f2b3fd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:48:11 2008 +1000

       - otto@cvs.openbsd.org 2008/06/12 00:13:13
         [key.c]
         use an odd number of rows and columns and a separate start marker, looks
         better; ok grunk@

commit 78913e0059a7f5ff1770488cdf49823e290daa45
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:47:34 2008 +1000

       - grunk@cvs.openbsd.org 2008/06/12 00:13:55
         [sshconnect.c]
         Make ssh print the random art also when ssh'ing to a host using IP only.
         spotted by naddy@, ok and help djm@ dtucker@

commit 30ac73bcc2b2fa7b997cb572e5b03ea9107b7641
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:46:45 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/12 00:03:49
         [dns.c canohost.c sshconnect.c]
         Do not pass "0" strings as ports to getaddrinfo because the lookups
         can slow things down and we never use the service info anyway. bz
         #859, patch from YOSHIFUJI Hideaki and John Devitofranceschi.  ok
         deraadt@ djm@
         djm belives that the reason for the "0" strings is to ensure that
         it's not possible to call getaddrinfo with both host and port being
         NULL.  In the case of canohost.c host is a local array.  In the
         case of sshconnect.c, it's checked for null immediately before use.
         In dns.c it ultimately comes from ssh.c:main() and is guaranteed to
         be non-null but it's not obvious, so I added a warning message in
         case it is ever passed a null.

commit d32b28a307b308e5b5b052b4eb2a2c8f396c380b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:45:50 2008 +1000

       - grunk@cvs.openbsd.org 2008/06/11 23:51:57
         [key.c]
         #define statements that are not atoms need braces around them, else they
         will cause trouble in some cases.
         Also do a computation of -1 once, and not in a loop several times.
         spotted by otto@

commit dcc1ab5483a5f0f0a72c14149ace9979c8dea085
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:44:25 2008 +1000

       - grunk@cvs.openbsd.org 2008/06/11 23:03:56
         [ssh_config.5]
         CheckHostIP set to ``fingerprint'' will display both hex and random art
         spotted by naddy@

commit 014d76fa7294db63e37c642556008206f0179622
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:43:51 2008 +1000

       - otto@cvs.openbsd.org 2008/06/11 23:02:22
         [key.c]
         simpler way of computing the augmentations; ok grunk@

commit 35c45535ea1812ecc2d2655f068a103e57f3dfb5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:43:15 2008 +1000

       - grunk@cvs.openbsd.org 2008/06/11 22:20:46
         [ssh-keygen.c ssh-keygen.1]
         ssh-keygen would write fingerprints to STDOUT, and random art to STDERR,
         that is not how it was envisioned.
         Also correct manpage saying that -v is needed along with -l for it to work.
         spotted by naddy@

commit a376a32e8e4b955eb936f96f0900e95e2ea4d2f9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:42:14 2008 +1000

       - grunk@cvs.openbsd.org 2008/06/11 21:38:25
         [ssh-keygen.c]
         ssh-keygen -lv -f /etc/ssh/ssh_host_rsa_key.pub
         would not display you the random art as intended, spotted by canacar@

commit 9c16ac926376ad87084ae78bac44a813ae5db21f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:40:35 2008 +1000

       - grunk@cvs.openbsd.org 2008/06/11 21:01:35
         [ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
          sshconnect.c]
         Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
         graphical hash visualization schemes known as "random art", and by
         Dan Kaminsky's musings on the subject during a BlackOp talk at the
         23C3 in Berlin.
         Scientific publication (original paper):
         "Hash Visualization: a New Technique to improve Real-World Security",
         Perrig A. and Song D., 1999, International Workshop on Cryptographic
         Techniques and E-Commerce (CrypTEC '99)
         http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
         The algorithm used here is a worm crawling over a discrete plane,
         leaving a trace (augmenting the field) everywhere it goes.
         Movement is taken from dgst_raw 2bit-wise.  Bumping into walls
         makes the respective movement vector be ignored for this turn,
         thus switching to the other color of the chessboard.
         Graphs are not unambiguous for now, because circles in graphs can be
         walked in either direction.
         discussions with several people,
         help, corrections and ok markus@ djm@

commit 1199673393661ceafc3141e5df43c53e9acdba2f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 13 04:32:00 2008 +1000

       - jmc@cvs.openbsd.org 2008/06/11 07:30:37
         [sshd.8]
         kill trailing whitespace;

commit 4401e45be6a89f8b2b9f9ba96137107bce39943d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 12 06:05:12 2008 +1000

     - (djm) [channels.c configure.ac]
       Do not set SO_REUSEADDR on wildcard X11 listeners (X11UseLocalhost=no)
       bz#1464; ok dtucker

commit b8e0500351f42c79d7c75df5637bd9eb01811ff6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 09:47:59 2008 +1000

     - (dtucker) [Makefile.in] Move addrmatch.o to libssh.a where it's needed now.

commit e045e0c62ae29fb7a2ed175c973fda32e60ee43d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 09:38:12 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/10 23:13:43
         [Makefile regress/key-options.sh]
         Add regress test for key options.  ok djm@

commit 2a8b138ed852625abeb56192f8439061761bdb93
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 09:35:37 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/10 23:21:34
         [bufaux.c]
         Use '\0' for a nul byte rather than unadorned 0.  ok djm@

commit 896ad5a4e40c48fa9bea71624830cc9cc3ce4fe0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 09:34:46 2008 +1000

       - djm@cvs.openbsd.org 2008/06/10 23:06:19
         [auth-options.c match.c servconf.c addrmatch.c sshd.8]
         support CIDR address matching in .ssh/authorized_keys from="..." stanzas
         ok and extensive testing dtucker@

commit 8901fa9c88d52ac1f099e7a3ce5bd75089e7e731
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 09:34:01 2008 +1000

       - djm@cvs.openbsd.org 2008/06/10 22:15:23
         [PROTOCOL ssh.c serverloop.c]
         Add a no-more-sessions@openssh.com global request extension that the
         client sends when it knows that it will never request another session
         (i.e. when session multiplexing is disabled). This allows a server to
         disallow further session requests and terminate the session.
         Why would a non-multiplexing client ever issue additional session
         requests? It could have been attacked with something like SSH'jack:
         http://www.storm.net.nz/projects/7
         feedback & ok markus

commit c9807e825a83df6d95ae7e0390c34ab71321f30b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 09:33:01 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/10 18:21:24
         [ssh_config.5]
         clarify that Host patterns are space-separated.  ok deraadt

commit 34f49c60fd8f5320ac91f191379adf748405ed9a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 05:15:51 2008 +1000

     - (dtucker) [Makefile.in] Define TEST_SSH_IPV6 in make's arguments as well
       as environment.

commit 5d37690a1f702db627f00146a5ace7949676eeb0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 04:15:05 2008 +1000

     - (dtucker) [Makefile.in configure.ac regress/addrmatch.sh] Skip IPv6
       specific tests on platforms that don't do IPv6.

commit d8bafea5a0008c9feb87237110037c45e8a0f8d3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 01:39:38 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/10 15:28:49
         [test-exec.sh]
         Add quotes

commit 5f346649ce02bc58161610bcb455d6cefbb3a830
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 01:38:52 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/10 15:21:41
         [test-exec.sh]
         Use a more portable construct for checking if we're running a putty test

commit 75a55bf0c74c13ef596f31f54be421f17cb25e36
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 01:33:21 2008 +1000

    fix version tag

commit 9d3739daa1f716fcd4c55d551cb4c22acdf6f8e0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 10 23:52:51 2008 +1000

      - (dtucker) [openbsd-compat/fake-rfc2553.h] Add sin6_scope_id to sockaddr_in6
        since the new CIDR code in addmatch.c references it.

commit 10f9242b86bc570638b5c0e985e4f4b98c1dd073
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 10 23:16:46 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/10 05:23:32
         [addrmatch.sh Makefile]
         Regress test for Match CIDR rules.  ok djm@

commit d788b7cb35ed9964f8a15201e3b28e992228eadb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 10 23:15:54 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/09 18:06:32
         [regress/test-exec.sh]
         Don't generate putty keys if we're not going to use them.  ok djm

commit e7f3f75651449900f061e43007b1fad027aec295
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 10 23:06:01 2008 +1000

       - jmc@cvs.openbsd.org 2008/06/10 08:17:40
         [sshd.8 sshd.c]
         - update usage()
         - fix SYNOPSIS, and sort options
         - some minor additional fixes

commit 6a2a400f7a64d0dee83a1a32e7022445548ff348
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 10 23:03:04 2008 +1000

       - jmc@cvs.openbsd.org 2008/06/10 07:12:00
         [sshd_config.5]
         tweak previous;

commit e7140f20cb2da1456e6080059eef54cf0f3533f2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 10 23:01:51 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/10 04:50:25
         [sshd.c channels.h channels.c log.c servconf.c log.h servconf.h sshd.8]
         Add extended test mode (-T) and connection parameters for test mode (-C).
         -T causes sshd to write its effective configuration to stdout and exit.
         -C causes any relevant Match rules to be applied before output.  The
         combination allows tesing of the parser and config files.  ok deraadt djm

commit b06cc4abf8e2eb4d1e14f19911a7e0afde50ee95
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 10 22:59:53 2008 +1000

       - djm@cvs.openbsd.org 2008/06/10 04:17:46
         [sshd_config.5]
         better reference for pattern-list

commit 7a3935de2facb227ea1fc2ce2de046b569a2ebc7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 10 22:59:10 2008 +1000

     - (dtucker) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2008/06/10 03:57:27
         [servconf.c match.h sshd_config.5]
         support CIDR address matching in sshd_config "Match address" blocks, with
         full support for negation and fall-back to classic wildcard matching.
         For example:
         Match address 192.0.2.0/24,3ffe:ffff::/32,!10.*
             PasswordAuthentication yes
         addrmatch.c code mostly lifted from flowd's addr.c
         feedback and ok dtucker@

commit 588fe0efa4e7cb74fc071c5271348d13ea06528b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 9 23:52:22 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/09 13:38:46
         [PROTOCOL]
         Use a $OpenBSD tag so our scripts will sync changes.

commit cd2ada6d06e2570fa4f17a78a99b4a151a750427
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 9 23:49:09 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/08 20:15:29
         [PROTOCOL]
         Have the sftp client store the statvfs replies in wire format,
         which prevents problems when the server's native sizes exceed the
         client's.
         Also extends the sizes of the remaining 32bit wire format to 64bit,
         they're specified as unsigned long in the standard.

commit 17ec5d4e028398113b4c6fda654faf65e8c27e64
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 9 23:47:37 2008 +1000

       - djm@cvs.openbsd.org 2008/06/07 21:52:46
         [PROTOCOL]
         statvfs member fsid needs to be wider, increase it to 64 bits and
         crank extension revision number to 2; prodded and ok dtucker@

commit 3463acaebfe90c10d22c0baaff556559bfd66fd6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 9 23:06:55 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/09 13:02:39
         Extend 32bit -> 64bit values for statvfs extension missed in previous
         commit.

commit 7b598892be09a9da2855b57086dddce502a150dc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 9 22:49:36 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/08 20:15:29
         [sftp.c sftp-client.c sftp-client.h]
         Have the sftp client store the statvfs replies in wire format,
         which prevents problems when the server's native sizes exceed the
         client's.
         Also extends the sizes of the remaining 32bit wire format to 64bit,
         they're specified as unsigned long in the standard.

commit 422c34c96dd7e6dcb507747bdbb499e96000aa5f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 9 22:48:31 2008 +1000

       - dtucker@cvs.openbsd.org 2008/06/08 17:04:41
         [sftp-server.c]
         Add case for ENOSYS in errno_to_portable; ok deraadt

commit 77001384cc067a4613dd6d7a07b9a786f7d7f1bb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 9 06:17:53 2008 +1000

     - (dtucker) [configure.ac defines.h sftp-client.c M sftp-server.c] Add a
       macro to convert fsid to unsigned long for platforms where fsid is a
       2-member array.

commit 598eaa6c0c36c3169963c7e6505d53b4073590f5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 9 03:32:29 2008 +1000

     - (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c
       openbsd-compat/Makefile.in openbsd-compat/openbsd-compat.h
       openbsd-compat/bsd-statvfs.{c,h}] Add a null implementation of statvfs and
       fstatvfs and remove #defines around statvfs code.  ok djm@

commit 294b84183265a9be32971fce856e578160e1a825
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 8 12:57:08 2008 +1000

       - djm@cvs.openbsd.org 2008/06/07 21:52:46
         [sftp-server.c sftp-client.c]
         statvfs member fsid needs to be wider, increase it to 64 bits and
         crank extension revision number to 2; prodded and ok dtucker@

commit df189fb2792184d038650437b752e23b1d4b71cf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 8 12:55:32 2008 +1000

       - djm@cvs.openbsd.org 2008/05/19 20:53:52
         [clientloop.c]
         unbreak tree by committing this bit that I missed from:
         Fix sending tty modes when stdin is not a tty (bz#1199). Previously
         we would send the modes corresponding to a zeroed struct termios,
         whereas we should have been sending an empty list of modes.
         Based on patch from daniel.ritz AT alcatel.ch; ok dtucker@ markus@

commit 0f7e910604a9858d71077a50bffca34299894895
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 8 12:54:29 2008 +1000

       - djm@cvs.openbsd.org 2008/05/19 15:46:31
         [ssh-keygen.c]
         support -l (print fingerprint) in combination with -F (find host) to
         search for a host in ~/.ssh/known_hosts and display its fingerprint;
         ok markus@

commit dd39264e4b4fcd5a9fd4141b1f7b10eff09b3f8c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 8 12:53:20 2008 +1000

       - djm@cvs.openbsd.org 2008/05/19 15:45:07
         [sshtty.c ttymodes.c sshpty.h]
         Fix sending tty modes when stdin is not a tty (bz#1199). Previously
         we would send the modes corresponding to a zeroed struct termios,
         whereas we should have been sending an empty list of modes.
         Based on patch from daniel.ritz AT alcatel.ch; ok dtucker@ markus@

commit 136e56f68967fd39e8868769f3af316f1cca0559
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 8 12:49:30 2008 +1000

       - djm@cvs.openbsd.org 2008/05/19 06:14:02
         [packet.c] unbreak protocol keepalive timeouts bz#1465; ok dtucker@

commit 5b2e2ba9e40d77d5876a96b248f9c526f8611b7c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 8 09:25:28 2008 +1000

     - (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c] Do not    enable statvfs extensions on platforms that do not have statvfs.  ok djm@

commit ce38d8234d6969e4c222a0110e80357c2a61162c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 7 06:25:15 2008 +1000

     - (dtucker) [mux.c] Include paths.h inside ifdef HAVE_PATHS_H.

commit 58ea61ba2a747e4f0beb3afcbbdea8ada5119143
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 4 10:54:00 2008 +1000

     - (djm) [openbsd-compat/bsd-arc4random.c] Fix math bug that caused bias
       in arc4random_uniform with upper_bound in (2^30,2*31). Note that
       OpenSSH did not make requests with upper bounds in this range.

commit a7058ec7c03017b89ba75fc0b9a58ca672aab9e9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 20 08:57:06 2008 +1000

     - (djm) [configure.ac mux.c sftp.c openbsd-compat/Makefile.in]
       [openbsd-compat/fmt_scaled.c openbsd-compat/openbsd-compat.h]
       Fix compilation on Linux, including pulling in fmt_scaled(3)
       implementation from OpenBSD's libutil.

commit 58a81148806d8dae74e5aa9c81262fb64a55d872
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 16:11:56 2008 +1000

       - djm@cvs.openbsd.org 2008/05/16 08:30:42
         [PROTOCOL]
         document our protocol extensions and deviations; ok markus@
       - djm@cvs.openbsd.org 2008/05/17 01:31:56
         [PROTOCOL]
         grammar and correctness fixes from stevesk@

commit a7e0d5a34a12dcfac0cf3b60b3696271861a586c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 16:08:41 2008 +1000

       - djm@cvs.openbsd.org 2008/05/18 21:29:05
         [sftp-server.c]
         comment extension announcement

commit 5159bdd0ecce2c9b5fd2f6a606609e7172e14039
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 16:08:20 2008 +1000

       - djm@cvs.openbsd.org 2008/05/15 23:52:24
         [nchan2.ms]
         document eow message in ssh protocol 2 channel state machine;
         feedback and ok markus@

commit 0f30c87c45030005ed79d0c83c176d7abc91265f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 16:07:45 2008 +1000

       - pvalchev@cvs.openbsd.org 2008/05/12 20:52:20
         [umac.c]
         Ensure nh_result lies on a 64-bit boundary (fixes warnings observed
         on Itanium on Linux); from Dale Talcott (bug #1462); ok djm@

commit bab9bd4c20dac1d513fbf16d1214e0c0f9a1bf3b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 16:06:47 2008 +1000

       - markus@cvs.openbsd.org 2008/05/09 16:21:13
         [channels.h clientloop.c nchan.c serverloop.c]
         unbreak
            ssh -2 localhost od /bin/ls | true
         ignoring SIGPIPE by adding a new channel message (EOW) that signals
         the peer that we're not interested in any data it might send.
         fixes bz #85; discussion, debugging and ok djm@

commit d654dd27b5774575edd341827c38735ac9222174
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 16:05:41 2008 +1000

       - markus@cvs.openbsd.org 2008/05/09 16:17:51
         [channels.c]
         error-fd race: don't enable the error fd in the select bitmask
         for channels with both in- and output closed, since the channel
         will go away before we call select();
         report, lots of debugging help and ok djm@

commit 2ff1ca56ebee93d2881e4abaab1b8bc84dad4db8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 16:04:56 2008 +1000

       - markus@cvs.openbsd.org 2008/05/09 16:16:06
         [session.c]
         re-add the USE_PIPES code and enable it.
         without pipes shutdown-read from the sshd does not trigger
         a SIGPIPE when the forked program does a write.
         ok djm@
         (Id sync only, USE_PIPES never left portable OpenSSH)

commit b3da593962885883feca47ceb36617ab3eafcee8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 16:02:37 2008 +1000

       - djm@cvs.openbsd.org 2008/05/09 14:26:08
         [ssh.c]
         dingo stole my diff hunk

commit b1cbfa25f1618b277de670b943acb07ff5dbb1ac
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 16:00:08 2008 +1000

       - djm@cvs.openbsd.org 2008/05/09 14:18:44
         [clientloop.c clientloop.h ssh.c mux.c]
         tidy up session multiplexing code, moving it into its own file and
         making the function names more consistent - making ssh.c and
         clientloop.c a fair bit more readable.
         ok markus@

commit bd74025c7b08104828986d01e60f04372b3d5337
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 15:37:09 2008 +1000

       - djm@cvs.openbsd.org 2008/05/09 04:55:56
         [channels.c channels.h clientloop.c serverloop.c]
         Try additional addresses when connecting to a port forward destination
         whose DNS name resolves to more than one address. The previous behaviour
         was to try the first address and give up.
    
         Reported by stig AT venaas.com in bz#343
    
         great feedback and ok markus@

commit 5771ed7d1b5af26bc991151ab977e77bf1e87666
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 15:35:33 2008 +1000

       - djm@cvs.openbsd.org 2008/05/08 13:06:11
         [clientloop.c clientloop.h ssh.c]
         Use new channel status confirmation callback system to properly deal
         with "important" channel requests that fail, in particular command exec,
         shell and subsystem requests. Previously we would optimistically assume
         that the requests would always succeed, which could cause hangs if they
         did not (e.g. when the server runs out of fds) or were unimplemented by
         the server (bz #1384)
         Also, properly report failing multiplex channel requests via the mux
         client stderr (subject to LogLevel in the mux master) - better than
         silently failing.
         most bits ok markus@ (as part of a larger diff)

commit 7207f64a23a49a719aad3083c068f50e5034ccb8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 15:34:50 2008 +1000

       - djm@cvs.openbsd.org 2008/05/08 12:21:16
         [monitor.c monitor_wrap.c session.h servconf.c servconf.h session.c]
         [sshd_config sshd_config.5]
         Make the maximum number of sessions run-time controllable via
         a sshd_config MaxSessions knob. This is useful for disabling
         login/shell/subsystem access while leaving port-forwarding working
         (MaxSessions 0), disabling connection multiplexing (MaxSessions 1) or
         simply increasing the number of allows multiplexed sessions.
         Because some bozos are sure to configure MaxSessions in excess of the
         number of available file descriptors in sshd (which, at peak, might be
         as many as 9*MaxSessions), audit sshd to ensure that it doesn't leak fds
         on error paths, and make it fail gracefully on out-of-fd conditions -
         sending channel errors instead of than exiting with fatal().
         bz#1090; MaxSessions config bits and manpage from junyer AT gmail.com
         ok markus@

commit 9417831eced03242e283e30286ac06ca2ce6d83e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 15:28:35 2008 +1000

     - (djm) [openbsd-compat/port-tun.c] needs sys/queue.h

commit caaed01e90edc41d43334868f14f4f994927b2cd
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 15:26:54 2008 +1000

    - (djm) [openbsd-compat/bsd-arc4random.c] Warning fixes

commit b84886ba3e362f54b70aefcbe1aa10606309b7d7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 15:05:07 2008 +1000

       - djm@cvs.openbsd.org 2008/05/08 12:02:23
         [auth-options.c auth1.c channels.c channels.h clientloop.c gss-serv.c]
         [monitor.c monitor_wrap.c nchan.c servconf.c serverloop.c session.c]
         [ssh.c sshd.c]
         Implement a channel success/failure status confirmation callback
         mechanism. Each channel maintains a queue of callbacks, which will
         be drained in order (RFC4253 guarantees confirm messages are not
         reordered within an channel).
         Also includes a abandonment callback to clean up if a channel is
         closed without sending confirmation messages. This probably
         shouldn't happen in compliant implementations, but it could be
         abused to leak memory.
         ok markus@ (as part of a larger diff)

commit db255cad0531047a3e35a95af74ad2e03b054412
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:59:37 2008 +1000

       - markus@cvs.openbsd.org 2008/05/08 06:59:01
         [bufaux.c buffer.h channels.c packet.c packet.h]
         avoid extra malloc/copy/free when receiving data over the net;
         ~10% speedup for localhost-scp; ok djm@

commit e9890193032b4bba7afa40d4fc003bbf629afba2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:59:02 2008 +1000

       - jmc@cvs.openbsd.org 2008/05/07 08:00:14
         [sshd_config.5]
         sort;

commit ba3a6599a2c1f2547747653608c6235bb8f252e4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:58:22 2008 +1000

       - pyr@cvs.openbsd.org 2008/05/07 06:43:35
         [sshd_config]
         push the sshd_config bits in, spotted by ajacoutot@

commit 4f755cdc05f5c6dee7cb1894f8d3bcaee33443d0
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:57:41 2008 +1000

       - pyr@cvs.openbsd.org 2008/05/07 05:49:37
         [servconf.c servconf.h session.c sshd_config.5]
         Enable the AllowAgentForwarding option in sshd_config (global and match
         context), to specify if agents should be permitted on the server.
         As the man page states:
         ``Note that disabling Agent forwarding does not improve security
         unless users are also denied shell access, as they can always install
         their own forwarders.''
         ok djm@, ok and a mild frown markus@

commit bacb7fbd7e7716a4d3148769d43d8896cbfb2c54
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:56:33 2008 +1000

       - djm@cvs.openbsd.org 2008/04/30 10:14:03
         [ssh-keyscan.1 ssh-keyscan.c]
         default to rsa (protocol 2) keys, instead of rsa1 keys; spotted by
         larsnooden AT openoffice.org

commit 0b4c16589a29a3899500b553eb95461be3f604e6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:55:29 2008 +1000

       - otto@cvs.openbsd.org 2008/04/29 11:20:31
         [monitor_mm.h]
         garbage collect two unused fields in struct mm_master; ok markus@

commit ff0dd88999c3d5966bbf32b9598a463363aea375
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:55:02 2008 +1000

       - djm@cvs.openbsd.org 2008/04/18 22:01:33
         [session.c]
         remove unneccessary parentheses

commit 64058cb8ef1d6ae77ccce504635149d4cb1d19c2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:54:25 2008 +1000

       - jmc@cvs.openbsd.org 2008/04/18 17:15:47
         [sftp.1]
         macro fixage;

commit d671e5a978efd5ba949d3fdcd03f728dcd68c636
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:53:33 2008 +1000

       - djm@cvs.openbsd.org 2008/04/18 12:32:11
         [sftp-client.c sftp-client.h sftp-server.c sftp.1 sftp.c sftp.h]
         introduce sftp extension methods statvfs@openssh.com and
         fstatvfs@openssh.com that implement statvfs(2)-like operations,
         based on a patch from miklos AT szeredi.hu (bz#1399)
         also add a "df" command to the sftp client that uses the
         statvfs@openssh.com to produce a df(1)-like display of filesystem
         space and inode utilisation
         ok markus@

commit 354c48c641e7fbdc273ee8e1239ff71d73a1ec3e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:50:00 2008 +1000

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2008/04/13 00:22:17
         [dh.c sshd.c]
         Use arc4random_buf() when requesting more than a single word of output
         Use arc4random_uniform() when the desired random number upper bound
         is not a power of two
         ok deraadt@ millert@

commit a4be7c23fdcf8a1da5420068dc4bd4db45af9c9c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:47:37 2008 +1000

     - (djm) [openbsd-compat/bsd-arc4random.c openbsd-compat/openbsd-compat.c]
         [configure.ac] Implement arc4random_buf(), import implementation of
         arc4random_uniform() from OpenBSD

commit 25434de4606924a31016e42728c4acdf6de90cc7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:29:08 2008 +1000

       - djm@cvs.openbsd.org 2008/04/05 02:46:02
         [sshd_config.5]
         HostbasedAuthentication is supported under Match too

commit 56f41ddc5472ef04f20c59ec94a74825b8439898
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:28:19 2008 +1000

       - djm@cvs.openbsd.org 2008/04/04 06:44:26
         [sshd_config.5]
         oops, some unrelated stuff crept into that commit - backout.
         spotted by jmc@

commit 797e3d117f8b4cfed5f066ef88f28826eb8f8b41
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 14:27:42 2008 +1000

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2008/04/04 05:14:38
         [sshd_config.5]
         ChrootDirectory is supported in Match blocks (in fact, it is most useful
         there). Spotted by Minstrel AT minstrel.org.uk

commit c5750226af60d321f11eea8c316c958048ee000d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 16 10:01:54 2008 +1000

     - (djm) Force string arguments to replacement setproctitle() though
       strnvis first. Ok dtucker@

commit 55754fb0024cb84f99a72e15196fa03456a0c097
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 4 16:16:35 2008 +1100

     - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile-
       time warnings on LynxOS. Patch from ops AT iki.fi

commit 79a1bc918ffd2e81b5bd39cfdf87dfc81390fbb5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 3 20:57:05 2008 +1100

     - (djm) Release 5.0p1

commit ffa830217280edd1fe1b90826db40814e9c7af96
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 3 20:56:38 2008 +1100

     - (djm) [README] Update link to release notes

commit 5a4b6468dee92c1be4e004c86093d1e30192bf20
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 3 20:55:44 2008 +1100

     - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Crank version numbers in RPM spec files

commit a68d31b80c5b092046878ad4b5c884a41c06b067
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 3 20:53:08 2008 +1100

       - djm@cvs.openbsd.org 2008/04/03 09:50:14
         [version.h]
         openssh-5.0

commit 13ba9c24394f866c543173f9ca8d11fe2e2bc9af
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 3 20:52:51 2008 +1100

       - jmc@cvs.openbsd.org 2008/03/27 22:37:57
         [sshd.8]
         remove trailing whitespace;

commit 5f5cd746f357a87637a6a91605a44e1ed9a6dab1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 3 08:43:57 2008 +1100

       - markus@cvs.openbsd.org 2008/04/02 15:36:51
         [channels.c]
         avoid possible hijacking of x11-forwarded connections (back out 1.183)
         CVE-2008-1483; ok djm@

commit 0abb2324284b1894c0b231b370a5868ae0d24c34
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 17:53:09 2008 +1100

     - (djm) Release 4.9p1

commit 949fb9033cad1b556ba2eb9b2d9f4d94c5680b8e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 17:43:45 2008 +1100

     - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Crank version numbers in RPM spec files

commit 59682b59617cfa0acd457397cf499a268c9f573b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 17:43:34 2008 +1100

     - (djm) [README] Update link to release notes

commit 9c8a427453a0a354d7251600872f9c9c0a924a9e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 17:42:06 2008 +1100

     - (djm) [regress/Makefile] cleanup PuTTY interop test droppings

commit 5b1c8b31038af7144efdcf9317df66c96031d19f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 12:33:07 2008 +1100

     - (djm) [configure.ac] --with-selinux too

commit da3155e1595b461cfb51ee28a49279d935eb7259
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 12:30:18 2008 +1100

     - (djm) [configure.ac] fix alignment of --without-stackprotect description

commit 6f1c462ca31c97a72e37cc7fb4cb44631f2852b0
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 11:26:56 2008 +1100

       - djm@cvs.openbsd.org 2008/03/24 21:46:54
         [regress/sftp-badcmds.sh]
         disable no-replace rename test now that we prefer a POSIX rename; spotted
         by dkrause@

commit 2ff24f66bf5a955bd8beec5dcd1badab04b7ef66
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 11:18:13 2008 +1100

       - djm@cvs.openbsd.org 2008/03/27 00:16:49
         [version.h]
         openssh-4.9

commit 95e80955f27d55c7a02724e72bdcb1a4ca619f25
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 11:03:05 2008 +1100

       - djm@cvs.openbsd.org 2008/03/26 21:28:14
         [auth-options.c auth-options.h session.c sshd.8]
         add no-user-rc authorized_keys option to disable execution of ~/.ssh/rc

commit 55360e1ceb62c341d5c380bf6d94050d17f59930
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 11:02:27 2008 +1100

       - djm@cvs.openbsd.org 2008/03/25 23:01:41
         [session.c]
         last patch had backwards test; spotted by termim AT gmail.com

commit a1b48ccf2d7383bc0cdc158324e400dd4f7ce87a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 11:02:02 2008 +1100

       - djm@cvs.openbsd.org 2008/03/25 11:58:02
         [session.c sshd_config.5]
         ignore ~/.ssh/rc if a sshd_config ForceCommand is specified;
         from dtucker@ ok deraadt@ djm@

commit e241e85ad3fd50fb94666ddaa52e44cbaae47fbb
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 11:01:15 2008 +1100

       - deraadt@cvs.openbsd.org 2008/03/24 16:11:07
         [monitor_fdpass.c]
         msg_controllen has to be CMSG_SPACE so that the kernel can account for
         each cmsg_len (ie. msg_controllen = sum of CMSG_ALIGN(cmsg_len).  This
         works now that kernel fd passing has been fixed to accept a bit of
         sloppiness because of this ABI repair.
         lots of discussion with kettenis

commit 7a3e1d0bc9de3af87afcfa1159b4e906efde558b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 10:59:57 2008 +1100

       - djm@cvs.openbsd.org 2008/03/23 12:54:01
         [sftp-client.c]
         prefer POSIX-style file renaming over filexfer rename behaviour if the
         server supports the posix-rename@openssh.com extension.
         Note that the old (filexfer) behaviour would refuse to clobber an
         existing file. Users who depended on this should adjust their sftp(1)
         usage.
         ok deraadt@ markus@

commit be71e2d9725cf0833ee208222eb6860bb17316ef
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 10:54:44 2008 +1100

       - deraadt@cvs.openbsd.org 2008/03/15 16:19:02
         [monitor_fdpass.c]
         Repair the simple cases for msg_controllen where it should just be
         CMSG_SIZE(sizeof(int)), not sizeof(buffer) which may be larger because
         of alignment; ok kettenis hshoexer

commit f92e063872ffc12fd82be7e344e8aeeeefd7a8ee
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 10:53:23 2008 +1100

       - deraadt@cvs.openbsd.org 2008/03/13 01:49:53
         [monitor_fdpass.c]
         Correct CMSG_SPACE and CMSG_LEN usage everywhere in the tree. Due to
         an extensive discussion with otto, kettenis, millert, and hshoexer

commit 5447eb2454961bdc1d01e6630a02bf844a799713
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 10:50:21 2008 +1100

       - jmc@cvs.openbsd.org 2008/02/11 07:58:28
         [ssh.1 sshd.8 sshd_config.5]
         bump Mdocdate for pages committed in "febuary", necessary because
         of a typo in rcs.c;

commit bc98185cdef11fb0eb31f0e26e715f4ef4a1af77
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 27 10:45:49 2008 +1100

     - (djm) Fix RCS ident in sftp-server-main.c

commit b8eb586412f338dcee69639ae375d5f72e26a094
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 27 07:27:20 2008 +1100

     - (dtucker) Cache selinux status earlier so we know if it's enabled after a
       chroot.  Allows ChrootDirectory to work with selinux support compiled in
       but not enabled.  Using it with selinux enabled will require some selinux
       support inside the chroot.  "looks sane" djm@

commit a19390067474ab3a8ad806dbf551fd84164e78a4
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 15 17:27:58 2008 +1100

     - (djm) [session.c] Relocate incorrectly-placed closefrom() that was causing
       crashes when used with ChrootDirectory

commit 8f8b156acc3028532cfe19052772eb80ac22eb62
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 15 09:25:54 2008 +1100

     - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
       empty; report and patch from Peter Stuge
     - (djm) [regress/test-exec.sh] Silence noise from detection of putty
       commands; report from Peter Stuge

commit 02db85bdcbb07f632cddd927ded208f3d4f1e65f
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Mar 14 11:02:51 2008 -0700

     - (tim) [regress/localcommand.sh] Shell portability fix. Reported by imorgan at
       nas.nasa.gov

commit 51430434098ff74055925423787866f599e75177
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Mar 14 10:39:17 2008 -0700

     - (tim) [regress/sftp-cmds.sh] s/cd/lcd/ in lls test. Reported by
       vinschen at redhat.com. Add () to put echo commands in subshell for lls test
       I mistakenly left out of last commit.

commit 817d7efb57a3984c959feb02cd49e63428c494db
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 13 18:37:05 2008 -0700

    forgot to add vinschen at redhat.com on last commit

commit dce65cfb3c40ecfac855f47a20b0c931d39db3a0
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 13 18:21:06 2008 -0700

     - (tim) [regress/sftp-cmds.sh regress/ssh2putty.sh] Shell portability fixes
       from imorgan at nas.nasa.gov

commit 3eb144911c149c293bf681bec7da649a8d33d420
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 13 17:59:50 2008 -0700

     - (tim) [scp.c] Use poll.h if available, fall back to sys/poll.h if not. Patch
       by vinschen at redhat.com.

commit c2cefb0fe9b310d4edc3fc28e5aac2e2cfb6d6aa
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 13 12:41:31 2008 +1100

     - (djm) [Makefile.in regress/test-exec.sh] Find installed plink(1) and
       puttygen(1) by $PATH

commit 664299613492f3c1227cba631c3dc0d75965d622
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 13 12:05:40 2008 +1100

     - (djm) [Makefile.in regress/Makefile] Fix interop-tests target (note to
       self: make changes to Makefile.in next time, not the generated Makefile).

commit af78493bba42cd4351eded064fb63b81fa2867a9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 13 00:17:00 2008 +1100

       - djm@cvs.openbsd.org 2007/12/21 04:13:53
         [regress/Makefile regress/test-exec.sh regress/putty-ciphers.sh]
         [regress/putty-kex.sh regress/putty-transfer.sh regress/ssh2putty.sh]
         basic (crypto, kex and transfer) interop regression tests against putty
         To run these, install putty and run "make interop-tests" from the build
         directory - the tests aren't run by default yet.

commit 4cd5fbab4d73b135e7775d90bb747eca4fca12cd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 12 23:59:43 2008 +1100

       - djm@cvs.openbsd.org 2007/12/12 05:04:03
         [regress/sftp-cmds.sh]
         unbreak lls command and add a regress test that would have caught the
         breakage; spotted by mouring@
         NB. sftp code change already committed.

commit d666d8e5d49f2e5bd5506a7f548d9ecee1b41d56
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 12 23:58:55 2008 +1100

       - jmc@cvs.openbsd.org 2007/11/25 15:35:09
         [regress/agent-getpeereid.sh regress/agent.sh]
         more existant -> existent, from Martynas Venckus;
         pfctl changes: ok henning
         ssh changes: ok deraadt

commit a5e584274dfa631def56403a0b92bf354067ca5a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 12 23:58:05 2008 +1100

       - dtucker@cvs.openbsd.org 2007/10/29 06:57:13
         [regress/Makefile regress/localcommand.sh]
         Add simple regress test for LocalCommand; ok djm@

commit 1e42689ad5a2e78b24369a56e01fc777611da745
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 11 23:01:44 2008 +1100

    fix log date

commit 52358d6df32d9ae923572c43a58159d84b673631
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 11 22:58:25 2008 +1100

     - (dtucker) [auth-pam.c monitor.c session.c sshd.c] Bug #926: Move
       pam_open_session and pam_close_session into the privsep monitor, which
       will ensure that pam_session_close is called as root.  Patch from Tomas
       Mraz.

commit fe1cf97ee811dc7a2bb7cea912c9292c976ab5af
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 9 22:50:50 2008 +1100

     - (dtucker) [configure.ac] Run stack-protector tests with -Werror to catch
       platforms where gcc understands the option but it's not supported (and
       thus generates a warning).

commit 7643e3397d27bb4c18940d1af65c247c48c4bae1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 9 17:10:09 2008 +1100

     - (dtucker) [openbsd-compat/regress/strtonumtest.c] Bug #1347: Use platform's
       equivalent of LLONG_MAX for the compat regression tests, which makes them
       run on AIX and HP-UX.  Patch from David Leonard.

commit 16ba6a8ea25ee45feec55ce5a29a4723c2665ea2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 9 16:36:55 2008 +1100

     - (dtucker) [openbsd-compat/port-aix.{c,h}] Remove AIX specific initgroups
       implementation.  It's not needed to fix bug #1081 and breaks the build
       on some AIX configurations.

commit b7918afddf36c22b8eb87d98819d2cf9ddb6b424
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 9 11:34:23 2008 +1100

     - (dtucker) [configure.ac] It turns out gcc's -fstack-protector-all doesn't
       always work for all platforms and versions, so test what we can and
       add a configure flag to turn it of if needed.  ok djm@

commit 68d293859ed2db128003d6631b63847acf0ea79f
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Mar 7 19:00:33 2008 -0800

     - (tim) [regress/sftp-glob.sh] Shell portability fix.

commit a79bb8ec5e22fb3d58b8871c4c4e93cb96a9889c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 7 18:35:47 2008 +1100

       - deraadt@cvs.openbsd.org 2008/03/04 21:15:42
         [version.h]
         crank version; from djm

commit c0c53c3114b652d30b8277d66fec82482bcde38d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 7 18:35:26 2008 +1100

       - deraadt@cvs.openbsd.org 2008/03/02 18:19:35
         [monitor_fdpass.c]
         use a union to ensure alignment of the cmsg (pay attention: various other
         parts of the tree need this treatment too); ok djm

commit 7c29661471d0a7590ed41dec76661174c99b1c94
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 7 18:33:53 2008 +1100

       - djm@cvs.openbsd.org 2008/02/27 20:21:15
         [sftp-server.c]
         add an extension method "posix-rename@openssh.com" to perform POSIX atomic
         rename() operations. based on patch from miklos AT szeredi.hu in bz#1400;
         ok dtucker@ markus@

commit 58226f60680753c55766f2ba637c9bced175c65a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 7 18:33:30 2008 +1100

       - dtucker@cvs.openbsd.org 2008/02/22 20:44:02
         [clientloop.c packet.c packet.h serverloop.c]
         Allow all SSH2 packet types, including UNIMPLEMENTED to reset the
         keepalive timer (bz #1307).  ok markus@

commit 7cb2b56b1c7e5d0824edc507b01cd78a01019590
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 7 18:33:12 2008 +1100

       - djm@cvs.openbsd.org 2008/02/22 05:58:56
         [session.c]
         closefrom() call was too early, delay it until just before we execute
         the user's rc files (if any).

commit 767087b8ec996d690bbbed19279454e017418643
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 7 18:32:42 2008 +1100

       - markus@cvs.openbsd.org 2008/02/20 15:25:26
         [session.c]
         correct boolean encoding for coredump; der Mouse via dugsong

commit 2ee0c43f983f54dd0b224f0616d400789c46abb2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 7 18:31:47 2008 +1100

       - mbalmer@cvs.openbsd.org 2008/02/14 13:10:31
         [sshd.c]
         When started in configuration test mode (-t) do not check that sshd is
         being started with an absolute path.
         ok djm

commit 76e95daad1f38e0ba8e7bf0554cadd6e3aaf5235
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 7 18:31:24 2008 +1100

       - djm@cvs.openbsd.org 2008/02/13 22:38:17
         [servconf.h session.c sshd.c]
         rekey arc4random and OpenSSL RNG in postauth child
         closefrom fds > 2 before shell/command execution
         ok markus@

commit 757a38a43b0820c3fb13dfbd0ab7d8e1f5a6eee1
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 7 18:27:58 2008 +1100

       - jmc@cvs.openbsd.org 2008/02/11 07:58:28
         [ssh.1 sshd.8 sshd_config.5]
         bump Mdocdate for pages committed in "febuary", necessary because
         of a typo in rcs.c;

commit 54e859f63de83d9e26c6db6b3f6c32bf2189f202
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 2 21:52:27 2008 +1100

     - (dtucker) [configure.ac] FreeBSD's glob() doesn't behave the way we expect
       either, so use our own.

commit baf7c3d33a532840aae32d573383cdaf107f7ff6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 29 22:53:40 2008 +1100

     - (djm) [contrib/gnome-ssh-askpass2.h] Keep askpass windown on top. From
       Debian patch via bernd AT openbsd.org

commit ccb13eedd731cfd1ee9bf748a1ac37cd64b915ef
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 29 15:07:01 2008 +1100

     - (dtucker) [scp.c] Include sys/poll.h inside HAVE_SYS_POLL_H.

commit 7ec87332472340d468aff0f41e0f4e99faf5dda3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 29 13:57:47 2008 +1100

     - (dtucker) [openbsd-compat/bsd-poll.c] We don't check for select(2) in
       configure (and there's not much point, as openssh won't work without it)
       so HAVE_SELECT is not defined and the poll(2) compat code doesn't get
       built in.  Remove HAVE_SELECT so we can build on platforms without poll.

commit 1f1e17bd61850dfa74455cfad9905c6da252c4af
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 28 23:20:48 2008 +1100

     - (dtucker) [sshd.c] Bug #1042: make log messages for tcpwrappers use the
       same SyslogFacility as the rest of sshd.  Patch from William Knox,
       ok djm@.

commit 0f26b1386a8beaa1884178f8793c91d84274ea7d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 28 23:16:04 2008 +1100

     - (dtucker) [configure.ac openbsd-compat/port-aix.{c,h}] Bug #1081: Implement
       getgrouplist via getgrset on AIX, rather than iterating over getgrent.
       This allows, eg, Match and AllowGroups directives to work with NIS and
       LDAP groups.

commit 3d295a6cf0c4e240509f035d514393eec4abd43d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 28 19:22:04 2008 +1100

     - (dtucker) [key.c defines.h openbsd-compat/openssl-compat.h] Move old OpenSSL
       compat glue into openssl-compat.h.

commit bfaaf960a0204d5ee8ed75af05104737a54b4a52
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 28 19:13:52 2008 +1100

     - (dtucker) [includes.h ssh-add.c ssh-agent.c ssh-keygen.c ssh.c sshd.c
       openbsd-compat/openssl-compat.{c,h}] Bug #1437 Move the OpenSSL compat
       header to after OpenSSL headers, since some versions of OpenSSL have
       SSLeay_add_all_algorithms as a macro already.

commit e1c4c542116fd41eec7dcb0d0b40d0797181c959
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 28 15:01:13 2008 +1100

     - (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes
       linking problems on AIX with gcc 4.1.x.

commit 935e20a3f0b1bfbec50217d28983186cfd1ad203
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 25 21:13:47 2008 +1100

     - (dtucker) [includes.h openbsd-compat/openssl-compat.c] Bug #1437: reshuffle
       headers so ./configure --with-ssl-engine actually works.  Patch from
       Ian Lister.

commit acada07b525a21b938ae17c311f529edde932371
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 25 21:05:04 2008 +1100

     - (dtucker) [configure.ac audit-bsm.c] Bug #1420: Add a local implementation
       of aug_get_machine for systems that don't have their own (eg OS X, FreeBSD).    Help and testing from csjp at FreeBSD org, vgiffin at apple com.  ok djm@

commit 2c2ac033c15714c8759a307b4a15963dbee83c58
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 25 20:21:20 2008 +1100

     - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack
       since it now conflicts with the helper function in misc.c.  From
       vinschen AT redhat.com.

commit 2e9b8db4ea096095e6fffc72d7984ad13fee1140
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 25 20:18:31 2008 +1100

    20080224
     - (tim) [contrib/cygwin/ssh-host-config]
       Grammar changes on SYSCONFDIR LOCALSTATEDIR messages.
       Check more thoroughly that it's possible to create the /var/empty directory.
       Patch by vinschen AT redhat.com

commit 401a27a30718d7b2953e4a64ab9fc6c9d13e37b1
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Feb 23 14:47:37 2008 -0800

    [contrib/cygwin/ssh-host-config]
    Grammar changes on SYSCONFDIR LOCALSTATEDIR messages.
    Check more thoroughly that it's possible to create the /var/empty directory.
    Patch by vinschen AT redhat.com

commit 54e3773ccb55500087fc722c79869679700dc318
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:48:55 2008 +1100

       - djm@cvs.openbsd.org 2008/02/10 10:54:29
         [servconf.c session.c]
         delay ~ expansion for ChrootDirectory so it expands to the logged-in user's
         home, rather than the user who starts sshd (probably root)

commit cdb6e65175fab4346be5b74b2527e4f28437e5fe
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:47:24 2008 +1100

       - djm@cvs.openbsd.org 2008/02/10 09:55:37
         [sshd_config.5]
         mantion that "internal-sftp" is useful with ForceCommand too

commit 520e61552a67c95dcf9b423241a0e4454ae911ef
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:46:22 2008 +1100

       - mcbride@cvs.openbsd.org 2008/02/09 12:15:43
         [ssh.1 sshd.8]
         Document the correct permissions for the ~/.ssh/ directory.
         ok jmc

commit 70433b5d7310b03a02424fecf7f40a756fee22ae
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:45:13 2008 +1100

       - jmc@cvs.openbsd.org 2008/02/09 08:04:31
         [sshd_config.5]
         missing `)';

commit 62ca18d12fc815e760e8c73fcce764fef405b313
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:44:20 2008 +1100

       - djm@cvs.openbsd.org 2008/02/08 23:24:07
         [servconf.c servconf.h session.c sftp-server.c sftp.h sshd_config]
         [sshd_config.5]
         add sshd_config ChrootDirectory option to chroot(2) users to a directory
         and tweak internal sftp server to work with it (no special files in chroot
         required). ok markus@

commit d8cb1f184f9acaae02bb4d15ce1e00ffbeeeac88
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:40:12 2008 +1100

       - djm@cvs.openbsd.org 2008/02/08 23:24:07
         [servconf.c servconf.h session.c sftp-server.c sftp.h sshd_config]
         [sshd_config.5]
         add sshd_config ChrootDirectory option to chroot(2) users to a directory
         and tweak internal sftp server to work with it (no special files in
         chroot required). ok markus@

commit dfc24258a75a06ea8a3f56d99d3669e1a012a1dc
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:29:40 2008 +1100

       - markus@cvs.openbsd.org 2008/02/04 21:53:00
         [session.c sftp-server.c sftp.h]
         link sftp-server into sshd; feedback and ok djm@

commit b508faa006a6bcf96f9b59f3e9b6da3c867e8a0f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:28:45 2008 +1100

       - jmc@cvs.openbsd.org 2008/01/31 20:06:50
         [scp.1]
         explain how to handle local file names containing colons;
         requested by Tamas TEVESZ
         ok dtucker

commit 5ed3d575f90cb62979e25c611da29e08069f1006
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:27:47 2008 +1100

       - dtucker@cvs.openbsd.org 2008/01/23 01:56:54
         [clientloop.c packet.c serverloop.c]
         Revert the change for bz #1307 as it causes connection aborts if an IGNORE
         packet arrives while we're waiting in packet_read_expect (and possibly
         elsewhere).

commit acdf25b31f02c010ed2b5f655bbae0f5b75f07f6
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:27:24 2008 +1100

       - djm@cvs.openbsd.org 2008/01/21 19:20:17
         [sftp-client.c]
         when a remote write error occurs during an upload, ensure that ACKs for
         all issued requests are properly drained. patch from t8m AT centrum.cz

commit 3397d0e0c5820464bea4c96e91b5e02cca98330a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:26:51 2008 +1100

       - djm@cvs.openbsd.org 2008/01/21 17:24:30
         [sftp-server.c]
         Remove the fixed 100 handle limit in sftp-server and allocate as many
         as we have available file descriptors. Patch from miklos AT szeredi.hu;
         ok dtucker@ markus@

commit aec5cf8a30c1d44a0cc2da939d39d46cd078d602
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:26:24 2008 +1100

       - djm@cvs.openbsd.org 2008/01/20 00:38:30
         [sftp.c]
         When uploading, correctly handle the case of an unquoted filename with
         glob metacharacters that match a file exactly but not as a glob, e.g. a
         file called "[abcd]". report and test cases from duncan2nd AT gmx.de

commit 3dff176ed9509b5bd92947b9504545495a2052cc
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:25:52 2008 +1100

       - djm@cvs.openbsd.org 2008/01/19 23:09:49
         [readconf.c readconf.h sshconnect2.c]
         promote rekeylimit to a int64 so it can hold the maximum useful limit
         of 2^32; report and patch from Jan.Pechanec AT Sun.COM, ok dtucker@

commit 3de49f8951d8ea4401b0a8ec053fd51d6f309cbe
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:25:24 2008 +1100

       - djm@cvs.openbsd.org 2008/01/19 23:02:40
         [channels.c]
         When we added support for specified bind addresses for port forwards, we
         added a quirk SSH_OLD_FORWARD_ADDR. There is a bug in our handling of
         this for -L port forwards that causes the client to listen on both v4
         and v6 addresses when connected to a server with this quirk, despite
         having set 0.0.0.0 as a bind_address.
         report and patch from Jan.Pechanec AT Sun.COM; ok dtucker@

commit cb2fbb240718d7ca861f4d283711d6a54bc7a714
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:24:55 2008 +1100

       - djm@cvs.openbsd.org 2008/01/19 22:37:19
         [ssh-keygen.c]
         unbreak line numbering (broken in revision 1.164), fix error message

commit a8796f3fcc8584ad01ba0132a0ae1d7d1131febd
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:24:30 2008 +1100

       - djm@cvs.openbsd.org 2008/01/19 22:22:58
         [ssh-keygen.c]
         when hashing individual hosts (ssh-keygen -Hf hostname), make sure we
         hash just the specified hostname and not the entire hostspec from the
         keyfile. It may be of the form "hostname,ipaddr", which would lead to
         a hash that never matches. report and fix from jp AT devnull.cz

commit 6b0c818568b2650f519ee2dc9c685c313d802c1c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:23:41 2008 +1100

       - djm@cvs.openbsd.org 2008/01/19 22:04:57
         [sftp-client.c]
         fix remote handle leak in do_download() local file open error path;
         report and fix from sworley AT chkno.net

commit d39a3cffc907b54e69c3f607c1f0b74e931696fd
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:23:18 2008 +1100

       - djm@cvs.openbsd.org 2008/01/19 20:51:26
         [ssh.c]
         ignore SIGPIPE in multiplex client mode - we can receive this if the
         server runs out of fds on us midway. Report and patch from
         gregory_shively AT fanniemae.com

commit b82f5dd17d2b3379526da41537a676da6fca84c6
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:22:53 2008 +1100

       - djm@cvs.openbsd.org 2008/01/19 20:48:53
         [clientloop.c]
         fd leak on session multiplexing error path. Report and patch from
         gregory_shively AT fanniemae.com

commit 4cd24c7e6a2c5aceeb3ba0fafce2de16015a2a90
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:22:29 2008 +1100

       - djm@cvs.openbsd.org 2008/01/19 19:25:50
         [scp.1]
         scp -q implies ssh -q for the underlying connection, it doesn't just
         hush the progress meter

commit eb602474fcb42ff557abd2c2d5ec3e1700da9044
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:21:28 2008 +1100

       - djm@cvs.openbsd.org 2008/01/19 19:13:28
         [ssh.1]
         satisfy the pedants: -q does not suppress all diagnostic messages (e.g.
         some commandline parsing warnings go unconditionally to stdout).

commit cfe23d34e441114c59db43e672e57f9840475e32
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 22:20:44 2008 +1100

       - chl@cvs.openbsd.org 2008/01/11 07:22:28
         [sftp-client.c sftp-client.h]
         disable unused functions
         initially from tobias@, but disabled them by placing them in
         "#ifdef notyet" which was asked by djm@
         ok djm@ tobias@

commit 49d2a2826aec4c0aba41ea76b1bb7fa446d6fd55
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 08:56:00 2008 +1100

     - (djm) Only listen for IPv6 connections on AF_INET6 sockets; patch from
       tsr2600 AT gmail.com

commit e27220eb5b55974278dd364e8485de56a45662ed
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 20 05:52:04 2008 +1100

     - (djm) Silence noice from expr in ssh-copy-id; patch from
       mikel AT mikelward.com

commit d4827ab50c8cacc7af3bab932b89ac4cfdd1e3c1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 2 18:08:45 2008 +1100

     - (dtucker) [configure.ac] Fix message for -fstack-protector-all test.

commit 40da29a04cc50f27ac63c8fdf7520576545e206e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 2 00:09:16 2008 +1100

       - dtucker@cvs.openbsd.org 2008/01/01 08:51:20
         [moduli]
         Updated moduli file; ok djm@

commit 15f94271be59bc78e92992aae3a21ac6a9c42cfd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 1 20:36:56 2008 +1100

       - dtucker@cvs.openbsd.org 2008/01/01 09:27:33
         [sshd_config.5 servconf.c]
         Allow PermitRootLogin in a Match block.  Allows for, eg, permitting root
         only from the local network.  ok markus@, man page bit ok jmc@

commit 4629f93b128e3cdc71dc05e5709c106b4dd8eae4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 1 20:36:25 2008 +1100

    Add missing ChangeLog entries

commit 9b439c1adc1bdd8248f456005686f8924ca4e03d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 1 20:33:57 2008 +1100

       - dtucker@cvs.openbsd.org 2008/01/01 09:06:39
         [scp.c]
         If scp -p encounters a pre-epoch timestamp, use the epoch which is
         as close as we can get given that it's used unsigned.  Add a little
         debugging while there.  bz #828, ok djm@

commit 912428c91aa9118f807d1e9108da7bc06601095d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 1 20:33:35 2008 +1100

       - dtucker@cvs.openbsd.org 2008/01/01 08:47:04
         [misc.c]
         spaces -> tabs from my previous commit

commit 5891116cb328acbca829be47d3cd36a3bddaa85b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 1 20:33:09 2008 +1100

       - dtucker@cvs.openbsd.org 2007/12/31 15:27:04
         [sshd.c]
         When in inetd mode, have sshd generate a Protocol 1 ephemeral server
         key only for connections where the client chooses Protocol 1 as opposed
         to when it's enabled in the server's config.  Speeds up Protocol 2
         connections to inetd-mode servers that also allow Protocol 1.  bz #440,
         based on a patch from bruno at wolff.to, ok markus@

commit 1e44c5ded38b59ab6bdb8d5c5e85583628b9971c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 1 20:32:26 2008 +1100

     - (dtucker) OpenBSD CVS Sync
       - dtucker@cvs.openbsd.org 2007/12/31 10:41:31
         [readconf.c servconf.c]
         Prevent strict-aliasing warnings on newer gcc versions.  bz #1355, patch
         from Dmitry V. Levin, ok djm@

commit 528d6fa10afce818b794eb73c8e3693ac5d2c493
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 31 21:29:26 2007 +1100

     - (dtucker) [configure.ac openbsd-compat/glob.{c,h}] Bug #1407: force use of
       builtin glob implementation on Mac OS X.  Based on a patch from
       vgiffin at apple.

commit 5baa170d771de9e95cf30b4c469ece684244cf3e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Dec 29 09:37:10 2007 +1100

       - dtucker@cvs.openbsd.org 2007/12/28 22:34:47
         [clientloop.c]
         Use the correct packet maximum sizes for remote port and agent forwarding.
         Prevents the server from killing the connection if too much data is queued
         and an excessively large packet gets sent.  bz #1360, ok djm@.

commit d6725f04e296135732e9366a762222a3f3fd801f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Dec 29 02:45:07 2007 +1100

       - dtucker@cvs.openbsd.org 2007/12/28 15:32:24
         [clientloop.c serverloop.c packet.c]
         Make SSH2_MSG_UNIMPLEMENTED and SSH2_MSG_IGNORE messages reset the
         ServerAlive and ClientAlive timers.  Prevents dropping a connection
         when these are enabled but the peer does not support our keepalives.
         bz #1307, ok djm@.

commit 4abde771b73f3a54780ff3dedf59f57f94298870
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Dec 29 02:43:51 2007 +1100

       - dtucker@cvs.openbsd.org 2007/12/27 14:22:08
         [servconf.c canohost.c misc.c channels.c sshconnect.c misc.h ssh-keyscan.c
         sshd.c]
         Add a small helper function to consistently handle the EAI_SYSTEM error
         code of getaddrinfo.  Prompted by vgiffin at apple com via bz #1417.
         ok markus@ stevesk@

commit 88b976f214e14da4ec29a7516d02c0141c8ef597
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Dec 29 02:40:43 2007 +1100

       - djm@cvs.openbsd.org 2007/12/12 05:04:03
         [sftp.c]
         unbreak lls command and add a regress test that would have caught the
         breakage; spotted by mouring@

commit 06321f5d1d328649913a1ee468d59149974e708f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 2 23:22:52 2007 +1100

       - deraadt@cvs.openbsd.org 2007/11/03 02:03:49
         [ssh.c]
         avoid errno trashing in signal handler; ok dtucker

commit e143f062ba1ee0d38c583acd6a8fbc8e679f45a3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 2 23:21:16 2007 +1100

       - dtucker@cvs.openbsd.org 2007/11/03 02:00:32
         [ssh.c]
         Use xstrdup/xfree when saving pwname and pwdir; ok deraadt@

commit b4fbbc6850fdcee5a96d799efbe74393969577fc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 2 23:16:32 2007 +1100

       - deraadt@cvs.openbsd.org 2007/11/03 01:24:06
         [ssh.c]
         bz #1377: getpwuid results were being clobbered by another getpw* call
         inside tilde_expand_filename(); save the data we need carefully
         ok djm

commit 23ae8ca9487a69533e39e3da1f63b88f5bee5629
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 2 23:12:30 2007 +1100

       - djm@cvs.openbsd.org 2007/11/03 00:36:14
         [clientloop.c]
         fix memory leak in process_cmdline(), patch from Jan.Pechanec AT Sun.COM;
         ok dtucker@

commit 63b31cb9437185dff9574f0245e6953bb7651759
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 2 23:09:30 2007 +1100

       - jmc@cvs.openbsd.org 2007/10/29 07:48:19
         [ssh_config.5]
         clean up after previous macro removal;

commit b776c856aa086b0e136b858d9484c155cb00a99b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 2 23:06:35 2007 +1100

       - dtucker@cvs.openbsd.org 2007/10/29 06:54:50
         [ssh.c]
         Make LocalCommand work for Protocol 1 too; ok djm@

commit a93cadd3d41c9b102c46da8da8a95abc3974afe4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 2 23:05:09 2007 +1100

       - dtucker@cvs.openbsd.org 2007/10/29 06:51:59
         [ssh_config.5]
         ProxyCommand and LocalCommand use the user's shell, not /bin/sh; ok djm@

commit 2f8b3d9855be2cd6a43d32d7b1799ca415f19f1c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 2 23:02:15 2007 +1100

       - dtucker@cvs.openbsd.org 2007/10/29 04:08:08
         [monitor_wrap.c monitor.c]
         Send config block back to slave for invalid users too so options
         set by a Match block (eg Banner) behave the same for non-existent
         users.  Found by and ok djm@

commit 32e42c74a54ba10bf6859f83b52e5b5e7d3c796a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 2 23:01:03 2007 +1100

       - dtucker@cvs.openbsd.org 2007/10/29 01:55:04
         [ssh.c]
         Plug tiny mem leaks in ControlPath and ProxyCommand option processing;
         ok djm@

commit 541dab2db4e89ffdcf9e7a7316765465d601fc32
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 2 22:59:45 2007 +1100

       - dtucker@cvs.openbsd.org 2007/10/29 00:52:45
         [auth2-gss.c]
         Allow build without -DGSSAPI; ok deraadt@
         (Id sync only, Portable already has the ifdefs)

commit e566230cb029b78bcb0192098899d296c13361b2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 2 22:48:40 2007 +1100

     - (dtucker) [scp.c] Update $OpenBSD tag missing from rev 1.175 and remove
       leftover debug code.

commit 319b3d9b00a38d0b7d6965173f3507e80bb1f46e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Dec 2 21:02:22 2007 +1100

     - (dtucker) [configure.ac] Enable -fstack-protector-all on systems where
       gcc supports it.  ok djm@

commit e6d152794949c1e552e154aef6c74ef867991a9b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 30 10:52:44 2007 +1100

       - djm@cvs.openbsd.org 2007/10/29 23:49:41
         [openbsd-compat/sys-tree.h]
         remove extra backslash at the end of RB_PROTOTYPE, report from
         Jan.Pechanec AT Sun.COM; ok deraadt@

commit 0ff80a1b17ab5c804fc123f79ed59df2559884bb
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:48:13 2007 +1000

       - millert@cvs.openbsd.org 2004/10/07 16:56:11
         GLOB_NOESCAPE is POSIX so move it out of the #ifndef _POSIX_SOURCE
         block.
         (NB. mostly an RCS ID sync, as portable strips out the conditionals)

commit a95c0c224bf0969d57fabb27004f4c9b810c26fa
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:46:31 2007 +1000

       - otto@cvs.openbsd.org 2007/04/30 18:42:34
         [openbsd-compat/sys-queue.h]
         Enable QUEUE_MACRO_DEBUG on DIAGNOSTIC kernels.
         Input and okays from krw@, millert@, otto@, deraadt@, miod@.

commit 03c618afa3c19fe4574a5bc45eec09fd0b1d5990
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:45:32 2007 +1000

       - otto@cvs.openbsd.org 2005/11/25 08:06:25
         [openbsd-compat/sys-queue.h]
         Introduce debugging aid for queue macros. Disabled by default; but
         developers are encouraged to run with this enabled.
         ok krw@ fgsch@ deraadt@

commit 300f95fccb6822d50deff0cb2e134c221f823e5a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:44:27 2007 +1000

       - otto@cvs.openbsd.org 2005/10/25 06:37:47
         [openbsd-compat/sys-queue.h]
         Some uvm problem is being exposed with the more strict macros.
         Revert until we've found out what's causing the panics.

commit 0b6a21d468e19702f3a9febdace803225ce2fbf7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:43:22 2007 +1000

       - otto@cvs.openbsd.org 2005/10/24 20:25:14
         [openbsd-compat/sys-queue.h]
         Partly backout. NOLIST, used in LISTs is probably interfering.
         requested by deraadt@

commit 9aeef6b50d23a9f430b65c6f3454d14db0083832
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:42:18 2007 +1000

       - otto@cvs.openbsd.org 2005/10/17 20:19:42
         [openbsd-compat/sys-queue.h]
         Performing certain operations on queue.h data structurs produced
         funny results.  An example is calling  LIST_REMOVE on the same
         element twice. This will not fail, but result in a data structure
         referencing who knows what. Prevent these accidents by NULLing some
         fields on remove and replace. This way, either a panic or segfault
         will be produced on the faulty operation.

commit d129ecb0f98ea6e7e83f2a0a8914d3f99d5184c9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:41:14 2007 +1000

       - deraadt@cvs.openbsd.org 2005/02/25 13:29:30
         [openbsd-compat/sys-queue.h]
         minor white spacing

commit b99f5f714ba889a831591a1bdf436e29041c7dab
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:40:20 2007 +1000

       - grange@cvs.openbsd.org 2004/05/04 16:59:32
         [openbsd-compat/sys-queue.h]
         Remove useless ``elm'' argument from the SIMPLEQ_REMOVE_HEAD macro.
         This matches our SLIST behaviour and NetBSD's SIMPLEQ as well.
         ok millert krw deraadt

commit 0afeae426c7251877dfcfc6d8124ad5edc009557
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:39:05 2007 +1000

       - tdeval@cvs.openbsd.org 2004/11/24 18:10:42
         [openbsd-compat/sys-tree.h]
         typo

commit 88aa4e3d61baebe5db400000f9475f1608054b49
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:37:43 2007 +1000

       - frantzen@@cvs.openbsd.org 2004/04/24 18:11:46
         [openbsd-compat/tree.h]
         sync to Niels Provos' version.  avoid unused variable warning in
         RB_NEXT()

commit 2f715eeb5cc2ba730822ac04833408ab7a0696f4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:26:46 2007 +1000

       - jakob@cvs.openbsd.org 2007/10/11 18:36:41
         [openbsd-compat/getrrsetbyname.c openbsd-compat/getrrsetbyname.h]
         use RRSIG instead of SIG for DNSSEC. ok djm@

commit 1651f6c40eaba61a6a2f30b79c57348e6906070f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:17:24 2007 +1000

       - otto@cvs.openbsd.org 2006/10/21 09:55:03
         [openbsd-compat/base64.c]
         remove calls to abort(3) that can't happen anyway; from
         <bret dot lambert at gmail.com>; ok millert@ deraadt@

commit a97529fa2ead2e6fa88de3cc599832cf1e3bc4eb
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:16:09 2007 +1000

     - (djm) [openbsd-compat/bindresvport.c]
       Sync RCS ID after irrelevant (for portable OpenSSH) header shuffling

commit 9ed564349195376767bb2ef8cbb502401f0d0dbf
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:14:46 2007 +1000

       - jakob@cvs.openbsd.org 2007/10/11 18:36:41
         [openbsd-compat/getrrsetbyname.c]
         use RRSIG instead of SIG for DNSSEC. ok djm@

commit 9c51c8d81a6a6702a74761986cd2e86a82a406cd
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 16:13:39 2007 +1000

       - deraadt@cvs.openbsd.org 2005/11/28 17:50:12
         [openbsd-compat/glob.c]
         unused arg in internal static API

commit c77cadbff06a0b1f05dfacb94449094106d70faf
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 15:39:15 2007 +1000

      - djm@cvs.openbsd.org 2007/10/24 03:44:02
         [scp.c]
         factor out network read/write into an atomicio()-like function, and
         use it to handle short reads, apply bandwidth limits and update
         counters. make network IO non-blocking, so a small trickle of
         reads/writes has a chance of updating the progress meter; bz #799
         ok dtucker@

commit 89437edafd157a3a01589a72d3779dafa5a64311
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 15:37:50 2007 +1000

     - (djm) [regress/sftp-cmds.sh]
       Use more restrictive glob to pick up test files from /bin - some platforms
       ship broken symlinks there which could spoil the test.

commit da1e4bd3bf039cc81fc2ee3f971a3ad23fa5c51c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 15:35:54 2007 +1000

       - djm@cvs.openbsd.org 2007/10/26 05:30:01
         [regress/sftp-glob.sh regress/test-exec.sh]
         remove "echo -E" crap that I added in last commit and use printf(1) for
         cases where we strictly require echo not to reprocess escape characters.

commit ce0e60ee57a2990e892b4bda98c6d223426ee9a4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:54:12 2007 +1000

       - djm@cvs.openbsd.org 2007/10/24 03:32:35
         [regress/sftp-cmds.sh regress/sftp-glob.sh regress/test-exec.sh]
         comprehensive tests for sftp escaping its interaction with globbing;
         ok dtucker@

commit 47d7dc8530f0b459ace5f7a98aeade204a8fbef9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:45:57 2007 +1000

       - pvalchev@cvs.openbsd.org 2007/06/07 19:41:46
         [regress/cipher-speed.sh regress/try-ciphers.sh]
         test umac-64@openssh.com
         ok djm@

commit 80ba1300e248d914512f579a9bfac1193f7ec746
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:45:13 2007 +1000

       - dtucker@cvs.openbsd.org 2006/12/13 08:36:36
         [regress/cfgmatch.sh]
         Additional test for multiple PermitOpen entries.  ok djm@

commit 99ad35352a03463a2a56557d6f3979bf13284162
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:44:34 2007 +1000

       - markus@cvs.openbsd.org 2006/11/06 09:27:43
         [regress/cfgmatch.sh]
         fix quoting for non-(c)sh login shells.

commit fa66aa739f6522c49cdf68a475d7a725128b5107
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:43:50 2007 +1000

       - djm@cvs.openbsd.org 2006/08/29 09:44:00
         [regress/sftp-cmds.sh]
         clean up our mess

commit 77d57b06a4abd691f957aad2e852bd9ff1fd17f4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:28:01 2007 +1000

      - djm@cvs.openbsd.org 2007/10/24 03:44:02
         [scp.c]
         factor out network read/write into an atomicio()-like function, and
         use it to handle short reads, apply bandwidth limits and update
         counters. make network IO non-blocking, so a small trickle of
         reads/writes has a chance of updating the progress meter; bz #799
         ok dtucker@

commit 1cbc292bc0b43a03071ef4924d14186dd0cf054e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:27:45 2007 +1000

       - djm@cvs.openbsd.org 2007/10/24 03:30:02
         [sftp.c]
         rework argument splitting and parsing to cope correctly with common
         shell escapes and make handling of escaped characters consistent
         with sh(1) and between sftp commands (especially between ones that
         glob their arguments and ones that don't).
         parse command flags using getopt(3) rather than hand-rolled parsers.
         ok dtucker@

commit 5a4456c6a592143a0a25ad925279eaf9ff620cc4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:27:22 2007 +1000

       - markus@cvs.openbsd.org 2007/10/22 19:10:24
         [readconf.c]
         make sure that both the local and remote port are correct when
         parsing -L; Jan Pechanec (bz #1378)

commit 3dddab3b951cc7d28218d432f53fcbd499b0bc71
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:27:02 2007 +1000

       - chl@cvs.openbsd.org 2007/10/02 17:49:58
         [ssh-keygen.c]
         handles zero-sized strings that fgets can return
         properly removes trailing newline
         removes an unused variable
         correctly counts line number
         "looks ok" ray@ markus@

commit 0f4ed693d655429ad544b36c7305216d155a2d4b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:26:32 2007 +1000

       - chl@cvs.openbsd.org 2007/10/02 17:49:58
         [ssh-keygen.c]
         handles zero-sized strings that fgets can return

commit b8c98076283a43e21dc53580837f3296c186ecd6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:26:15 2007 +1000

       - dtucker@cvs.openbsd.org 2007/09/29 00:25:51
         [auth2.c]
         Remove unused prototype.  ok djm@

commit 603077ab4c2446d19784e84590ae13c58f9d5032
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:25:55 2007 +1000

       - ray@cvs.openbsd.org 2007/09/27 00:15:57
         [dh.c]
         Don't return -1 on error in dh_pub_is_valid(), since it evaluates
         to true.
         Also fix a typo.
         Initial diff from Matthew Dempsky, input from djm.
         OK djm, markus.

commit 4c7728c651254eb05a8c3ffbcc25632b7c80e722
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:25:31 2007 +1000

       - canacar@cvs.openbsd.org 2007/09/25 23:48:57
         [ssh-agent.c]
         When adding a key that already exists, update the properties
         (time, confirm, comment) instead of discarding them. ok djm@ markus@

commit 733124b5dd735cdd12be7dd7002a22f5d3896e29
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:25:12 2007 +1000

       - djm@cvs.openbsd.org 2007/09/21 08:15:29
         [auth-bsdauth.c auth-passwd.c auth.c auth.h auth1.c auth2-chall.c]
         [monitor.c monitor_wrap.c]
         unifdef -DBSD_AUTH
         unifdef -USKEY
         These options have been in use for some years;
         ok markus@ "no objection" millert@
         (NB. RCD ID sync only for portable)

commit cfb606cd5f1b01d5ffe4e9972a65458d1b923111
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:24:48 2007 +1000

       - djm@cvs.openbsd.org 2007/09/21 03:05:23
         [ssh_config.5]
         document KbdInteractiveAuthentication in ssh_config.5;
         patch from dkg AT fifthhorseman.net

commit 32a9dba66d64bee67ddf3894a4677fcb1b87f66a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 26 14:24:30 2007 +1000

       - stevesk@cvs.openbsd.org 2007/09/11 23:49:09
         [sshpty.c]
         remove #if defined block not needed; ok markus@ dtucker@
         (NB. RCD ID sync only for portable)

commit bc1bd9dbe33642bca860919dcfd95e0362d7aba4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 27 07:03:20 2007 +1000

     - (dtucker) [configure.ac defines.h] Shadow expiry does not work on QNX6
       so disable it for that platform.  From bacon at cs nyu edu.

commit 7c92a65a1d0feaa9712aa0542fe44455d621397a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 27 07:00:09 2007 +1000

     - (dtucker) [configure.ac atomicio.c] Fall back to <sys/poll.h> if we don't
       have <poll.h> (eq QNX).  From bacon at cs nyu edu.

commit ed626b42cc4414235fc2181cc139362e5e054b04
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 21 13:12:49 2007 +1000

     - (djm) [atomicio.c] Fix spin avoidance for platforms that define
       EWOULDBLOCK; patch from ben AT psc.edu

commit 6ebefac25a5fb7a900cd8342390cfac7a81bd35d
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Sep 17 08:32:32 2007 -0700

     - (tim) [defines.h] Fix regression in long password support on OpenServer 6.
       Problem report and additional testing rac AT tenzing.org.

commit 8b3fdfb6af2b945b250b5d414225cc6c4be0df5a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 16:12:03 2007 +1000

       - djm@cvs.openbsd.org 2007/09/16 00:55:52
         [sftp-client.c]
         use off_t instead of u_int64_t for file offsets, matching what the
         progressmeter code expects; bz #842

commit 35e18dba89ac0fd068f16388563861dccbeb527c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 16:11:33 2007 +1000

       - djm@cvs.openbsd.org 2007/09/13 04:39:04
         [sftp-server.c]
         fix incorrect test when setting syslog facility; from Jan Pechanec

commit 83e04f2023cb80366cf4f06a43f4df6ad2b5f08b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 16:11:01 2007 +1000

       - stevesk@cvs.openbsd.org 2007/09/12 19:39:19
         [umac.c]
         use xmalloc() and xfree(); ok markus@ pvalchev@

commit 1235cd387e0fee0595129f0fa55216ab0d040c94
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 16:10:21 2007 +1000

       - stevesk@cvs.openbsd.org 2007/09/11 23:49:09
         [sshpty.c]
         remove #if defined block not needed; ok markus@ dtucker@
         NB. RCS ID sync only

commit 14b017d6f2277c83856489054e9c6c1428095bbb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 16:09:15 2007 +1000

       - gilles@cvs.openbsd.org 2007/09/11 15:47:17
         [session.c ssh-keygen.c sshlogin.c]
         use strcspn to properly overwrite '\n' in fgets returned buffer
         ok pyr@, ray@, millert@, moritz@, chl@

commit 9c89c837ccfeafb09f3d6fb463942fc919f3dc29
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 16:07:32 2007 +1000

       - stevesk@cvs.openbsd.org 2007/09/11 04:36:29
         [sshpty.c]
         sort #include
         NB. RCS ID sync only

commit 5cbe7ca18df76241a3772cef49e1f6e80709420d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 16:05:50 2007 +1000

       - sobrado@cvs.openbsd.org 2007/09/09 11:38:01
         [ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.c]
         sort synopsis and options in ssh-agent(1); usage is lowercase
         ok jmc@

commit 67bd062b27f87047ec48e9a0dd9a47eec2891973
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 12:06:57 2007 +1000

       - djm@cvs.openbsd.org 2007/09/04 11:15:56
         [ssh.c sshconnect.c sshconnect.h]
         make ssh(1)'s ConnectTimeout option apply to both the TCP connection and
         SSH banner exchange (previously it just covered the TCP connection).
         This allows callers of ssh(1) to better detect and deal with stuck servers
         that accept a TCP connection but don't progress the protocol, and also
         makes ConnectTimeout useful for connections via a ProxyCommand;
         feedback and "looks ok" markus@

commit 54fd7cf2db5327f304825e0f9aaf9af5a490a75f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 12:04:08 2007 +1000

       - djm@cvs.openbsd.org 2007/09/04 03:21:03
         [clientloop.c monitor.c monitor_fdpass.c monitor_fdpass.h]
         [monitor_wrap.c ssh.c]
         make file descriptor passing code return an error rather than call fatal()
         when it encounters problems, and use this to make session multiplexing
         masters survive slaves failing to pass all stdio FDs; ok markus@

commit 1d824ab2e72daf8563f6dc72f4b3638da3b91dce
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 11:58:04 2007 +1000

       - djm@cvs.openbsd.org 2007/08/23 03:23:26
         [sshconnect.c]
         Execute ProxyCommands with $SHELL rather than /bin/sh unconditionally

commit 4890e539774ab8b57aa0ee733a5b07bdf9561af6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 11:57:38 2007 +1000

       - djm@cvs.openbsd.org 2007/08/23 03:22:16
         [auth2-none.c sshd_config sshd_config.5]
         Support "Banner=none" to disable displaying of the pre-login banner;
         ok dtucker@ deraadt@

commit 6f40204c442c92b180edc871e8946bade9f6b56f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 11:55:25 2007 +1000

       - djm@cvs.openbsd.org 2007/08/23 03:06:10
         [auth.h]
         login_cap.h doesn't belong here
         NB. RCS ID sync only for portable

commit 6ef50134c257b9e043e4a92821c5688263865d38
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 11:54:24 2007 +1000

       - djm@cvs.openbsd.org 2007/08/23 02:55:51
         [auth-passwd.c auth.c session.c]
         missed include bits from last commit
         NB. RCS ID sync only for portable

commit 6572db28fdf60cf681ecc365358985ee6e8172d8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 11:52:59 2007 +1000

       - djm@cvs.openbsd.org 2007/08/23 02:49:43
         [auth-passwd.c auth.c session.c]
         unifdef HAVE_LOGIN_CAP; ok deraadt@ millert@
         NB. RCS ID sync only for portable

commit 84287b831ecbe105cea14294c8f5b058546ce801
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 14 10:04:15 2007 +1000

     - (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path.
       Patch from Jan.Pechanec at sun com.

commit 0eeaf127b522caa8e5d9924de7ee33af80a01a5d
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Sep 10 16:24:17 2007 -0700

     - (tim) [configure.ac] Autoconf didn't define HAVE_LIBIAF because we
       did a AC_CHECK_FUNCS within the AC_CHECK_LIB test.

commit e296d58dcfbc9b072e4998580552b30e3723cbd6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 10 13:20:14 2007 +1000

     - (dtucker) [openbsd-compat/regress/closefromtest.c] Bug #1358: Always
       return 0 on successful test.  From David.Leonard at quest com.

commit ac4ee1eb0f8fe5dbb61523060a86b0a8fa2e029b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 4 16:49:39 2007 +1000

    don't say it twice

commit 6c3d7035a1808c604477b7736c3557a4a30c8d9d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 4 14:26:32 2007 +1000

    credit Jan Pechanec

commit ef15482d879ca14c00346877819be82520e49ba9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 4 14:05:24 2007 +1000

    Mention Jan Pechanec

commit fb206ded167f45dfe11abd6636afcfc78d9e3b3e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 17 22:52:05 2007 +1000

     - (dtucker) [INSTALL] Link to tcpwrappers.

commit 8ea84561c4eb5cd4a5c13f31054b02c6924b7261
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 17 22:12:14 2007 +1000

     - (dtucker) [INSTALL] Give PAM its own heading.

commit ea43c496500f2ceaf1a825acb7b717042b01e5c1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 17 22:10:10 2007 +1000

     - (dtucker) [INSTALL] the pid file is sshd.pid not ssh.pid.

commit 1a32953e487ceb311e38b603f270d7ddbd241a04
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 17 22:03:09 2007 +1000

     - (dtucker) [INSTALL] Group the parts describing random options and PAM
       implementations together which is hopefully more coherent.

commit 637cc404c655ba935a28b03c813a949d45fa2d35
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 17 21:40:22 2007 +1000

    typo

commit 1a9176bf22be43b5125abc8528b4cf7a2bfd8503
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 17 09:42:32 2007 +1000

     - (dtucker) [sshd.8] Many Linux variants use a single "!" to denote locked
       accounts and that's what the code looks for, so make man page and code
       agree.  Pointed out by Roumen Petrov.

commit 9142e1c66d64bcca850b51cc445fe37920266c48
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 16 23:28:04 2007 +1000

     - (dtucker) [session.c] Call PAM cleanup functions for unauthenticated
       connections too.  Based on a patch from Sandro Wefel, with & ok djm@

commit fc5d188b34eb34a5c26c7430e563403bb36df5fb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 15 22:20:22 2007 +1000

       - stevesk@cvs.openbsd.org 2007/08/15 12:13:41
         [ssh_config.5]
         tun device forwarding now honours ExitOnForwardFailure; ok markus@

commit 9d81fdc664770594989cc9e8d0903c563a61698d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 15 19:22:20 2007 +1000

     - (dtucker) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec
       contrib/suse/openssh.spec] Crank version.

commit 794f97026e3cf46e80b7fe4df6ca68960f8b4667
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 15 19:17:43 2007 +1000

     - (dtucker) [openbsd-compat/bsd-cray.c] Remove debug from signal handler.
       ok djm@

commit 69fe0e1398e95445f0e19fc560ab56595972acfe
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 15 19:14:52 2007 +1000

       - markus@cvs.openbsd.org 2007/08/15 08:16:49
         [version.h]
         openssh 4.7

commit 513d13accd7925f6c94ffe2003c15ee5bbc5e9d1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 15 19:13:41 2007 +1000

       - markus@cvs.openbsd.org 2007/08/15 08:14:46
         [clientloop.c]
         do NOT fall back to the trused x11 cookie if generation of an untrusted
         cookie fails; from security-alert at sun.com; ok dtucker

commit 2d9636471bb75c10342dbabcc2f6a0b2e60cca01
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 13 23:11:56 2007 +1000

     - (dtucker) [session.c] Bug #1339: ensure that pam_setcred() is always
       called with PAM_ESTABLISH_CRED at least once, which resolves a problem
       with pam_dhkeys.  Patch from David Leonard, ok djm@

commit 8acb3b665bf7f27207ce9694826029165f8c0cd6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 10 14:36:12 2007 +1000

     - (dtucker) [configure.ac] Bug #1343: Set DISABLE_FD_PASSING for QNX6. From.
       Matt Kraai, ok djm@.

commit 57d4ca96819651354bdff706df08b3d70a054439
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 10 14:32:34 2007 +1000

     - (dtucker) [auth-pam.c] Use sigdie here too.  ok djm@

commit 7015e9667abbd45fd3a0384e171a2531156933fe
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 9 15:03:23 2007 +1000

    Credit Bernhard Simon who also reported this.

commit a5b6f72a523c23c0c49a8e0231646e329a05a434
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 9 14:37:52 2007 +1000

     - (dtucker) [defines.h] Remove _PATH_{CSHELL,SHELLS} which aren't
       used anywhere and are a potential source of warnings.

commit 6f6b27d515a1807086e59a8918eb0ca8c1cea398
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 9 14:31:53 2007 +1000

     - (dtucker) [README.platform] Document the interaction between PermitRootLogin
       and the AIX native login restrictions.

commit 863cfa0e6f98c0a2bdea3e4af0ca590942532d9d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 9 14:29:47 2007 +1000

     - (dtucker) [openbsd-compat/port-aix.c] Comment typo.

commit b3ce9fec309a6dd695811d977593961d6dfac710
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 8 14:32:41 2007 +1000

       - djm@cvs.openbsd.org 2007/08/07 07:32:53
         [clientloop.c clientloop.h ssh.c]
         bz#1232: ensure that any specified LocalCommand is executed after the
         tunnel device is opened. Also, make failures to open a tunnel device
         fatal when ExitOnForwardFailure is active.
         Reported by h.goebel AT goebel-consult.de; ok dtucker markus reyk deraadt

commit 647d97b1ab1f8ef4dfa6c7a085b409e1c3609c6f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 8 14:29:58 2007 +1000

       - sobrado@cvs.openbsd.org 2007/08/06 19:16:06
         [scp.1 scp.c]
         the ellipsis is not an optional argument; while here, sync the usage
         and synopsis of commands
         lots of good ideas by jmc@
         ok jmc@

commit 932040285fc0bf5a1a5bd5b3266ee3bf043cf7f1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 8 14:28:26 2007 +1000

       - ray@cvs.openbsd.org 2007/07/12 05:48:05
         [key.c]
         Delint: remove some unreachable statements, from Bret Lambert.
         OK markus@ and dtucker@.

commit cd22d30f321cf40cb4935896a1aad9768c002127
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jul 24 21:40:59 2007 -0700

     - (tim) [buildpkg.sh.in] s|$FAKE_ROOT/${sysconfdir}|$FAKE_ROOT${sysconfdir}|

commit ffe3a8ec7e53325636f70b35c141578c4d21f200
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jul 24 21:16:07 2007 -0700

     - (tim) [buildpkg.sh.in openssh.xml.in] Allow more flexibility where smf(5)
       files are installed.

commit bf0212d1b751fa6f6844607b2bd12544b0ed90e4
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jul 24 20:54:09 2007 -0700

     - (tim) [openbsd-compat/regress/closefromtest.c] Bug 1345: fix open() call.
       Report/patch by David.Leonard AT quest.com

commit 947fd59f7a086f197f72da8a01b71adaedce9082
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jul 24 13:13:42 2007 -0700

     - (tim) [openssh.xml.in] make FMRI match what package scripts use.

commit 0d7b93473c7654dabdf8b8d207169af0278e9728
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 28 08:48:02 2007 +1000

     - (djm) bz#1325: Fix SELinux in permissive mode where it would
       incorrectly fatal() on errors. patch from cjwatson AT debian.org;
       ok dtucker

commit febf0f5668f997c63210b3dbd50ce5443b0f6aea
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 25 22:15:12 2007 +1000

     - (dtucker) [atomicio.c configure.ac openbsd-compat/Makefile.in
       openbsd-compat/bsd-poll.{c,h} openbsd-compat/openbsd-compat.h]
       Add an implementation of poll() built on top of select(2).  Code from
       OpenNTPD with changes suggested by djm.  ok djm@

commit dc4a779fbbefd662e1b0b4dd2417329826ff264f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 25 22:08:10 2007 +1000

       - dtucker@cvs.openbsd.org 2007/06/25 12:02:27
         [atomicio.c]
         Include <poll.h> like the man page says rather than <sys/poll.h>.  ok djm@

commit 9e223240ac65e5662bf4d48945198fba80e9f886
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 25 19:06:53 2007 +1000

     - (dtucker) [atomicio.c] Test for EWOULDBLOCK in atomiciov to match
       atomicio.

commit ae09cb8a7123416217e88a42c2c0ad04230d5314
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 25 19:04:46 2007 +1000

       - dtucker@cvs.openbsd.org 2007/06/25 08:20:03
         [channels.c]
         Correct test for window updates every three packets; prevents sending
         window updates for every single packet.  ok markus@

commit ab17f7d67b2decbd8561977a47fec55a9e74337e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 25 19:04:12 2007 +1000

       - djm@cvs.openbsd.org 2007/06/19 02:04:43
         [atomicio.c]
         if the fd passed to atomicio/atomiciov() is non blocking, then poll() to
         avoid a spin if it is not yet ready for reading/writing; ok dtucker@

commit 132367f76f3529b3f4d530a38a4988ec296a3d3f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 25 18:59:17 2007 +1000

       - djm@cvs.openbsd.org 2007/06/14 22:48:05
         [ssh.c]
         when waiting for the multiplex exit status, read until the master end
         writes an entire int of data *and* closes the client_fd; fixes mux
         regression spotted by dtucker, ok dtucker@

commit d989adadd33ed305a22f555d7d69db3cff4e83da
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 25 18:34:43 2007 +1000

       - djm@cvs.openbsd.org 2007/06/14 21:43:25
         [ssh.c]
         handle EINTR when waiting for mux exit status properly

commit 067263e84800c4b35f9bbbfafdd92aea493b6e0b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 25 18:32:33 2007 +1000

       - djm@cvs.openbsd.org 2007/06/13 00:21:27
         [scp.c]
         don't ftruncate() non-regular files; bz#1236 reported by wood AT
         xmission.com; ok dtucker@

commit 7dae3d296e685843f003038a7f1a9f8ef7f614bd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 14 23:47:31 2007 +1000

     - (dtucker) [openbsd-compat/openssl-compat.h] Remove redundant definition
       of USE_BUILTIN_RIJNDAEL since the <0.9.6 test is covered by the
       subsequent <0.9.7 test.

commit a2ed75582fb10a67424bca64775d0121631760fb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 14 23:38:39 2007 +1000

     - (dtucker) [openbsd-compat/openssl-compat.h] Merge USE_BUILTIN_RIJNDAEL
       sections.  Fixes builds with early OpenSSL 0.9.6 versions.

commit cb52017ad9024e4d72766a19f286addcdafc2374
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 14 23:21:32 2007 +1000

     - (dtucker) [cipher-ctr.c umac.c openbsd-compat/openssl-compat.h] Move the
       USE_BUILTIN_RIJNDAEL compat goop to openssl-compat.h so it can be
       shared with umac.c.  Allows building with OpenSSL 0.9.5 again including
       umac support.  With tim@ djm@, ok djm.

commit bed63112f5a1f52b255f03bc2f457eaab5001e0c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 13 00:02:07 2007 +1000

       - dtucker@cvs.openbsd.org 2007/06/12 13:54:28
         [scp.c]
         Encode filename with strnvis if the name contains a newline (which can't
         be represented in the scp protocol), from bz #891.  ok markus@

commit 0409e15078f70a64c6ec4b4519dbf82fd9c0650e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 13 00:00:58 2007 +1000

       - jmc@cvs.openbsd.org 2007/06/12 13:43:55
         [ssh.1]
         add -K to SYNOPSIS;

commit 930cb0b71801d730135d0a860d429804ff7d7871
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 13 00:00:27 2007 +1000

       - jmc@cvs.openbsd.org 2007/06/12 13:41:03
         [ssh-add.1]
         identies -> identities;

commit b1e128f75a46a81023482ed00e8e7989f5a95215
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 12 23:44:36 2007 +1000

       - dtucker@cvs.openbsd.org 2007/06/12 11:56:15
         [gss-genr.c]
         Pass GSS OID to gss_display_status to provide better information in
         error messages.  Patch from Simon Wilkinson via bz 1220.  ok djm@

commit 26047496519e9ad25fb60da24645580200ecae50
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 12 23:44:10 2007 +1000

       - djm@cvs.openbsd.org 2007/06/12 11:45:27
         [ssh.c]
         improved exit message from multiplex slave sessions; bz #1262
         reported by alexandre.nunes AT gmail.com; ok dtucker@

commit 415bddc1bdd2d0be418ab82520512d77643c05b0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 12 23:43:16 2007 +1000

       - djm@cvs.openbsd.org 2007/06/12 11:15:17
         [ssh.c ssh.1]
         Add "-K" flag for ssh to set GSSAPIAuthentication=yes and
         GSSAPIDelegateCredentials=yes. This is symmetric with -k (disable GSSAPI)
         and is useful for hosts with /home on Kerberised NFS; bz #1312
         patch from Markus.Kuhn AT cl.cam.ac.uk; ok dtucker@ markus@

commit 2cbec749d76e73be167bc600ba4c5886b607eab2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 12 23:41:33 2007 +1000

       - djm@cvs.openbsd.org 2007/06/12 11:11:08
         [ssh.c]
         fix slave exit value when a control master goes away without passing the
         full exit status by ensuring that the slave reads a full int. bz#1261
         reported by frekko AT gmail.com; ok markus@ dtucker@

commit 43ce902449abc553e570af717a5eafe689150381
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 12 23:41:06 2007 +1000

       - djm@cvs.openbsd.org 2007/06/12 08:24:20
         [scp.c]
         make scp try to skip FIFOs rather than blocking when nothing is listening.
         depends on the platform supporting sane O_NONBLOCK semantics for open
         on FIFOs (apparently POSIX does not mandate this), which OpenBSD does.
         bz #856; report by cjwatson AT debian.org; ok markus@

commit 8f6d0ed60eb0d790564a5f47ba63c9bc3c734058
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 12 23:40:39 2007 +1000

       - djm@cvs.openbsd.org 2007/06/12 08:20:00
         [ssh-gss.h gss-serv.c gss-genr.c]
         relocate server-only GSSAPI code from libssh to server; bz #1225
         patch from simon AT sxw.org.uk; ok markus@ dtucker@

commit 29a5707accd89cefb6c0a03ada09511c0cd6985a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 12 23:39:52 2007 +1000

       - djm@cvs.openbsd.org 2007/06/12 07:41:00
         [ssh-add.1]
         better document ssh-add's -d option (delete identies from agent), bz#1224
         new text based on some provided by andrewmc-debian AT celt.dias.ie;
         ok dtucker@

commit 395ecc2bdeefd86a31562dd4145f370b816814bd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 12 23:38:53 2007 +1000

       - markus@cvs.openbsd.org 2007/06/11 09:14:00
         [channels.h]
         increase default channel windows; ok djm

commit 3191a8e8ba454c0cc27fa8a24a9eed87cd111e4b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 11 18:33:15 2007 +1000

       - markus@cvs.openbsd.org 2007/06/11 08:04:44
         [channels.c]
         send 'window adjust' messages every tree packets and do not wait
         until 50% of the window is consumed.  ok djm dtucker

commit 725286e2239ad3a2f918602a40bd43a94739e6d6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 11 14:44:02 2007 +1000

     - (dtucker) [includes.h] Bug #1243: HAVE_PATHS -> HAVE_PATHS_H.  Should
       prevent warnings about redefinitions of various things in paths.h.
       Spotted by cartmanltd at hotmail.com.

commit 1534fa41e07283acf83a50e6c2bbc8ca2f71ab97
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 11 14:34:53 2007 +1000

     - (dtucker) [openbsd-compat/bsd-misc.c] According to the spec the "remainder"
       argument to nanosleep may be NULL.  Currently this never happens in OpenSSH,
       but check anyway in case this changes or the code gets used elsewhere.

commit 34a176995fe658e221b3a14730b695dd9f6943e5
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 11 14:15:42 2007 +1000

     - (djm) [configure.ac umac.c] If platform doesn't provide swap32(3), then
       fallback to provided bit-swizzing functions

commit 22b7b4933108dd07c9000bffcde8c13dbdcd240f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 11 14:07:12 2007 +1000

       - jmc@cvs.openbsd.org 2007/06/08 07:48:09
         [sshd_config.5]
         oops, here too: put the MAC list into a display, like we do for
         ciphers, since groff has trouble with wide lines;

commit 5e7c30bdf1629884f09f0713973f9ad635990e8c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 11 14:06:32 2007 +1000

       - jmc@cvs.openbsd.org 2007/06/08 07:43:46
         [ssh_config.5]
         put the MAC list into a display, like we do for ciphers,
         since groff has trouble handling wide lines;

commit 4de545a6fb9450ea636a0ce813971dffe2840f25
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 11 14:04:42 2007 +1000

       - pvalchev@cvs.openbsd.org 2007/06/08 04:40:40
         [ssh_config]
         Add a "MACs" line after "Ciphers" with the default MAC algorithms,
         to ease people who want to tweak both (eg. for performance reasons).
         ok deraadt@ djm@ dtucker@

commit e45796f7b425c04b6ba2d1f72e22c0cb6b3322ef
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 11 14:01:42 2007 +1000

       - pvalchev@cvs.openbsd.org 2007/06/07 19:37:34
         [kex.h mac.c mac.h monitor_wrap.c myproposal.h packet.c ssh.1]
         [ssh_config.5 sshd.8 sshd_config.5]
         Add a new MAC algorithm for data integrity, UMAC-64 (not default yet,
         must specify umac-64@openssh.com). Provides about 20% end-to-end speedup
         compared to hmac-md5. Represents a different approach to message
         authentication to that of HMAC that may be beneficial if HMAC based on
         one of its underlying hash algorithms is found to be vulnerable to a
         new attack.  http://www.ietf.org/rfc/rfc4418.txt
         in conjunction with and OK djm@

commit 835284b74c984600aa50ebac527c37238027b4da
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 11 13:03:16 2007 +1000

     - (djm) Bugzilla #1306: silence spurious error messages from hang-on-exit
       fix; tested by dtucker@ and jochen.kirn AT gmail.com

commit 66177929aef3f13e0c2c8ce4430af1252ad7b66b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 11 12:52:24 2007 +1000

    spacing

commit 0c0dc49bd145828df58302e85111938b46fc9a58
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 5 20:01:16 2007 +1000

     - (dtucker) [mdoc2man.awk] Add support for %R references, used for RFCs.

commit 88bca0641d410bba22cce9c1407d5bd6ac79e5c3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 5 19:30:47 2007 +1000

     - (dtucker) [mdoc2man.awk] Remove trailing "$" from Mdocdate regex so
       mindrot's cvs doesn't expand it on us.

commit 51e5ab06d327f08b5d74fb8ea7b3fb5c2cde30a2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 5 19:16:59 2007 +1000

     - (dtucker) [mdoc2man.awk] Teach it to deal with $Mdocdate tags that
       OpenBSD's cvs now adds.

commit 5f3d5be52f02d2d149cc11ec4a511d022444d2b1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 5 18:30:18 2007 +1000

       - djm@cvs.openbsd.org 2007/06/05 06:52:37
         [kex.c monitor_wrap.c packet.c mac.h kex.h mac.c]
         Preserve MAC ctx between packets, saving 2xhash calls per-packet.
         Yields around a 12-16% end-to-end speedup for arcfour256/hmac-md5
         patch from markus@ tested dtucker@ and myself, ok markus@ and me (I'm
         committing at his request)

commit 7b21cb5bdc6d0e587f646397b6c6f6ef87505e0b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 5 18:29:35 2007 +1000

       - djm@cvs.openbsd.org 2007/06/02 09:04:58
         [bufbn.c]
         memory leak on error path; from arnaud.lacombe.1 AT ulaval.ca

commit a394f9913c9e03579bfabda6487124878e194b2a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 5 18:28:20 2007 +1000

       - djm@cvs.openbsd.org 2007/05/31 23:34:29
         [packet.c]
         gc unreachable code; spotted by Tavis Ormandy

commit aa4d5eda10363af5a830e5723857751cb98b6fc8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 5 18:27:13 2007 +1000

       - jmc@cvs.openbsd.org 2007/05/31 19:20:16
         [scp.1 ssh_config.5 sftp-server.8 ssh-agent.1 sshd_config.5 sftp.1
         ssh-keygen.1 ssh-keyscan.1 ssh-add.1 sshd.8 ssh.1 ssh-keysign.8]
         convert to new .Dd format;
         (We will need to teach mdoc2man.awk to understand this too.)

commit 0d0d1959698b4537705509dd6b89039e354a4416
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 5 18:23:28 2007 +1000

       - djm@cvs.openbsd.org 2007/05/30 05:58:13
         [kex.c]
         tidy: KNF, ARGSUSED and u_int

commit 4a40ae28c3d956dd5f2cddb6a6ee3393afdea731
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 5 18:22:32 2007 +1000

       - djm@cvs.openbsd.org 2007/05/22 10:18:52
         [sshd.c]
         zap double include; from p_nowaczyk AT o2.pl
         (not required in -portable, Id sync only)

commit 2216471510b3de30cb9df3e81bdfa267152ecd39
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 20 15:26:07 2007 +1000

     - (dtucker) [auth-pam.c] Return empty string if fgets fails in
       sshpam_tty_conv.  Patch from ldv at altlinux.org.

commit 29171e9f5c094d912bd27c60b2973617e05cc785
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 20 15:20:08 2007 +1000

     - (dtucker) [auth-pam.c] malloc+memset -> calloc.  Patch from
       ldv at altlinux.org.

commit f520ea156782619321d4d5ac2389130615b7eea3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 20 15:11:33 2007 +1000

       - jolan@cvs.openbsd.org 2007/05/17 23:53:41
         [sshconnect2.c]
         djm owes me a vb and a tism cd for breaking ssh compilation

commit 7fa339bb7ca96be1824d85e579cfcfb1be507e51
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 20 15:10:16 2007 +1000

       - djm@cvs.openbsd.org 2007/05/17 20:52:13
         [monitor.c]
         pass received SIGINT from monitor to postauth child so it can clean
         up properly. bz#1196, patch from senthilkumar_sen AT hotpop.com;
         ok markus@

commit 26c6662834a0ed748c52044a60ed51b9102e7d54
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 20 15:09:42 2007 +1000

       - djm@cvs.openbsd.org 2007/05/17 20:48:13
         [sshconnect2.c]
         fall back to gethostname() when the outgoing connection is not
         on a socket, such as is the case when ProxyCommand is used.
         Gives hostbased auth an opportunity to work; bz#616, report
         and feedback stuart AT kaloram.com; ok markus@

commit e9405983dc1cf9399e560e70f7c681ba62e09131
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 20 15:09:04 2007 +1000

       - djm@cvs.openbsd.org 2007/05/17 07:55:29
         [sftp-server.c]
         bz#1286 stop reading and processing commands when input or output buffer
         is nearly full, otherwise sftp-server would happily try to grow the
         input/output buffers past the maximum supported by the buffer API and
         promptly fatal()
         based on patch from Thue Janus Kristensen; feedback & ok dtucker@

commit 36b78000a7bc14def417251aa50ebcdfcf182345
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 20 15:08:15 2007 +1000

       - djm@cvs.openbsd.org 2007/05/17 07:50:31
         [log.c]
         save and restore errno when logging; ok deraadt@

commit f78bb41772ad72f4d05ecb594dfa243463c842da
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 20 15:03:15 2007 +1000

       - dtucker@cvs.openbsd.org 2007/04/23 10:15:39
         [servconf.c]
         Remove debug() left over from development.  ok deraadt@

commit 86473c57a853a8b5449026659f14640bd2275dc1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 20 14:59:32 2007 +1000

       - stevesk@cvs.openbsd.org 2007/04/18 01:12:43
         [sftp-server.c]
         cast "%llu" format spec to (unsigned long long); do not assume a
         u_int64_t arg is the same as 'unsigned long long'.
         from Dmitry V. Levin <ldv@altlinux.org>
         ok markus@ 'Yes, that looks correct' millert@

commit 208ac57c305fbd477256528cbc8d9b12a376a936
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 20 14:58:41 2007 +1000

       - stevesk@cvs.openbsd.org 2007/04/14 22:01:58
         [auth2.c]
         remove unused macro; from Dmitry V. Levin <ldv@altlinux.org>

commit aa8954f1d968e648858921200fc7b1367368358d
Author: Tim Rice <tim@multitalents.net>
Date:   Wed May 9 15:57:43 2007 -0700

    20070509
     - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h.

commit d0adab5a1285dfbefe13abacea3f95a60236a922
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Apr 29 17:14:48 2007 +1000

    trim pasto

commit dca0edff2fb312e05fd7f2d560fb80bc97a38350
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Apr 29 15:06:44 2007 +1000

     - (dtucker) [configure.ac defines.h] Have configure check for offsetof
       to prevent redefinition warnings.

commit 391de5c0237a452d7653e88b54c825a5fb468e3a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Apr 29 14:49:21 2007 +1000

     - (dtucker) [configure.ac defines.h] Prevent warnings about __attribute__
       __nonnull__ for versions of GCC that don't support it.

commit 6d862a50dbe6a473c2e204d85d3e66e6a0293614
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Apr 29 14:39:02 2007 +1000

     - (dtucker) [configure.ac defines.h] Have configure check for MAXSYMLINKS
       so we don't get redefinition warnings.

commit 2ac529b5055ebccd5c2251e373940eee156dc967
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Apr 29 14:02:43 2007 +1000

     - (dtucker) [openbsd-compat/xmmap.c] Include stdlib.h for mkstemp prototype.

commit cc40d5ecdfe1bdb8f37cc385669e8b6e0b641fb2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Apr 29 13:58:06 2007 +1000

     - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Bug #1299: Use the
       platform's _res if it has one.  Should fix problem of DNSSEC record lookups
       on NetBSD as reported by Curt Sampson.

commit d757e69cdae6bbb8c5626ff25f8f2fc151ebc98f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Apr 29 12:10:57 2007 +1000

     - (dtucker) [auth-shadow.c loginrec.c] Include time.h for time(2) prototype.

commit 781e7a28d0376af76bae27495bac5054510688b1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Apr 29 12:06:55 2007 +1000

     - (dtucker) [openbsd-compat/bsd-misc.c] Include unistd.h and sys/types.h
       for select(2) prototype.

commit 2a3868589b2c7a7893f08d254f1c8fd0b23098a5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 6 12:25:08 2007 +1000

     - (dtucker) [INSTALL] prngd lives at sourceforge these days.

commit 62995c1f1e802f378edbb747c84c12f51c75dd61
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 6 12:21:47 2007 +1000

     - (dtucker) [INSTALL] Update the systems that have PAM as standard.  Link
       to OpenPAM too.

commit 99203ec48b030f121511cd785acaf9f47760ad72
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Mar 26 09:35:28 2007 -0700

    20070326
     - (tim) [auth.c configure.ac defines.h session.c openbsd-compat/port-uw.c
       openbsd-compat/port-uw.h openbsd-compat/xcrypt.c] Rework libiaf test/defines
       to account for IRIX having libiaf but not set_id(). Patch with & ok dtucker@

commit 20e9f976c16f98f3106f2dc298421a4a8c1ca8d7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 25 18:26:01 2007 +1000

     - (dtucker) [Makefile.in configure.ac] Replace single-purpose LIBSELINUX,
       LIBWRAP and LIBPAM variables in Makefile with the general-purpose
       SSHDLIBS.  "I like" djm@

commit 9869ab35577fdeafecdff2bec00036408d576f0e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 21 21:45:48 2007 +1100

     - (dtucker) [regress/agent-getpeereid.sh] Do peereid test if we have
       HAVE_GETPEERUCRED too.  Also from Jan Pechanec.

commit 164aa30e4604672f688b5c51b90e42dfa129821b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 21 21:39:57 2007 +1100

     - (dtucker) [configure.ac openbsd-compat/bsd-getpeereid.c] Bug #1287: Use
       getpeerucred to implement getpeereid (currently only Solaris 10 and up).
       Patch by Jan.Pechanec at Sun.

commit 04354b97dc1cc87d01a33db508a9ea0f0148fb83
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 21 20:46:54 2007 +1100

       - jmc@cvs.openbsd.org 2007/03/20 15:57:15
         [sshd.8]
         - let synopsis and description agree for -f
         - sort FILES
         - +.Xr ssh-keyscan 1 ,
         from Igor Sobrado

commit 03b1cdbb44c998d933cf804decff92f6eafa6e65
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 21 20:46:03 2007 +1100

       - tedu@cvs.openbsd.org 2007/03/20 03:56:12
         [readconf.c clientloop.c]
         remove some bogus *p tests from charles longeau
         ok deraadt millert

commit 2812dc92859ab0dc095d38494d651bd83f3c1dc5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 21 20:45:06 2007 +1100

       - dtucker@cvs.openbsd.org 2007/03/19 12:16:42
         [ssh-agent.c]
         Remove the signal handler that checks if the agent's parent process
         has gone away, instead check when the select loop returns.  Record when
         the next key will expire when scanning for expired keys.  Set the select
         timeout to whichever of these two things happens next.  With djm@, with &
         ok deraadt@ markus@

commit 506ed88cef81bdaed373e90204090e27711633ff
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 21 20:42:24 2007 +1100

       - djm@cvs.openbsd.org 2007/03/19 01:01:29
         [sshd_config]
         Disable the legacy SSH protocol 1 for new installations via
         a configuration override. In the future, we will change the
         server's default itself so users who need the legacy protocol
         will need to turn it on explicitly

commit 97b1bb568c534ce6cc664f2f91be5aa1b76ce4a4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 21 20:38:53 2007 +1100

       - dtucker@cvs.openbsd.org 2007/03/09 05:20:06
         [servconf.c sshd.c]
         Move C/R -> kbdint special case to after the defaults have been
         loaded, which makes ChallengeResponse default to yes again.  This
         was broken by the Match changes and not fixed properly subsequently.
         Found by okan at demirmen.com, ok djm@ "please do it" deraadt@

commit 5548e8cf2ea9be7c45cb6d1ee4b91e2c673123d3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 13 21:00:45 2007 +1100

     - (dtucker) [README.platform] Info about blibpath on AIX.

commit da05f48739c678b88c7e9c071883cd8b5eae5af1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 13 18:50:04 2007 +1100

     - (dtucker) [cipher-3des1.c cipher-bf1.c] The OpenSSL 0.9.8e problem in
       bug #1291 also affects Protocol 1 3des.  While at it, use compat-openssl.h
       in cipher-bf1.c.  Patch from Juan Gallego.

commit b9fe6a337a31421caeec5ee033a87ab68643efe9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 13 07:37:49 2007 +1100

     - (dtucker) [LICENCE] Add Daniel Walsh as a copyright holder for the
       selinux bits in -portable.

commit a8d51ee3078c46918b88164330262555704ff869
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 13 07:35:38 2007 +1100

     - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include
       string.h to prevent warnings, from vapier at gentoo.org.

commit c49dd34a3e717cd68bff21a61cfa4a57f4d5bea1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 8 20:13:39 2007 +1100

     - (djm) [README] correct link to release notes

commit f0ffec906ce8d6ad850431bd099e5d7b4cc5be1a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 6 21:24:00 2007 +1100

     - (djm) Release 4.6p1

commit d91cfab08801f89717e13016121154a8aabc791c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 6 21:23:24 2007 +1100

     - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] crank spec files for release

commit 2dbab87386ba6816466475fc5308a79199543ebb
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 6 21:21:37 2007 +1100

       - djm@cvs.openbsd.org 2007/03/06 10:13:14
         [version.h]
         openssh-4.6; "please" deraadt@

commit 5737e363c5b8d74ba8caddbcc2458a2c858cf72f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 6 21:21:18 2007 +1100

     - OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2007/03/01 16:19:33
         [sshd_config.5]
         sort the `match' keywords;

commit fd30986c927e66985ddc43b25794651c76ba477c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 5 18:25:20 2007 +1100

     - (dtucker) [openbsd-compat/openssl-compat.h] Bug #1291: Work around a
       bug in OpenSSL 0.9.8e that prevents aes256-ctr, aes192-ctr and arcfour256
       ciphers from working correctly (disconnects with "Bad packet length"
       errors) as found by Ben Harris.  ok djm@

commit 9975e483498430b8fa75fccd2bad681781df24d1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 5 11:51:27 2007 +1100

     - (djm) [configure.ac] add a --without-openssl-header-check option to
       configure, as some platforms (OS X) ship OpenSSL headers whose version
       does not match that of the shipping library. ok dtucker@

commit 90a58fdf22abf77020fb9d3a6bad4fa97f6e3489
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Mar 3 09:42:23 2007 +1100

     - (dtucker) [regress/agent-ptrace.sh] Make ttrace gdb error a little more
       general to cover newer gdb versions on HP-UX.

commit aef5beef1287144cc2e21047c95b351db374ff03
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Mar 2 17:53:41 2007 +1100

     - (dtucker) [INSTALL] Update to autoconf-2.61.

commit 573e3878b8faa7df21ba265b237b7b394a9fc9a7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Mar 2 17:50:03 2007 +1100

     - (dtucker) [configure.ac] For Cygwin, read files in textmode (which allows
       CRLF as well as LF lineendings) and write in binary mode.  Patch from
       vinschen at redhat.com.

commit c3af6d4d130a35120713d937e7d5efc933e86c3a
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 1 09:34:52 2007 -0800

     - (tim) [buildpkg.sh.in openssh.xml.in] Clean up Solaris 10 smf(5) bits.
       "Looks sane" dtucker@

commit 1d75f22c5d99ce1a4c7a87c7ae042a33fbeefefb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 1 21:31:28 2007 +1100

       - dtucker@cvs.openbsd.org 2007/03/01 10:28:02
         [auth2.c sshd_config.5 servconf.c]
         Remove ChallengeResponseAuthentication support inside a Match
         block as its interaction with KbdInteractive makes it difficult to
         support.  Also, relocate the CR/kbdint option special-case code into
         servconf.  "please commit" djm@, ok markus@ for the relocation.

commit cf0d2db2fa94c9e496c3fdd6bdf85e12d021cd50
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 28 21:19:58 2007 +1100

       - dtucker@cvs.openbsd.org 2007/02/28 00:55:30
         [ssh-agent.c]
         Remove expired keys periodically so they don't remain in memory when
         the agent is entirely idle, as noted by David R. Piegdon.  This is the
         simple fix, a more efficient one will be done later.  With markus,
         deraadt, with & ok djm.

commit 90aaed43979c6b4e42b41ef8dc2a970df248c2c7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 25 20:38:55 2007 +1100

       - ray@cvs.openbsd.org 2007/02/24 03:30:11
         [moduli.c]
         - strlen returns size_t, not int.
         - Pass full buffer size to fgets.
         OK djm@, millert@, and moritz@.

commit 82347a8fd67d294537b0a95e8ea5b7b7912ced11
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 25 20:37:52 2007 +1100

       - dtucker@cvs.openbsd.org 2007/02/22 12:58:40
         [servconf.c]
         Check activep so Match and GatewayPorts work together; ok markus@

commit ed623966e30140cb5c3f13e491338887a52c2522
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 25 20:37:21 2007 +1100

       - dtucker@cvs.openbsd.org 2007/02/21 11:00:05
         [sshd.c]
         Clear alarm() before restarting sshd on SIGHUP.  Without this, if there's
         a SIGALRM pending (for SSH1 key regeneration) when sshd is SIGHUP'ed, the
         newly exec'ed sshd will get the SIGALRM and not have a handler for it,
         and the default action will terminate the listening sshd.  Analysis and
         patch from andrew at gaul.org.

commit d04188e70e17b317076f4c7af3359dc439e43f0b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 25 20:36:49 2007 +1100

       - djm@cvs.openbsd.org 2007/02/20 10:25:14
         [clientloop.c]
         set maximum packet and window sizes the same for multiplexed clients
         as normal connections; ok markus@

commit 89ee69e3c639b55b7577ba8fde66450446f74ea4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 19 22:56:55 2007 +1100

     - (dtucker) [openbsd-compat/getrrsetbyname.c] Don't attempt to calloc
       an array for signatures when there are none since "calloc(0, n) returns
       NULL on some platforms (eg Tru64), which is explicitly permitted by
       POSIX.  Diagnosis and patch by svallet genoscope.cns.fr.

commit 53ced25d6185b4a02305e9d4bf648113155dde07
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 19 22:44:25 2007 +1100

     - (dtucker) [contrib/findssl.sh] Add "which" as a shell function since some
       platforms don't have it.  Patch from dleonard at vintela.com.

commit 1629c07c0725fd5cc533c9664b8e8add27a81c69
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 19 22:25:37 2007 +1100

       - dtucker@cvs.openbsd.org 2007/02/19 10:45:58
         [monitor_wrap.c servconf.c servconf.h monitor.c sshd_config.5]
         Teach Match how handle config directives that are used before
         authentication.  This allows configurations such as permitting password
         authentication from the local net only while requiring pubkey from
         offsite.  ok djm@, man page bits ok jmc@

commit 591322ae3897bef0b19236ec0c2a6053e8466e71
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 19 22:17:28 2007 +1100

       - stevesk@cvs.openbsd.org 2007/02/14 14:32:00
         [bufbn.c]
         typos in comments; ok jmc@

commit 6ec2fbec8b8b0e774d1d32afd26d0d13a2d1e4b7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 19 22:14:11 2007 +1100

       - djm@cvs.openbsd.org 2007/01/22 13:06:21
         [scp.c]
         fix detection of whether we should show progress meter or not: scp
         tested isatty(stderr) but wrote the progress meter to stdout. This patch
         makes it test stdout. bz#1265 reported by junkmail AT bitsculpture.com;
         of dtucker@

commit 0aa3dbb5088fc8c3ca722d901fd8db55a781546b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 19 22:13:39 2007 +1100

       - djm@cvs.openbsd.org 2007/01/22 11:32:50
         [sftp-client.c]
         return error from do_upload() when a write fails. fixes bz#1252: zero
         exit status from sftp when uploading to a full device. report from
         jirkat AT atlas.cz; ok dtucker@

commit cb0e1753c74fdd4dff390f9e8fec16995b1cce53
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 19 22:12:53 2007 +1100

       - stevesk@cvs.openbsd.org 2007/01/21 01:45:35
         [readconf.c]
         spaces

commit c58b5b07420555a12f895b4316b96498d44f02c6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 19 22:12:23 2007 +1100

    ChangeLog entries for previous 2 commits

commit 82a3d2bc6ff4e1a1031274f5298b8b2eddc0439f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 19 22:10:25 2007 +1100

       - stevesk@cvs.openbsd.org 2007/01/21 01:41:54
         [auth-skey.c kex.c ssh-keygen.c session.c clientloop.c]
         spaces

commit a52c5b64868034d874c8a988f476a8b407d152b4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 19 22:09:45 2007 +1100

       - dtucker@cvs.openbsd.org 2007/01/17 23:22:52
         [readconf.c]
         Honour activep for times (eg ServerAliveInterval) while parsing
         ssh_config and ~/.ssh/config so they work properly with Host directives.
         From mario.lorenz@wincor-nixdorf.com via bz #1275.  ok markus@

commit 26dc3e656a2643b8fcb37b24f54ab8e78d61389c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 19 22:09:06 2007 +1100

       - jmc@cvs.openbsd.org 2007/01/12 20:20:41
         [ssh-keygen.1 ssh-keygen.c]
         more secsh -> rfc 4716 updates;
         spotted by wiz@netbsd
         ok markus

commit bf6b328f27ec0e99fbcd5a22f1eab139be0a1fc0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 19 22:08:17 2007 +1100

       - jmc@cvs.openbsd.org 2007/01/10 13:23:22
         [ssh_config.5]
         do not use a list for SYNOPSIS;
         this is actually part of a larger report sent by eric s. raymond
         and forwarded by brad, but i only read half of it. spotted by brad.

commit e42bd24b22bdce7e58b517d0b797d1d66bbec52b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 29 10:16:28 2007 +1100

     - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52)
       when closing a tty session when a background process still holds tty
       fds open. Great detective work and patch by Marc Aurele La France,
       slightly tweaked by me; ok dtucker@

commit 07877ca68066593473fbe29dd309dcdc61b6d629
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 24 00:07:29 2007 +1100

     - (dtucker) [openbsd-compat/bsd-snprintf.c] Static declarations for public
       library interfaces aren't very helpful. Fix up the DOPR_OUTCH macro
       so it works properly and modify its callers so that they don't pre or
       post decrement arguments that are conditionally evaluated. While there,
       put SNPRINTF_CONST back as it prevents build failures in some
       configurations.  ok djm@ (for most of it)

commit 9f7410528945a433f9f640c67677916623f3d7cf
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 22 12:44:53 2007 +1100

     - (djm) [ssh-rand-helper.8] manpage nits;
       from dleonard AT vintela.com (bz#1529)

commit eae5fa1b589a6d1ed3105326710c5d116eecf083
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 17 11:00:13 2007 +1100

     - (dtucker) [packet.c] Re-remove in_systm.h since it's already in includes.h
       and multiple including it causes problems on old IRIXes.  (It snuck back
       in during a sync.)  Found (again) by Georg Schwarz.

commit 742cc1c19420db71275d3e8ef9fb86d96a463a4b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 14 21:20:30 2007 +1100

     - (djm) [openbsd-compat/bsd-snprintf.c] Fix integer overflow in return
       value of snprintf replacement, similar to bugs in various libc
       implementations. This overflow is not exploitable in OpenSSH.
       While I'm fiddling with it, make it a fair bit faster by inlining the
       append-char routine; ok dtucker@

commit e67ac00b9b76f126eec0ec4f0fc02ae66b5a1ad7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 14 10:26:25 2007 +1100

    typo

commit 9ac56e945bbdd1f05e26d5dd7535b69d079a94a2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 14 10:19:59 2007 +1100

     - (dtucker) [ssh-keygen.c] ac -> argv to match earlier sync.

commit e2334d600bda80d5d07beb501da64f234c63800e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 5 16:31:02 2007 +1100

       - stevesk@cvs.openbsd.org 2007/01/03 07:22:36
         [sftp-server.c]
         spaces

commit b6c85fcf37299e5c997a92f9aa39726aa6f34318
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 5 16:30:41 2007 +1100

       - stevesk@cvs.openbsd.org 2007/01/03 04:09:15
         [sftp.c]
         ARGSUSED for lint

commit 80163907edd6a3c7c8de7a40ab9803528cd3acb7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 5 16:30:16 2007 +1100

       - stevesk@cvs.openbsd.org 2007/01/03 03:01:40
         [auth2-chall.c channels.c dns.c sftp.c ssh-keygen.c ssh.c]
         spaces

commit 6c7439f963c04ddeedbb858c5f96647eea3c9360
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 5 16:29:55 2007 +1100

       - stevesk@cvs.openbsd.org 2007/01/03 00:53:38
         [ssh-keygen.c]
         remove small dead code; arnaud.lacombe.1@ulaval.ca via Coverity scan

commit d94fc72bcdd7d9f5a4f02c165c34ed3ffc12ed2b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 5 16:29:30 2007 +1100

       - jmc@cvs.openbsd.org 2007/01/02 09:57:25
         [sshd_config.5]
         do not use lists for SYNOPSIS;
         from eric s. raymond via brad

commit 9fc6a56204d6a1245e79346ed5e714f70c6dc9cc
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 5 16:29:02 2007 +1100

       - dtucker@cvs.openbsd.org 2006/12/14 10:01:14
         [servconf.c]
         Make "PermitOpen all" first-match within a block to match the way other
         options work.  ok markus@ djm@

commit a29b95ec3a0294e62edd7ed26c515bb1a9dc6d6a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 5 16:28:36 2007 +1100

       - dtucker@cvs.openbsd.org 2006/12/13 08:34:39
         [servconf.c]
         Make PermitOpen work with multiple values like the man pages says.
         bz #1267 with details from peter at dmtz.com, with & ok djm@

commit 1ec462658edd8bfea2b5cab461bb9d513e29a151
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 5 16:26:45 2007 +1100

       - djm@cvs.openbsd.org 2006/12/12 03:58:42
         [channels.c compat.c compat.h]
         bz #1019: some ssh.com versions apparently can't cope with the
         remote port forwarding bind_address being a hostname, so send
         them an address for cases where they are not explicitly
         specified (wildcard or localhost bind).  reported by daveroth AT
         acm.org; ok dtucker@ deraadt@

commit c0367fb0d25fe72328c9d0ad3ad4ec21c024115e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 5 16:25:46 2007 +1100

       - markus@cvs.openbsd.org 2006/12/11 21:25:46
         [ssh-keygen.1 ssh.1]
         add rfc 4716 (public key format); ok jmc

commit 3ca8b7717933e28b8bd896aab1738e937e1a3117
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 5 16:24:47 2007 +1100

       - ray@cvs.openbsd.org 2006/11/23 01:35:11
         [misc.c sftp.c]
         Don't access buf[strlen(buf) - 1] for zero-length strings.
         ``ok by me'' djm@.

commit df8b7db16e6ac2cfc216167af0ff1f338e196658
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 5 16:22:57 2007 +1100

     - (djm) OpenBSD CVS Sync
       - deraadt@cvs.openbsd.org 2006/11/14 19:41:04
         [ssh-keygen.c]
         use argc and argv not some made up short form

commit be6db83462c0d4a7067ab303644440026c93d685
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 5 22:58:09 2006 +1100

     - (djm) [bsd-asprintf.c] Better test for bad vsnprintf lengths; ok dtucker@

commit 143c2ef1ce072966d27d269d9acfed08796c390c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 5 09:08:54 2006 +1100

     - (djm) [auth.c] Fix NULL pointer dereference in fakepw().  Crash would
       occur if the server did not have the privsep user and an invalid user
       tried to login and both privsep and krb5 auth are disabled.

commit b0781f79db208900b2d0fd4a1ee69e121bf37792
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Nov 8 10:01:36 2006 +1100

       - markus@cvs.openbsd.org 2006/11/07 13:02:07
         [dh.c]
         BN_hex2bn returns int; from dtucker@

commit 14ea86391b250aaa65cdff8ac4b2c092c6d8d90e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 7 23:27:34 2006 +1100

     - (dtucker) Release 4.5p1.

commit c2820c5822a974e21b82d45739abdaeaee5e183e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 7 23:25:45 2006 +1100

     - (dtucker) [README contrib/{caldera,redhat,contrib}/openssh.spec] Bump
       versions.

commit fbba735aa315532e93a66754b1613c2acf2bde6d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 7 23:16:08 2006 +1100

       - markus@cvs.openbsd.org 2006/11/07 10:31:31
         [monitor.c version.h]
         correctly check for bad signatures in the monitor, otherwise the monitor
         and the unpriv process can get out of sync. with dtucker@, ok djm@,
         dtucker@

commit 0bc85579a9b5a106826169303dd2ee61c63c161e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 7 23:14:41 2006 +1100

       - markus@cvs.openbsd.org 2006/11/06 21:25:28
         [auth-rsa.c kexgexc.c kexdhs.c key.c ssh-dss.c sshd.c kexgexs.c
         ssh-keygen.c bufbn.c moduli.c scard.c kexdhc.c sshconnect1.c dh.c rsa.c]
         add missing checks for openssl return codes; with & ok djm@

commit df0e438a2e4efe0422f6e0deb732d819d5938437
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 7 11:28:40 2006 +1100

     - (dtucker) [sshd.c] Use privsep_pw if we have it, but only require it
       if we absolutely need it.  Pointed out by Corinna, ok djm@

commit 570c2ab1b619ea36a06bfbf21d88a82683cc4213
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Nov 5 05:32:02 2006 +1100

       - markus@cvs.openbsd.org 2006/10/31 16:33:12
         [kexdhc.c kexdhs.c kexgexc.c kexgexs.c]
         check DH_compute_key() for -1 even if it should not happen because of
         earlier calls to dh_pub_is_valid(); report krahmer at suse.de; ok djm

commit 3975ee2c3ce78af4f62ff8e9e5b636ef378b7f6b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Nov 5 05:31:33 2006 +1100

     - (djm) OpenBSD CVS Sync
       - otto@cvs.openbsd.org 2006/10/28 18:08:10
         [ssh.1]
         correct/expand example of usage of -w; ok jmc@ stevesk@

commit 4d13ecea54da655dd87152752f332f25785a1e18
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Nov 1 10:28:49 2006 +1100

     - (dtucker) [openbsd-compat/port-solaris.c] Bug #1255: Make only hwerr
       events fatal in Solaris process contract support and tell it to signal
       only processes in the same process group when something happens.
       Based on information from andrew.benham at thus.net and similar to
       a patch from Chad Mynhier.  ok djm@

commit 796c6c693d1eaed63fe334c98b109a2ada15f505
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 28 01:10:15 2006 +1000

    - (djm) [auth.c] gc some dead code

commit bcf8be356fbe7febd882e86b43587d88f0255d95
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Oct 23 14:44:47 2006 -0700

     - (tim) [Makefile.in scard/Makefile.in] Add datarootdir= lines to keep
       autoconf 2.60 from complaining.

commit 50455890f37724113f348f43592b1857071a695c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 24 03:03:02 2006 +1000

       - djm@cvs.openbsd.org 2006/10/22 02:25:50
         [sftp-client.c]
         cancel progress meter when upload write fails; ok deraadt@

commit 985a4485f57af55cd8f097ab437fdf87c365ea96
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 24 03:02:41 2006 +1000

       - markus@cvs.openbsd.org 2006/10/11 12:38:03
         [clientloop.c serverloop.c]
         exit instead of doing a blocking tcp send if we detect a client/server
         timeout, since the tcp sendqueue might be already full (of alive
         requests); ok dtucker, report mpf

commit f4bcd10c4c9b53e7c0c2821825addaf3a13d7c1a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 24 03:02:23 2006 +1000

       - markus@cvs.openbsd.org 2006/10/10 10:12:45
         [sshconnect.c]
         sleep before retrying (not after) since sleep changes errno; fixes
         pr 5250; rad@twig.com; ok dtucker djm

commit 990b1a80b59eb52ae401ed28b0e3a4d5a0963661
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 24 03:01:56 2006 +1000

       - djm@cvs.openbsd.org 2006/10/09 23:36:11
         [session.c]
         xmalloc -> xcalloc that was missed previously, from portable
         (NB. Id sync only for portable, obviously)

commit 952dce6593720a5f24d556a3ec53126d041d28ab
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 24 03:01:16 2006 +1000

       - djm@cvs.openbsd.org 2006/10/06 02:29:19
         [ssh-agent.c ssh-keyscan.c ssh.c]
         sys/resource.h needs sys/time.h; prompted by brad@
         (NB. Id sync only for portable)

commit e7658a50f0c28cf9fe33e35bee9084844b09288c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 24 03:00:12 2006 +1000

     - (djm) OpenBSD CVS Sync
       - ray@cvs.openbsd.org 2006/09/30 17:48:22
         [sftp.c]
         Clear errno before calling the strtol functions.
         From Paul Stoeber <x0001 at x dot de1 dot cc>.
         OK deraadt@.

commit 78802f0af361d90b5e8975cc3f24d35b4fda215f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 18 22:51:31 2006 +1000

     - (dtucker) [sshd.c] Reshuffle storing of pw struct; prevents warnings
       on older versions of OS X.  ok djm@

commit ffe88e15afeb403e775d87cd45ae4bd5f1203172
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 18 07:53:06 2006 +1000

       - ray@cvs.openbsd.org 2006/09/25 04:55:38
         [ssh-keyscan.1 ssh.1]
         Change "a SSH" to "an SSH".  Hurray, I'm not the only one who
         pronounces "SSH" as "ess-ess-aich".
         OK jmc@ and stevesk@.

commit a43c00582549a440fb744bdf8849ae53f97c9bc5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 16 19:49:12 2006 +1000

     - (dtucker) [monitor_fdpass.c] Include sys/in.h, required for cmsg macros
       on older (2.0) Linuxes.  Based on patch from thmo-13 at gmx de.

commit 77674b1efa744ad03eca3ca1cfcff3abecd55134
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Oct 6 18:49:36 2006 -0700

     - (tim) [buildpkg.sh.in] Some systems have really limited nawk (OpenServer).
       Allow setting alternate awk in openssh-config.local.

commit adc947d5a532880e7a2ffd1828789ada8fea6931
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 7 09:07:20 2006 +1000

     - (dtucker) [configure.ac] Set put -lselinux into $LIBS while testing for
       SELinux functions so they're detected correctly.  Patch from pebenito at
       gentoo.org.

commit 09f1093a29e6dcbec76cfa1831d080ced2d4b627
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Oct 6 14:58:38 2006 -0700

    20061006
     - (tim) [buildpkg.sh.in] Use uname -r instead of -v in OS_VER for Solaris.
       Differentiate between OpenServer 5 and OpenServer 6

commit 1cfab23b7f9e29fa9d66c97334ef9331d033f83d
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Oct 3 09:34:35 2006 -0700

     - (tim) [configure.ac] Move CHECK_HEADERS test before platform specific
       section so additional platform specific CHECK_HEADER tests will work
       correctly. Fixes "<net/if_tap.h> on FreeBSD" problem report by des AT des.no
       Feedback and "seems like a good idea" dtucker@

commit 47bda1ff83b67b8007bbdc1e0999e2155e006cad
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 1 08:09:50 2006 +1000

     - (dtucker) [audit-bsm.c] Include errno.h.  Pointed out by des at des.no.

commit 5e8381ee8626c0f0052241926abacf031b5187ec
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 29 20:16:51 2006 +1000

     - (dtucker) [configure.ac] Bug #1239: Fix configure test for OpenSSH engine
       support.  Patch from andrew.benham at thus net.

commit 23dd658e5701ba611229ca1a95dd3ab2c00fb316
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 28 19:40:20 2006 +1000

     - (dtucker) [entropy.c] Bug #1238: include signal.h to fix compilation error
       on Solaris 8 w/out /dev/random or prngd.  Patch from rl at
       math.technion.ac.il.

commit b4b2f9a6c97b5fced719574e64e76fa56fac5613
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 28 19:08:32 2006 +1000

    Marker for 4.4p1 release

commit 25bd3c06126f0a709af129a2d6606c9a59ff13b2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 26 20:14:28 2006 +1000

     - (dtucker) [sftp-server.8] Resync; spotted by djm@

commit 822d3a6fc1ba1627493a0de48be7572343c1c822
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 26 18:59:34 2006 +1000

     - (dtucker) [bufaux.h] nuke bufaux.h; it's already gone from OpenBSD and not
       referenced any more.  ok djm@

commit f2ae7bf4a863485b39b0da38866c60cb2c93ad77
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 26 18:57:28 2006 +1000

    Trim ChangeLog Prior to 4.2p1

commit 983b35b281fa9981acfdf23cd5813897720d1445
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Sep 24 12:08:59 2006 -0700

    20060924
     - (tim) [configure.ac] Remove CFLAGS hack for UnixWare 1.x/2.x (added
       to rev 1.308) to work around broken gcc 2.x header file.

commit 0ee3cbfc519c3be5f842e1ebac1ccc0841ce75d3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 23 16:25:19 2006 +1000

     - (dtucker) [configure.ac] Bug #1234: Put opensc libs into $LIBS rather than
       $LDFLAGS.  Patch from vapier at gentoo org.

commit dace233d70cd5990500651dc416a634ed18e5c02
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 22 19:22:17 2006 +1000

     - (dtucker) [packet.c canohost.c] Include arpa/inet.h for htonl macros on
       some platforms (eg HP-UX 11.00).  From santhi.amirta at gmail com.

commit 0dc5484ca690ff0dce0f9643523b10935140e086
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 21 23:13:30 2006 +1000

     - (dtucker) [defines.h] Include unistd.h before defining getpgrp; fixes
       build error on Ultrix.  From Bernhard Simon.

commit 4aa665b71c72666e23c318046835c3e0712d7e88
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 21 13:00:25 2006 +1000

       - markus@cvs.openbsd.org 2006/09/19 21:14:08
         [packet.c]
         client NULL deref on protocol error; Tavis Ormandy, Google Security Team

commit 1e80e4023bce285ef4858383b5064b9ac3b254c1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 21 12:59:33 2006 +1000

       - otto@cvs.openbsd.org 2006/09/19 05:52:23
         [sftp.c]
         Use S_IS* macros insted of masking with S_IF* flags. The latter may
         have multiple bits set, which lead to surprising results. Spotted by
         Paul Stoeber, more to come. ok millert@ pedro@ jaredy@ djm@

commit c70ce7b09d8fd0b341c33e1b8d584a91bb241547
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 18 23:54:32 2006 +1000

     - (dtucker) [openbsd-compat/port-aix.{c,h}] Reduce scope of includes.
       Prevents macro redefinition warnings of "RDONLY".

commit 9216c37d60fdb8b9e247541991248e0ca86cac07
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 18 23:17:40 2006 +1000

     - (dtucker) [configure.ac] On AIX, check to see if the compiler will allow
       macro redefinitions, and if not, remove "-qlanglvl=ansi" from the flags.
       Allows build out of the box with older VAC and XLC compilers.  Found by
       David Bronder and Bernhard Simon.

commit 83bbb03e52743b8b0d6500fdf46bd9436b0a2543
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 17 22:55:52 2006 +1000

     - (dtucker) [INSTALL] Add info about audit support.

commit 1f062ca339a46d6c1556689b7eb65baacbb4daad
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 17 14:04:46 2006 +1000

     - (djm) [sshd.c] Fix warning/API abuse; ok dtucker@

commit 5965ae13e014f6315eeabfb1195646b9d071b844
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 17 12:00:13 2006 +1000

     - (dtucker) [monitor.c] Correctly handle auditing of single commands when
       using Protocol 1.  From jhb at freebsd.

commit 54e1b2291cf5fcd96ba36d291e6543eab44ec4dd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 17 11:57:46 2006 +1000

     - (dtucker) [auth-pam.c] Propogate TZ environment variable to PAM auth
       process so that any logging it does is with the right timezone.  From
       Scott Strickler, ok djm@.

commit dd1f9b307eb0ab746a9cbd391511dbf646f29210
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 17 08:05:03 2006 +1000

     - (djm) Add openssh.xml to .cvsignore and sort it

commit 3c9c1fbd2184289482710dac4845233f362b917b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 17 06:08:53 2006 +1000

       - djm@cvs.openbsd.org 2006/09/16 19:53:37
         [deattack.c deattack.h packet.c]
         limit maximum work performed by the CRC compensation attack detector,
         problem reported by Tavis Ormandy, Google Security Team;
         ok markus@ deraadt@

commit 223897a01af2f496577cbf8f7fa5c5209109ef8e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 12 21:54:10 2006 +1000

     - (djm) [Makefile.in buildpkg.sh.in configure.ac openssh.xml.in]
       Support SMF in Solaris Packages if enabled by configure. Patch from
       Chad Mynhier, tested by dtucker@

commit 5d8a9acef0228e53e2069c6218beb8716b89aacd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 11 20:46:13 2006 +1000

     - (dtucker) [cipher-aes.c] Include string.h for memcpy and friends.  Noted
       by Pekka Savola.

commit 57b2920ad896b4c1b7a6f5ba0171bdb311e8cc36
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 10 20:25:51 2006 +1000

     - (dtucker) [configure.ac] Add -lcrypt to let DragonFly build OOTB.

commit f376669328e6df2dc78936786787150d98a1df80
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 10 13:24:18 2006 +1000

     - (dtucker) [contrib/aix/buildbff.sh] Ensure that perl is available.

commit 733a292c1125b070a2e49e3e514912460966a03e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 9 20:41:25 2006 +1000

     - (dtucker) [buildpkg.sh.in] Always create privsep user.  ok djm@

commit 19a66dbf4f929c0d9aa89af5b2282470cfb5726b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 9 20:34:15 2006 +1000

     - (dtucker) [contrib/aix/buildbff.sh] Always create privsep user.

commit 08432d54faf63a2f5f9c264ac8ff6aa343ebeabc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 9 15:59:43 2006 +1000

     - (dtucker) [openbsd-compat/bsd-snprintf.c] Add stdarg.h.

commit 6d0d6fbfdfe7afd7fa0bb8541b743f9194cdd437
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 9 01:05:21 2006 +1000

     - (dtucker) [configure.ac] The BSM header test needs time.h in some cases.

commit 17da530d609a62b9d6e5da436feefa4fe38bae7b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 8 09:54:41 2006 +1000

     - (dtucker) [auth-sia.c] Add includes required for build on Tru64.  Patch
       from Chris Adams.

commit 89f59cea1c38ec2dea4e70d61603af8e2668dc94
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 8 00:03:05 2006 +1000

     - (dtucker) [regress/cfgmatch.sh] stop_client is racy, so give us a better
       chance of winning.

commit f19bbc38835acdc80b4c84e053afaf86f5dcb414
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 7 22:57:53 2006 +1000

     - (dtucker) [loginrec.c] Wrap paths.h in HAVE_PATHS_H.

commit b8f00193d84781a46939ffaa94dccbe9986984eb
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Sep 6 18:11:29 2006 -0700

     - (tim) [configure.ac] s/BROKEN_UPDWTMP/BROKEN_UPDWTMPX/ on SCO OSR6

commit 6433df036e6cf37c5ac8fc69dcedc464e6424b16
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 7 10:36:43 2006 +1000

     - (djm) [sshd.c auth.c] Set up fakepw() with privsep uid/gid, so it can
       be used to drop privilege to; fixes Solaris GSSAPI crash reported by
       Magnus Abrante; suggestion and feedback dtucker@
       NB. this change will require that the privilege separation user must
       exist on all the time, not just when UsePrivilegeSeparation=yes

commit 6e1033318cc0bc82a45a18d97894bee7bd60e935
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 5 19:25:19 2006 +1000

     - (dtucker) [loginrec.c] Include paths.h for _PATH_BTMP.

commit e1fe09968d12e79f34d9e48475f2bfd2c0556b83
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 5 07:53:38 2006 +1000

     - (dtucker) [configure.ac] s/AC_DEFINES/AC_DEFINE/ spotted by Roumen Petrov.

commit 3e0891093a990b1d5111d5190f69c13277daedc7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 4 22:37:41 2006 +1000

     - (dtucker) [configure.ac] Define BROKEN_UPDWTMP on SCO OSR6 as the native
       updwdtmp seems to generate invalid wtmp entries.  From Roger Cornelius,
       ok djm@

commit ed0b59218ef9bb41a25922885d3fae7e67b8ba04
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 3 22:44:49 2006 +1000

     - (dtucker) [configure.ac openbsd-compat/openbsd-compat.h] Check for
       declaration of writev(2) and declare it ourselves if necessary.  Makes
       the atomiciov() calls build on really old systems.  ok djm@

commit 46aa3e0ce1d2f341bb3e4d46035faae3bb5ee69c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 2 15:32:40 2006 +1000

     - (dtucker) [ssh-keyscan.c ssh-rand-helper.c ssh.c sshconnect.c
       openbsd-compat/bindresvport.c openbsd-compat/getrrsetbyname.c
       openbsd-compat/port-tun.c openbsd-compat/rresvport.c] Include <arpa/inet.h>
       for hton* and ntoh* macros.  Required on (at least) HP-UX since we define
       _XOPEN_SOURCE_EXTENDED.  Found by santhi.amirta at gmail com.

commit 25fa0ee693fc99377e395bf47d74960ffda20883
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 2 12:38:56 2006 +1000

     - (dtucker) [openbsd-compat/port-irix.c] Add errno.h, found by Iain Morgan.

commit 9fdeb66f67ebdadc1d558736bce99a7d4909713c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 1 21:32:53 2006 +1000

     - (dtucker) [README contrib/{caldera,redhat,suse}/openssh.spec]  Crank
       versions.

commit 096faecdea1e39ecace0b20f4e208bd7ec33f6d2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 1 20:29:10 2006 +1000

     - (dtucker) [configure.ac includes.h openbsd-compat/glob.{c,h}] Explicitly
       test for GLOB_NOMATCH and use our glob functions if it's not found.
       Stops sftp from segfaulting when attempting to get a nonexistent file on
       Cygwin (previous versions of OpenSSH didn't use the native glob). Partly
       from and tested by Corinna Vinschen.

commit 0646ca6be81c4f0f619d92a4e5a041b58c79a221
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 1 19:29:01 2006 +1000

     - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Fix implict declaration
       warnings for binary_open and binary_close.  Patch from Corinna Vinschen.

commit 607aede26c4193bf1bc5063698ea9a36cbd990e3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 1 15:48:19 2006 +1000

     - (djm) [includes.h monitor.c openbsd-compat/bindresvport.c]
       [openbsd-compat/rresvport.c] Some more headers: netinet/in.h
       sys/socket.h and unistd.h in various places

commit ded319cca23923651ddc5e6a4bd4bda66d0737f4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 1 15:38:36 2006 +1000

     - (djm) [audit-bsm.c audit.c auth-bsdauth.c auth-chall.c auth-pam.c]
       [auth-rsa.c auth-shadow.c auth-sia.c auth1.c auth2-chall.c]
       [auth2-gss.c auth2-kbdint.c auth2-none.c authfd.c authfile.c]
       [cipher-3des1.c cipher-aes.c cipher-bf1.c cipher-ctr.c clientloop.c]
       [dh.c dns.c entropy.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]
       [kexdhc.c kexdhs.c kexgexc.c kexgexs.c key.c loginrec.c mac.c]
       [md5crypt.c monitor.c monitor_wrap.c readconf.c rsa.c]
       [scard-opensc.c scard.c session.c ssh-add.c ssh-agent.c ssh-dss.c]
       [ssh-keygen.c ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c]
       [sshconnect1.c sshconnect2.c sshd.c rc4.diff]
       [openbsd-compat/bsd-cray.c openbsd-compat/port-aix.c]
       [openbsd-compat/port-linux.c openbsd-compat/port-solaris.c]
       [openbsd-compat/port-uw.c]
       Lots of headers for SCO OSR6, mainly adding stdarg.h for log.h;
       compile problems reported by rac AT tenzing.org

commit 288cbbd59ed70dc137f83588a9ded946069776cc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 31 11:28:49 2006 +1000

     - (dtucker) [contrib/cygwin/ssh-host-config] Add SeTcbPrivilege privilege
       while setting up the ssh service account.  Patch from Corinna Vinschen.

commit 1b06dc30ad4692ec76c476d130ba7366f7ebfef2
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 31 03:24:41 2006 +1000

     - (djm) [CREDITS LICENCE Makefile.in auth.c configure.ac includes.h ]
       [platform.c platform.h sshd.c openbsd-compat/Makefile.in]
       [openbsd-compat/openbsd-compat.h openbsd-compat/port-solaris.c]
       [openbsd-compat/port-solaris.h] Add support for Solaris process
       contracts, enabled with --use-solaris-contracts. Patch from Chad
       Mynhier, tweaked by dtucker@ and myself; ok dtucker@

commit 26d4e19caa3013f57dc3c1462847eceaac6a1d7d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 30 22:33:09 2006 +1000

     - (dtucker) [auth.c openbsd-compat/port-aix.c] Bug #1207: always call
       loginsuccess on AIX immediately after authentication to clear the failed
       login count.  Previously this would only happen when an interactive
       session starts (ie when a pty is allocated) but this means that accounts
       that have primarily non-interactive sessions (eg scp's) may gradually
       accumulate enough failures to lock out an account.  This change may have
       a side effect of creating two audit records, one with a tty of "ssh"
       corresponding to the authentication and one with the allocated pty per
       interactive session.

commit 8ff1da81ec5e3032befb98349ec6ceba84dab706
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 17:52:03 2006 +1000

     - (djm) [openbsd-compat/xcrypt.c] needs unistd.h

commit 6ba57409417431f26ad960ed717880d04273c714
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 11:09:01 2006 +1000

       - djm@cvs.openbsd.org 2006/08/30 00:14:37
         [version.h]
         crank to 4.4

commit 2125887a940f5ec60f2e5699aa77ca3e431de635
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 11:08:33 2006 +1000

       - dtucker@cvs.openbsd.org 2006/08/30 00:06:51
         [sshconnect2.c]
         Fix regression where SSH2 banner is printed at loglevels ERROR and FATAL
         where previously it weren't.  bz #1221, found by Dean Kopesky, ok djm@

commit 76758b6423a2567b07927139d7d5538f14cb331b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 11:08:04 2006 +1000

       - dtucker@cvs.openbsd.org 2006/08/29 12:02:30
         [gss-genr.c]
         Work around a problem in Heimdal that occurs when KRB5CCNAME file is
         missing, by checking whether or not kerberos allocated us a context
         before attempting to free it.  Patch from Simon Wilkinson, tested by
         biorn@, ok djm@

commit d5fe0baa73a168a1194b311aeff9fd824b038740
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 11:07:39 2006 +1000

       - djm@cvs.openbsd.org 2006/08/29 10:40:19
         [channels.c session.c]
         normalise some inconsistent (but harmless) NULL pointer checks
         spotted by the Stanford SATURN tool, via Isil Dillig;
         ok markus@ deraadt@

commit 5d43d4901496159611ab7b431caf9a9c08ecbdcd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 11:07:00 2006 +1000

       - dtucker@cvs.openbsd.org 2006/08/21 08:15:57
         [sshd.8]
         Add more detail about what permissions are and aren't accepted for
         authorized_keys files.  Corrections jmc@, ok djm@, "looks good" jmc@

commit b594f38bae891e5149e3c0a7e6d7b4d501b50c01
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 11:06:34 2006 +1000

     - (djm) OpenBSD CVS Sync
       - dtucker@cvs.openbsd.org 2006/08/21 08:14:01
         [sshd_config.5]
         Document HostbasedUsesNameFromPacketOnly.  Corrections from jmc@,
         ok jmc@ djm@

commit 9162028887ac2cd40e66b08868748e53f8d9d1ac
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 24 19:58:36 2006 +1000

     - (dtucker) [openbsd-compat/xmmap.c] Move #define HAVE_MMAP to prevent
       unused variable warning when we have a broken or missing mmap(2).
    
    Now with 100% more diff!

commit e83a83c7bed442a9edd7114ae334b79b43753f00
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 24 19:55:41 2006 +1000

     - (dtucker) [openbsd-compat/xmmap.c] Move #define HAVE_MMAP to prevent
       unused variable warning when we have a broken or missing mmap(2).

commit c1abe8e3e89de85d5f0b093e0cc2b56a6cdc6887
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 24 19:53:40 2006 +1000

     - (dtucker) [openbsd-compat/rresvport.c] Include <stdlib.h> for malloc.

commit f80f5ec81bf445d09034a2caff93bc3582cd87c3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 24 19:52:30 2006 +1000

     - (dtucker) [openbsd-compat/bsd-openpty.c] Include for ioctl(2).

commit 450d2af2a3f07e46cc1490a0029a9f669dd60108
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 24 19:45:33 2006 +1000

     - (dtucker) [openbsd-compat/bsd-misc.c] Include <sys/select.h> for select(2)
       on POSIX systems.

commit e086955531ffef96bc15d51a07f25ae65804dc1c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 24 19:43:16 2006 +1000

     - (dtucker) [openbsd-compat/bsd-misc.c] Add includes needed for select(2) on
       older systems.

commit fe408b4826f92b96976b46dec02218bd66dfc6e1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 24 19:41:03 2006 +1000

     - (dtucker) [openbsd-compat/basename.c] Include errno.h.

commit 12259d9680c953329f9ec0601fdde31e26e42607
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 22 22:24:10 2006 +1000

     - (dtucker) [Makefile.in] Bug #1177: fix incorrect path for sshrc in
       Makefile.  Patch from santhi.amirta at gmail, ok djm.

commit 0eb810015f9ba94ac04464fc6a714b17e604acbc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 20 21:43:19 2006 +1000

     - (dtucker) [configure.ac] Remove errant "-".

commit 639bbe8bfe3d5038c279c97699de06cb0f120458
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 20 20:17:53 2006 +1000

     - (dtucker) [configure.ac] Bug #1181: Explicitly test to see if OpenSSL
       (0.9.8a and presumably newer) requires -ldl to successfully link.

commit 3e6bde483de0de7ec38f131ee2639e52c828bec8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 20 20:03:50 2006 +1000

     - (dtucker) [configure.ac] Relocate --with-pam parts in preparation for
       fixing bug #1181.  No changes yet.

commit 4ba387337cde36071917ea1c8f0277653a6670fc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 20 19:55:02 2006 +1000

     - (dtucker) [configure.ac] Save $LIBS during PAM library tests and restore
       afterward.  Removes the need to mangle $LIBS later to remove -lpam and -ldl.

commit aa1517ca1e7e71070b77357626c87dcf9ee30697
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 20 17:55:54 2006 +1000

     - (dtucker) [log.c] Move ifdef to prevent unused variable warning.

commit f0625699dff5e62e69b454acd9ea4c5bef7787b5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 19 19:12:14 2006 +1000

     - (dtucker) [openbsd-compat/regress/Makefile.in] Add $(EXEEXT) and add a
       single rule for the test progs.

commit deccaa7d0f8e8c8cd8f1f9ebb7d02fe2f456a760
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 19 08:50:57 2006 +1000

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2006/08/18 22:41:29
         [gss-genr.c]
         GSSAPI error code should be 0 and not -1; from simon@sxw.org.uk

commit bb59814cd644f78e82df07d820ed00fa7a25e68a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 19 08:38:23 2006 +1000

     - (djm) Disable sigdie() for platforms that cannot safely syslog inside
       a signal handler (basically all of them, excepting OpenBSD);
       ok dtucker@

commit 3d2d6e90e4c6f46347b7212401198babe49f2c50
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 19 00:46:43 2006 +1000

       - djm@cvs.openbsd.org 2006/08/18 14:40:34
         [gss-genr.c ssh-gss.h]
         constify host argument to match the rest of the GSSAPI functions and
         unbreak compilation with -Werror

commit a1cb9f334bcc6ebd7bf2b5229b7645d995de0a15
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 19 00:33:34 2006 +1000

       - djm@cvs.openbsd.org 2006/08/18 13:54:54
         [gss-genr.c ssh-gss.h sshconnect2.c]
         bz #1218 - disable SPNEGO as per RFC4462; diff from simon AT sxw.org.uk
         ok markus@

commit bdf00ca0bda672d07516d65eaea999931dafdac3
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 19 00:33:05 2006 +1000

       - djm@cvs.openbsd.org 2006/08/18 10:27:16
         [misc.h]
         reorder so prototypes are sorted by the files they refer to; no
         binary change

commit 3f8123c804bdabbc95caf9e3495310e584944fb2
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 19 00:32:46 2006 +1000

       - markus@cvs.openbsd.org 2006/08/18 09:15:20
         [auth.h session.c sshd.c]
         delay authentication related cleanups until we're authenticated and
         all alarms have been cancelled; ok deraadt

commit 99a648e59291d3adb39eeee4fa1f8a5b2ee2d769
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 19 00:32:20 2006 +1000

       - deraadt@cvs.openbsd.org 2006/08/18 09:13:26
         [log.c log.h sshd.c]
         make signal handler termination path shorter; risky code pointed out by
         mark dowd; ok djm markus

commit a1f6840a4fa1fd48ecbf5a3ebb2c3b18f3a6c587
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 19 00:31:39 2006 +1000

       - djm@cvs.openbsd.org 2006/08/16 11:47:15
         [sshd.c]
         factor inetd connection, TCP listen and main TCP accept loop out of
         main() into separate functions to improve readability; ok markus@

commit 565ca3f60058f22d083572930833aaff2292ac20
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 19 00:23:15 2006 +1000

       - dtucker@cvs.openbsd.org 2006/08/14 12:40:25
         [servconf.c servconf.h sshd_config.5]
         Add ability to match groups to Match keyword in sshd_config.  Feedback
         djm@, stevesk@, ok stevesk@.

commit 1c89ce074920a11ac1eb2093867e50c869d05480
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 19 00:22:40 2006 +1000

       - miod@cvs.openbsd.org 2006/08/12 20:46:46
         [monitor.c monitor_wrap.c]
         Revert previous include file ordering change, for ssh to compile under
         gcc2 (or until openssl include files are cleaned of parameter names
         in function prototypes)

commit 63b94128cbfeb8a7e979baae7f3b29a171e4ab18
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 19 00:21:46 2006 +1000

     - (djm) OpenBSD CVS Sync
       - stevesk@cvs.openbsd.org 2006/08/06 01:13:32
         [compress.c monitor.c monitor_wrap.c]
         "zlib.h" can be <zlib.h>; ok djm@ markus@

commit 637c80aa6f1bbbb93935fe102790820e8bec3a27
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 18 20:56:18 2006 +1000

     - (dtucker) [openbsd-compat/regress/Makefile.in] Use implicit rules for the
       test progs instead; they work better than what we have.

commit ec4e4daa6c9010aee4d0a6c6d49f740e1b0f4013
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 18 20:09:32 2006 +1000

     - (dtucker) [openbsd-compat/regress/snprintftest.c] Newline on error.

commit 43d3ccdbddde9f73e35622248067a050a289480d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 18 19:49:58 2006 +1000

     - (dtucker) [openbsd-compat/bsd-closefrom.c] Comment out rcsid.

commit d018b2e9c88f6669c68f3343dbbf53e6084e8ff7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 18 18:51:20 2006 +1000

     - (dtucker) [configure.ac openbsd-compat/bsd-closefrom.c] Resync with
       closefrom.c from sudo.

commit c889ffdbc6329f21d2437b3c3d17eba0960969fc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 17 19:40:35 2006 +1000

     - (dtucker) [openbsd-compat/regress/{Makefile.in,closefromtest.c}] Regress
       test for closefrom() in compat code.

commit 3083bc2b52fe00b5c5fe87dd3638969835dab0e8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 17 19:35:49 2006 +1000

     - (dtucker) [configure.ac openbsd-compat/bsd-closefrom.c] Use F_CLOSEM fcntl
       for closefrom() on AIX.  Pointed out by William Ahern.

commit e6b641a9a13d664fb7b98227218a0b3f65dfd40c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 17 18:55:27 2006 +1000

     - (dtucker) [openbsd-compat/fake-rfc2553.c openbsd-compat/setproctitle.c]
       Include stdlib.h for malloc and friends.

commit 56799c3f2aaa86df71534cd25dd9e6d05782fa5f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 16 11:40:45 2006 +1000

     - (djm) [audit-bsm.c] Sprinkle in some headers

commit 533418138fb05d29483c702fbc7bb69bca4e1756
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 15 18:21:32 2006 +1000

     - (dtucker) [LICENCE] Add Reyk to the list for the compat dir.

commit 0e5143e88e769b91cdd5b19e36a1d2403acc8e22
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 7 11:26:36 2006 +1000

     - (djm) [openbsd-compat/bsd-getpeereid.c] Add some headers to quiet warnings
       on Solaris 10

commit f78fb54412e34c2647c1bc9f895af00620f42730
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 6 21:25:24 2006 +1000

     - (dtucker) [openbsd-compat/{bsd-asprintf.c,bsd-openpty.c,bsd-snprintf.c,
       glob.c}] Include stdlib.h for malloc and friends in compat code.

commit 32ab2ae3f352447537c959c2df785b8160a642d2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 6 21:23:27 2006 +1000

     - (dtucker) [defines.h] With the includes.h changes we no longer get the
       name clash on "YES" so we can remove the workaround for it.

commit 3e714514e8cf6d1686ecb958c195f60e0a2d6d8f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 6 00:12:54 2006 +1000

     - (dtucker) [audit-bsm.c] Add additional headers now required.

commit 79ba868fbed5c55b11f5c4930aaaf0d6339eb48a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 6 00:05:09 2006 +1000

     - (dtucker) [audit.c audit.h] Repair headers.

commit 6e1a9aa9b9aa39fba068d5fd071bd145da34519b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 19:56:00 2006 +1000

     - (dtucker) [auth-skey.c] monitor_wrap.h needs ssh-gss.h.

commit 2b4e38b71276ac990a97bcfd0917d2514e85011b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 19:18:08 2006 +1000

     - (dtucker) [openbsd-compat/fake-rfc2553.c] Add headers needed for inet_ntoa.

commit 92350103fcf406d054a698ab2ea34feb4bfff6fc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 19:08:16 2006 +1000

     - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Add headers required to compile
       on Cygwin.

commit f676c57958c8e9a743f54a95479db478248d6fd0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 18:51:08 2006 +1000

       - dtucker@cvs.openbsd.org 2006/08/05 08:34:04
         [packet.c]
         Typo in comment

commit d6a23f20572f2abc9c1935da6b68b1979f8f83de
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 18:50:35 2006 +1000

       - dtucker@cvs.openbsd.org 2006/08/05 08:28:24
         [monitor_wrap.c auth-skey.c auth2-chall.c]
         Zap unused variables in -DSKEY code.  ok djm@

commit 260cb3519db3bdc3722b76638edfcecfd885608b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 18:48:01 2006 +1000

       - dtucker@cvs.openbsd.org 2006/08/05 08:00:33
         [auth-skey.c]
         Add headers required to build with -DSKEY.  ok djm@

commit 1a3d6e7bdd1d0a329f40034e7674dcc03e845bf3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 18:46:47 2006 +1000

       - dtucker@cvs.openbsd.org 2006/08/05 07:52:52
         [auth2-none.c sshd.c monitor_wrap.c]
         Add headers required to build with KERBEROS5=no.  ok djm@

commit 8a15f01affbe332970fd8f8b07d3e6d8f7e6acb2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 16:27:20 2006 +1000

     - (dtucker) [openbsd-compat/strtonum.c] Include stdlib.h for strtoll,
       otherwise it is implicitly declared as returning an int.

commit d8aec107fec09a5e943d5ad96d364823b48249d8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 16:12:15 2006 +1000

     - (dtucker) [openbsd-compat/getrrsetbyname.c] Nees stdlib.h for malloc.

commit 4c65543c89f89b25b44ff509bfc49f6e940a128e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 15:57:40 2006 +1000

     - (dtucker) [ssh-rand-helper.c] Needs stdarg.h for log.h.

commit ecf28ba7aaf85952b46caf2d1d1a3700a9f80807
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 15:50:20 2006 +1000

     - (dtucker) [entropy.c] Needs unistd.h too.

commit e7eec90f387c1d8cde3f6f1e543866a62caaa8a4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 15:47:26 2006 +1000

     - (dtucker) [openbsd-compat/{bsd-arc4random.c,port-tun.c,xmmap.c}] Lots of
       #include stdarg.h, needed for log.h.

commit 8c6fedaf22799ac3bfcaad8f6020ec9d5f4d834d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 15:24:59 2006 +1000

     - (dtucker) [auth2-gss.c] We still need the #ifdef GSSAPI in -portable.

commit 90659f8166455cdde9126d0cc0d8388e300dd65c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 5 14:46:27 2006 +1000

     - (dtucker) [cleanup.c] Need defines.h for __dead.

commit 75bb664458d5a825824607841819b9a40d9bfdb5
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 14:07:20 2006 +1000

     - (djm) [auth-pam.c auth-shadow.c auth2-none.c cleanup.c sshd.c]
       [openbsd-compat/port-tun.c openbsd-compat/port-tun.h] Sprinkle more
       includes for Linux in

commit d04db59ad929d289c2dcaa466989659bbc449f6b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 13:27:29 2006 +1000

     - (djm) [openbsd-compat/regress/snprintftest.c]
       [openbsd-compat/regress/strduptest.c] Add missing includes so they pass
       compilation with "-Wall -Werror"

commit 475d61e1043604c0e65211361af08b99003af0d0
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 13:26:13 2006 +1000

    ignore built test binaries too

commit 2a7bf6e7c790accc0eea7f52c82a138edae87a7f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 13:23:49 2006 +1000

    ignore generated Makefile

commit 36cbe41ceb9aeccbbd11bdf49588ddc8136a8f4f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 12:54:24 2006 +1000

     - (djm) [auth.c loginrec.c] Missing netinet/in.h for loginrec

commit 4cbfe8ebebb1fb345bddab629768ad95885846d6
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 12:49:30 2006 +1000

     - (djm) [auth-pam.c auth.c bufaux.h entropy.c openbsd-compat/port-tun.c]
       remove last traces of bufaux.h - it was merged into buffer.h in the big
       includes.h commit

commit 2ab323e0bd531926542784fdada06358d52cc020
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 12:43:32 2006 +1000

     - (djm) [auth-pam.c defines.h] Move PAM related bits to auth-pam.c

commit 9ab00b44c17c89955bad6bf105e89b21c51bbe8e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 12:40:11 2006 +1000

       - stevesk@cvs.openbsd.org 2006/08/04 20:46:05
         [monitor.c session.c ssh-agent.c]
         spaces

commit d783435315d8e604998925d5e47b663a500ed252
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 12:39:39 2006 +1000

       - deraadt@cvs.openbsd.org 2006/08/03 03:34:42
         [OVERVIEW atomicio.c atomicio.h auth-bsdauth.c auth-chall.c auth-krb5.c]
         [auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
         [auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-gss.c]
         [auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c ]
         [auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c bufaux.c bufbn.c]
         [buffer.c buffer.h canohost.c channels.c channels.h cipher-3des1.c]
         [cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c]
         [compress.c deattack.c dh.c dispatch.c dns.c dns.h fatal.c groupaccess.c]
         [groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]
         [kex.h kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c]
         [key.h log.c log.h mac.c match.c md-sha256.c misc.c misc.h moduli.c]
         [monitor.c monitor_fdpass.c monitor_mm.c monitor_mm.h monitor_wrap.c]
         [monitor_wrap.h msg.c nchan.c packet.c progressmeter.c readconf.c]
         [readconf.h readpass.c rsa.c scard.c scard.h scp.c servconf.c servconf.h]
         [serverloop.c session.c session.h sftp-client.c sftp-common.c]
         [sftp-common.h sftp-glob.c sftp-server.c sftp.c ssh-add.c ssh-agent.c]
         [ssh-dss.c ssh-gss.h ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rsa.c]
         [ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c]
         [sshd.c sshlogin.c sshlogin.h sshpty.c sshpty.h sshtty.c ttymodes.c]
         [uidswap.c uidswap.h uuencode.c uuencode.h xmalloc.c xmalloc.h]
         [loginrec.c loginrec.h openbsd-compat/port-aix.c openbsd-compat/port-tun.h]
         almost entirely get rid of the culture of ".h files that include .h files"
         ok djm, sort of ok stevesk
         makes the pain stop in one easy step
         NB. portable commit contains everything *except* removing includes.h, as
         that will take a fair bit more work as we move headers that are required
         for portability workarounds to defines.h. (also, this step wasn't "easy")

commit 4dec5d75daab22c31f6f67d9e83594076ae3eda7
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 11:38:40 2006 +1000

       - stevesk@cvs.openbsd.org 2006/08/01 23:36:12
         [authfile.c channels.c progressmeter.c scard.c servconf.c ssh.c]
         clean extra spaces

commit a7a73ee35d030c817b3eea5c6c3a75c765ca8e69
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 11:37:59 2006 +1000

       - stevesk@cvs.openbsd.org 2006/08/01 23:22:48
         [auth-passwd.c auth-rhosts.c auth-rsa.c auth.c auth.h auth1.c]
         [auth2-chall.c auth2-pubkey.c authfile.c buffer.c canohost.c]
         [channels.c clientloop.c dh.c dns.c dns.h hostfile.c kex.c kexdhc.c]
         [kexgexc.c kexgexs.c key.c key.h log.c misc.c misc.h moduli.c]
         [monitor_wrap.c packet.c progressmeter.c readconf.c readpass.c scp.c]
         [servconf.c session.c sftp-client.c sftp-common.c sftp-server.c sftp.c]
         [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh.c sshconnect.c]
         [sshconnect1.c sshconnect2.c sshd.c sshlogin.c sshtty.c uuencode.c]
         [uuencode.h xmalloc.c]
         move #include <stdio.h> out of includes.h

commit da828395979bad8b4b5019b7b08c7477c706cc94
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 11:35:45 2006 +1000

       - dtucker@cvs.openbsd.org 2006/08/01 11:34:36
         [sshconnect.c]
         Allow fallback to known_hosts entries without port qualifiers for
         non-standard ports too, so that all existing known_hosts entries will be
         recognised.  Requested by, feedback and ok markus@

commit 1a5b4041fbe92b13bea046bd683a1dd887514605
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 11:35:23 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/30 20:15:19
         [atomicio.h]
         order includes to KNF

commit 858bb7dc7c41816e0c779b1bda09324b9ea97ddf
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 11:34:51 2006 +1000

       - jmc@cvs.openbsd.org 2006/07/27 08:00:50
         [ssh_config.5]
         avoid confusing wording in HashKnownHosts:
         originally spotted by alan amesbury;
         ok deraadt

commit e7a1e5cf630d635b253f0c0bada8c8886436297f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 11:34:19 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/26 13:57:17
         [authfd.c authfile.c dh.c canohost.c channels.c clientloop.c compat.c]
         [hostfile.c kex.c log.c misc.c moduli.c monitor.c packet.c readpass.c]
         [scp.c servconf.c session.c sftp-server.c sftp.c ssh-add.c ssh-agent.c]
         [ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh.c sshconnect.c]
         [sshconnect1.c sshd.c xmalloc.c]
         move #include <stdlib.h> out of includes.h

commit 8dbffe7904c4e28b7a741064a468f1cd98c0ad81
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 11:02:17 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/26 02:35:17
         [atomicio.c auth.c dh.c authfile.c buffer.c clientloop.c kex.c]
         [groupaccess.c gss-genr.c kexgexs.c misc.c monitor.c monitor_mm.c]
         [packet.c scp.c serverloop.c session.c sftp-client.c sftp-common.c]
         [sftp-server.c sftp.c ssh-add.c ssh-agent.c ssh-keygen.c sshlogin.c]
         [uidswap.c xmalloc.c]
         move #include <sys/param.h> out of includes.h

commit 9aec91948d134745c29ff63d32d46ac2c367306a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 10:57:45 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/25 02:59:21
         [channels.c clientloop.c packet.c scp.c serverloop.c sftp-client.c]
         [sftp-server.c ssh-agent.c ssh-keyscan.c sshconnect.c sshd.c]
         move #include <sys/time.h> out of includes.h

commit 7c6e4b059c29c695d3c411f5fa83abe953225e21
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 09:33:15 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/25 02:01:34
         [scard.c]
         need #include <string.h>

commit 437edb9e6657e1c51cb7565d29ca0002d4947954
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 5 09:11:13 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/24 13:58:22
         [sshconnect.c]
         disable tunnel forwarding when no strict host key checking
         and key changed; ok djm@ markus@ dtucker@

commit f1f4bdd1aaec7d4d0f0fa787a7b6d16906ca34fa
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 4 19:44:23 2006 +1000

     - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
       versions of Solaris, so use AC_LINK_IFELSE to actually link the test program
       rather than just compiling it.  Spotted by dlg@.

commit 88fdc83d4c56340fb4d39557fcd2d6fb55cb6f30
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 2 23:33:54 2006 +1000

     - (dtucker) [openbsd-compat/daemon.c] Add unistd.h for fork() prototype.

commit 94346f85967e54ceec7b643eb7e74f4814fd75d7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 25 19:52:07 2006 +1000

     - (dtucker) [openbsd-compat/xmmap.c] Need fcntl.h for O_RDRW.

commit 28e9ad1bed41dd0a7ed9f8df64f97207e14c1072
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 24 23:50:23 2006 +1000

     - (dtucker) [regress/forcecommand.sh] Portablize.

commit 22c58b02423985004345d147193e4e112c75461b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 24 23:19:40 2006 +1000

     - (dtucker) [cleanup.c] Since config.h defines _LARGE_FILES on AIX, including
       system headers before defines.h will cause conflicting definitions.

commit 7b1877c803021430818ad7bd6bff504f0de1658f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 15:31:41 2006 +1000

     - (djm) [regress/Makefile regress/agent-getpeereid.sh regress/cfgmatch.sh]
       [regress/cipher-speed.sh regress/forcecommand.sh regress/forwarding.sh]
       Sync regress tests to -current; include dtucker@'s new cfgmatch and
       forcecommand tests. Add cipher-speed.sh test (not linked in yet)

commit 24f2a42e53d084486e93e45d96c9d6178c583043
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 15:30:18 2006 +1000

     - (djm) [Makefile.in]
       Remove generated openbsd-compat/regress/Makefile in distclean target

commit 62da44f0644f5d1cc7fa3b6b967482b5d2f15aa2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 15:08:35 2006 +1000

     - (djm) [openbsd-compat/basename.c openbsd-compat/bsd-closefrom.c]
       [openbsd-compat/bsd-cray.c openbsd-compat/bsd-openpty.c]
       [openbsd-compat/bsd-snprintf.c openbsd-compat/fake-rfc2553.c]
       [openbsd-compat/port-aix.c openbsd-compat/port-irix.c]
       [openbsd-compat/rresvport.c]
       These look to need string.h and/or unistd.h (based on a grep for function
       names)

commit ad5ecbf07227a5c7e1423adf7c68c6cfb05bbd1e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 15:03:06 2006 +1000

     - (djm) [session.c]
       fix compile error with -Werror -Wall: 'path' is only used in
       do_setup_env() if HAVE_LOGIN_CAP is not defined

commit 874bc4883206d253640cb1a9704c5a1161093bcb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:58:07 2006 +1000

     - (djm) [uuencode.c]
       Add resolv.h, is it contains the prototypes for __b64_ntop/__b64_pton on
       some platforms

commit 8b373baf13f9bec712ad01a0242241bc6529f5f4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:55:47 2006 +1000

     - (djm) [openbsd-compat/glob.c]
       Move get_arg_max() into the ifdef HAVE_GLOB block so that it compiles
       on OpenBSD (or other platforms with a decent glob implementation) with
       -Werror

commit b8fe89c4d97ea9a5d7efb2c60108b8a7644f6a49
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:51:00 2006 +1000

     - (djm) [acss.c auth-krb5.c auth-options.c auth-pam.c auth-shadow.c]
       [canohost.c channels.c cipher-acss.c defines.h dns.c gss-genr.c]
       [gss-serv-krb5.c gss-serv.c log.h loginrec.c logintest.c readconf.c]
       [servconf.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c]
       [ssh.c sshconnect.c sshd.c openbsd-compat/bindresvport.c]
       [openbsd-compat/bsd-arc4random.c openbsd-compat/bsd-misc.c]
       [openbsd-compat/getrrsetbyname.c openbsd-compat/glob.c]
       [openbsd-compat/mktemp.c openbsd-compat/port-linux.c]
       [openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c]
       [openbsd-compat/setproctitle.c openbsd-compat/xmmap.c]
       make the portable tree compile again - sprinkle unistd.h and string.h
       back in. Don't redefine __unused, as it turned out to be used in
       headers on Linux, and replace its use in auth-pam.c with ARGSUSED

commit d8337c5e609b3bafda0008aef2636d6f17c622ef
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:14:19 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/23 01:11:05
         [auth.h dispatch.c kex.h sftp-client.c]
         #include <signal.h> for sig_atomic_t; need this prior to <sys/param.h>
         move

commit e3476ed03bf9beca3ad0e5447dc9422a546d19ec
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:13:33 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/22 20:48:23
         [atomicio.c auth-options.c auth-passwd.c auth-rhosts.c auth-rsa.c]
         [auth.c auth1.c auth2-chall.c auth2-hostbased.c auth2-passwd.c auth2.c]
         [authfd.c authfile.c bufaux.c bufbn.c buffer.c canohost.c channels.c]
         [cipher-3des1.c cipher-bf1.c cipher-ctr.c cipher.c clientloop.c]
         [compat.c deattack.c dh.c dns.c gss-genr.c gss-serv.c hostfile.c]
         [includes.h kex.c kexdhc.c kexdhs.c kexgexc.c kexgexs.c key.c log.c]
         [mac.c match.c md-sha256.c misc.c moduli.c monitor.c monitor_fdpass.c]
         [monitor_mm.c monitor_wrap.c msg.c nchan.c packet.c rsa.c]
         [progressmeter.c readconf.c readpass.c scp.c servconf.c serverloop.c]
         [session.c sftp-client.c sftp-common.c sftp-glob.c sftp-server.c sftp.c]
         [ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c]
         [ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c sshconnect2.c]
         [sshd.c sshlogin.c sshpty.c ttymodes.c uidswap.c xmalloc.c]
         move #include <string.h> out of includes.h

commit 5598b4f125f07ec0865ec56cddeb80c44e3d2d6a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:09:40 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/22 19:08:54
         [includes.h moduli.c progressmeter.c scp.c sftp-common.c]
         [sftp-server.c ssh-agent.c sshlogin.c]
         move #include <time.h> out of includes.h

commit ee0d0db7da76138417186ed3b5b76dbb2a873cd8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:08:50 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/21 21:26:55
         [progressmeter.c]
         ARGSUSED for signal handler

commit 8473dd85fecc428a904d3c2cfba3dc0ec93fc14e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:08:32 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/21 21:13:30
         [channels.c]
         more ARGSUSED (lint) for dispatch table-driven functions; ok djm@

commit a765cf4b66ba116626c317204ac317607fe0c848
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:08:13 2006 +1000

       - dtucker@cvs.openbsd.org 2006/07/21 12:43:36
         [channels.c channels.h servconf.c servconf.h sshd_config.5]
         Make PermitOpen take a list of permitted ports and act more like most
         other keywords (ie the first match is the effective setting). This
         also makes it easier to override a previously set PermitOpen. ok djm@

commit 1cdde6f536ec50d7165ff56843c99655c95a68eb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:07:35 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/20 15:26:15
         [auth1.c serverloop.c session.c sshconnect2.c]
         missed some needed #include <unistd.h> when KERBEROS5=no; issue from
         massimo@cedoc.mo.it

commit e275443f66aab6d46356d6940b8a8b291cab4f9e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:06:47 2006 +1000

       - dtucker@cvs.openbsd.org 2006/07/19 13:07:10
         [servconf.c servconf.h session.c sshd.8 sshd_config sshd_config.5]
         Add ForceCommand keyword to sshd_config, equivalent to the "command="
         key option, man page entry and example in sshd_config.
         Feedback & ok djm@, man page corrections & ok jmc@

commit d1de9950e5ae91584aa955a4f85c9c7579aa76af
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:05:48 2006 +1000

       - dtucker@cvs.openbsd.org 2006/07/19 08:56:41
         [servconf.c sshd_config.5]
         Add support for X11Forwaring, X11DisplayOffset and X11UseLocalhost to
         Match.  ok djm@

commit f757d22e8b72b04d5a9228e2075649ded14314db
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:05:24 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/18 22:27:55
         [dh.c]
         remove unneeded includes; ok djm@

commit 8c23403b5141b2cc570a8b55805855eea93d875a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:05:08 2006 +1000

       - dtucker@cvs.openbsd.org 2006/07/18 08:22:23
         [sshd_config.5]
         Clarify description of Match, with minor correction from jmc@

commit 393821ad720050c014ef2dc62c519f66684c099c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:04:53 2006 +1000

       - jmc@cvs.openbsd.org 2006/07/18 08:03:09
         [ssh-agent.1 sshd_config.5]
         mark up angle brackets;

commit 22d47abbe3378539bd775f3ee19190406991e4bc
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:04:36 2006 +1000

       - jmc@cvs.openbsd.org 2006/07/18 07:56:28
         [scp.1]
         replace DIAGNOSTICS with .Ex;

commit 65bc2c402871ef0603b1f99afb323da953212232
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:04:16 2006 +1000

       - jmc@cvs.openbsd.org 2006/07/18 07:50:40
         [sshd_config.5]
         tweak; ok dtucker

commit 9b439df18a9d56683584811ce38dcf72acd4cb20
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:04:00 2006 +1000

       - dtucker@cvs.openbsd.org 2006/07/17 12:06:00
         [channels.c channels.h servconf.c sshd_config.5]
         Add PermitOpen directive to sshd_config which is equivalent to the
         "permitopen" key option.  Allows server admin to allow TCP port
         forwarding only two specific host/port pairs.  Useful when combined
         with Match.
         If permitopen is used in both sshd_config and a key option, both
         must allow a given connection before it will be permitted.
         Note that users can still use external forwarders such as netcat,
         so to be those must be controlled too for the limits to be effective.
         Feedback & ok djm@, man page corrections & ok jmc@.

commit 98299261eb970688a7bad346491cffdf2a7f6072
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:01:43 2006 +1000

       - dtucker@cvs.openbsd.org 2006/07/17 12:02:24
         [auth-options.c]
         Use '\0' rather than 0 to terminates strings; ok djm@

commit e6b3b610ece508f565a114a60f6ce0edb70a5dd2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 14:01:23 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/17 01:31:10
         [authfd.c authfile.c channels.c cleanup.c clientloop.c groupaccess.c]
         [includes.h log.c misc.c msg.c packet.c progressmeter.c readconf.c]
         [readpass.c scp.c servconf.c sftp-client.c sftp-server.c sftp.c]
         [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh.c]
         [sshconnect.c sshlogin.c sshpty.c uidswap.c]
         move #include <unistd.h> out of includes.h

commit def915b0ff0228254da4b2f2442bab16aba414d4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 13:55:56 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/14 01:15:28
         [monitor_wrap.h]
         don't need incompletely-typed 'struct passwd' now with
         #include <pwd.h>; ok markus@

commit 2d00e63cb889a3b23b6d443ecb0921e34fb0a934
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 13:53:19 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/12 22:42:32
         [includes.h ssh.c ssh-rand-helper.c]
         move #include <stddef.h> out of includes.h

commit 939878b95f6448e9933976f920a42f09e7f70fab
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 13:52:06 2006 +1000

    tidy

commit be43ebf97579d13e108256c6440cb22a08f12ebc
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 13:51:51 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/12 22:28:52
         [auth-options.c canohost.c channels.c includes.h readconf.c servconf.c ssh-keyscan.c ssh.c sshconnect.c sshd.c]
         move #include <netdb.h> out of includes.h; ok djm@

commit d04f357ac24a6d40176cd53e58d0256b5130d98e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 24 13:46:50 2006 +1000

       - jmc@cvs.openbsd.org 2006/07/12 13:39:55
         [sshd_config.5]
          - new sentence, new line
          - s/The the/The/
          - kill a bad comma

commit 341dae59c8e0f0367100e617e049cec4023be427
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 13 08:45:14 2006 +1000

     - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h

commit 2eaea99054fd65ad03f1fe9679a318253eaa8dd6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 23:41:33 2006 +1000

     - (dtucker) [openbsd-compat/bsd-asprintf.c openbsd-compat/port-aix.c
       openbsd-compat/rresvport.c] More errno.h.

commit 5998ed03aadef4c9681e90b669ddd1c5d7a9247b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 23:10:33 2006 +1000

     - (dtucker) [openbsd-compat/openbsd-compat.h] v*printf needs stdarg.h.

commit deecec98c76efc3022658e8233ac6536849372e4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 22:44:34 2006 +1000

     - (dtucker) [ssh-keyscan.c ssh-rand-helper.c] More errno.h here too.

commit 767e4134f13ed22a941f2fb747026b0881f9e827
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 22:43:28 2006 +1000

     - (dtucker) [openbsd-compat/setproctitle.c] Include stdarg.h.

commit 2c1a02a8d03069163d8cae21484f4e5656e904fe
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 22:40:50 2006 +1000

     - (dtucker) [loginrec.c openbsd-compat/xmmap.c openbsd-compat/bindresvport.c
       openbsd-compat/glob.c openbsd-compat/mktemp.c openbsd-compat/port-tun.c
       openbsd-compat/readpassphrase.c openbsd-compat/strtonum.c] Include <errno.h>.

commit c931c433f60a515af4cd463815ad3f9cf75ba3d9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 22:35:51 2006 +1000

     - (dtucker) [openbsd-compat/xmmap.c] Include <errno.h>.

commit 4515047e47f26377a46f480ed5929e8ccfa18720
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 22:34:17 2006 +1000

       - dtucker@cvs.openbsd.org 2006/07/12 11:34:58
         [sshd.c servconf.h servconf.c sshd_config.5 auth.c]
         Add support for conditional directives to sshd_config via a "Match"
         keyword, which works similarly to the "Host" directive in ssh_config.
         Lines after a Match line override the default set in the main section
         if the condition on the Match line is true, eg
         AllowTcpForwarding yes
         Match User anoncvs
                 AllowTcpForwarding no
         will allow port forwarding by all users except "anoncvs".
         Currently only a very small subset of directives are supported.
         ok djm@

commit ba724050263c0bca0a7dffa26462d046c4df7e01
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 22:24:22 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/11 20:27:56
         [authfile.c ssh.c]
         need <errno.h> here also (it's also included in <openssl/err.h>)

commit 57f4224677c5678d6256df865ea858de9ad915f3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 22:23:35 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/11 20:16:43
         [ssh.c]
         cast asterisk field precision argument to int to remove warning;
         ok markus@

commit 39972493467dd9a32a117e85bcbff9aa1e7f3c8d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 22:22:46 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/11 20:07:25
         [scp.c auth.c monitor.c serverloop.c sftp-server.c sshpty.c readpass.c
         sshd.c monitor_wrap.c monitor_fdpass.c ssh-agent.c ttymodes.c atomicio.c
         includes.h session.c sshlogin.c monitor_mm.c packet.c sshconnect2.c
         sftp-client.c nchan.c clientloop.c sftp.c misc.c canohost.c channels.c
         ssh-keygen.c progressmeter.c uidswap.c msg.c readconf.c sshconnect.c]
         move #include <errno.h> out of includes.h; ok markus@

commit e7d4b19f755c0d33122ef373e54b69e6b93cb0b4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 22:17:10 2006 +1000

       - markus@cvs.openbsd.org 2006/07/11 18:50:48
         [clientloop.c ssh.1 ssh.c channels.c ssh_config.5 readconf.h session.c
         channels.h readconf.c]
         add ExitOnForwardFailure: terminate the connection if ssh(1)
         cannot set up all requested dynamic, local, and remote port
         forwardings. ok djm, dtucker, stevesk, jmc

commit 284706a7555b3640c78854fc64010ce956e19339
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 22:16:23 2006 +1000

       - dtucker@cvs.openbsd.org 2006/07/11 10:12:07
         [ssh.c]
         Only copy the part of environment variable that we actually use.  Prevents
         ssh bailing when SendEnv is used and an environment variable with a really
         long value exists.  ok djm@

commit 5d19626a0476f40e9320541194391d7eb51038d3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 22:15:16 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/10 16:37:36
         [readpass.c log.h scp.c fatal.c xmalloc.c includes.h ssh-keyscan.c misc.c
         auth.c packet.c log.c]
         move #include <stdarg.h> out of includes.h; ok markus@

commit 11318476842a01eef47ceff67f31afc06cf2eaa5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 22:07:59 2006 +1000

       - jmc@cvs.openbsd.org 2006/07/10 16:04:21
         [sshd.8]
         s/and and/and/

commit a5362458d0e1d2387a05f5c7c29e4f5b87501824
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 22:07:08 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/10 16:01:57
         [sftp-glob.c sftp-common.h sftp.c]
         buffer.h only needed in sftp-common.h and remove some unneeded
         user includes; ok djm@

commit 686852f665376c2287c716f8d388b42c1727210b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 19:05:56 2006 +1000

     - (dtucker) [openbsd-compat/port-tun.c] OpenBSD needs <netinet/in.h> before
       <netinet/ip.h>.

commit 128a0894a5ec604572f2acc34f016f8f144b9780
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 19:02:56 2006 +1000

     - (dtucker) [configure.ac] OpenBSD needs <sys/types.h> before <sys/socket.h>
       for SHUT_RD.

commit 250f1a69013c87c4adae9322f09a509e4e4b393c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 19:01:29 2006 +1000

    rewrap

commit 248469bc8d6c001596fdd3a83c1ffc63ae466e5b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 12 14:14:31 2006 +1000

     - (dtucker) [configure.ac defines.h] Only define SHUT_RD (and friends) and O_NONBLOCK
       if they're really needed.  Fixes build errors on HP-UX, old Linuxes and probably
       more.

commit e0e4aad1fdd8770283798eede1297f363b43498d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 11 19:01:51 2006 +1000

     - (dtucker) [entropy.c] More fcntl.h, this time on AIX (and probably
       others).

commit 2ee50c5cce20c67a4e67d2b56b1833ba4227975a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 11 18:55:05 2006 +1000

     - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c
       openbsd-compat/daemon.c] Add includes needed by open(2).  Conditionally
       include paths.h.  Fixes build error on Solaris.

commit 44c828fe29e61126ae5ff9e71e1a76a55f5fa34b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 11 18:00:06 2006 +1000

     - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c
       openbsd-compat/daemon.c] Add includes needed by open(2).  Conditionally
       include paths.h.  Fixes build error on Solaris.

commit 4e880e632be69861af52a90dcdf337deb60ca536
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 11 00:20:51 2006 +1000

     - (dtucker) [openbsd-compat/openbsd-compat.h] Need to include <sys/socket.h>
       for struct sockaddr on platforms that use the fake-rfc stuff.

commit da3455356100dbcb5d1ff9f0556386ca5f788795
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 10 23:04:19 2006 +1000

       - dtucker@cvs.openbsd.org 2006/07/10 12:46:51
         [misc.c misc.h sshd.8 sshconnect.c]
         Add port identifier to known_hosts for non-default ports, based originally
         on a patch from Devin Nate in bz#910.
         For any connection using the default port or using a HostKeyAlias the
         format is unchanged, otherwise the host name or address is enclosed
         within square brackets in the same format as sshd's ListenAddress.
         Tested by many, ok markus@.

commit 0f07707267fd3911bcf95b48125b522f9e222c64
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 22:21:02 2006 +1000

       - djm@cvs.openbsd.org 2006/07/10 12:08:08
         [channels.c]
         fix misparsing of SOCKS 5 packets that could result in a crash;
         reported by mk@ ok markus@

commit 3d1a9f4d5dfed0d2607b7cb36e1608255a669a17
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 22:19:53 2006 +1000

       - djm@cvs.openbsd.org 2006/07/10 12:03:20
         [scp.c]
         duplicate argv at the start of main() because it gets modified later;
         pointed out by deraadt@ ok markus@

commit a1738e4c65108b9c549c66c3a668a04b86c1530c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 21:33:04 2006 +1000

     - (djm) [loginrec.c ssh-rand-helper.c sshd.c openbsd-compat/glob.c]
       [openbsd-compat/mktemp.c openbsd-compat/openbsd-compat.h]
       [openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c]
       [openbsd-compat/xcrypt.c] Fix includes.h fallout, mainly fcntl.h

commit 6444fe996b2789327e28057e69bd3ece371f784d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 21:31:27 2006 +1000

       - djm@cvs.openbsd.org 2006/07/10 11:25:53
         [sftp-server.c]
         don't log variables that aren't yet set

commit c718c743c1b64ba20b009f2dfe6cad465a7a4a78
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 21:31:00 2006 +1000

       - djm@cvs.openbsd.org 2006/07/10 11:24:54
         [sftp-server.c]
         remove optind - it isn't used here

commit 211838d8e22bf1af0bacb7619ba541c5d4f3650a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 21:14:00 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/09 15:27:59
         [ssh-add.c]
         use O_RDONLY vs. 0 in open(); no binary change

commit 57cf638577052cfec0d4bce197c5597588a8b813
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 21:13:46 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/09 15:15:11
         [auth2-none.c authfd.c authfile.c includes.h misc.c monitor.c]
         [readpass.c scp.c serverloop.c sftp-client.c sftp-server.c]
         [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c]
         [sshlogin.c sshpty.c]
         move #include <fcntl.h> out of includes.h

commit 194a1cb0189e41db76feb9363a89fe716f7cad97
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 21:09:22 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/08 23:30:06
         [log.c]
         move user includes after /usr/include files

commit e33b60343b7cef82ec229d7bfec008d3a932f2ad
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 21:08:34 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/08 21:48:53
         [monitor.c session.c]
         missed these from last commit:
         move #include <sys/socket.h> out of includes.h

commit e3b60b524edcc55d71e7ccb0958fd69a0e525f30
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 21:08:03 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/08 21:47:12
         [authfd.c canohost.c clientloop.c dns.c dns.h includes.h]
         [monitor_fdpass.c nchan.c packet.c servconf.c sftp.c ssh-agent.c]
         [ssh-keyscan.c ssh.c sshconnect.h sshd.c sshlogin.h]
         move #include <sys/socket.h> out of includes.h

commit 58059aef053a0b925c70b9804930e3fe17edfac8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:53:45 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/06 17:36:37
         [monitor_wrap.h]
         typo in comment

commit 69996104fe4d5897e12eed9f6c7b6eacee0d2725
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:53:31 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/06 16:22:39
         [ssh-keygen.c]
         move #include "dns.h" up

commit 9f2abc47ebd58c974f51718f31009b49a001c0d7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:53:08 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/06 16:03:53
         [auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c]
         [auth-rhosts.c auth-rsa.c auth.c auth.h auth2-hostbased.c]
         [auth2-pubkey.c auth2.c includes.h misc.c misc.h monitor.c]
         [monitor_wrap.c monitor_wrap.h scp.c serverloop.c session.c]
         [session.h sftp-common.c ssh-add.c ssh-keygen.c ssh-keysign.c]
         [ssh.c sshconnect.c sshconnect.h sshd.c sshpty.c sshpty.h uidswap.c]
         [uidswap.h]
         move #include <pwd.h> out of includes.h; ok markus@

commit fef95ad81645250b83f7c83233648471d8d0edab
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:46:55 2006 +1000

       - djm@cvs.openbsd.org 2006/07/06 10:47:57
         [sftp-server.8 sftp-server.c]
         add commandline options to enable logging of transactions; ok markus@

commit 917f9b6b6eb560e205a787bd8f38d4b9741c9a9f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:36:47 2006 +1000

       - djm@cvs.openbsd.org 2006/07/06 10:47:05
         [servconf.c servconf.h session.c sshd_config.5]
         support arguments to Subsystem commands; ok markus@

commit 8ec8c3e98a07be51e0a136170f02b7ebab0f28ca
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:35:38 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/05 02:42:09
         [canohost.c hostfile.c includes.h misc.c packet.c readconf.c]
         [serverloop.c sshconnect.c uuencode.c]
         move #include <netinet/in.h> out of includes.h; ok deraadt@
         (also ssh-rand-helper.c logintest.c loginrec.c)

commit efc04e70b8261a7be7818772f03974eb38ae6622
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:26:27 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/03 17:59:32
         [channels.c includes.h]
         move #include <arpa/inet.h> out of includes.h; old ok djm@
         (portable needed session.c too)

commit b757677d02e37da719b92331f23e02acb7079337
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:23:39 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/03 08:54:20
         [includes.h ssh.c sshconnect.c sshd.c]
         move #include "version.h" out of includes.h; ok markus@

commit 57e8ad3f5e54101db9a0f11b19da56041cc22603
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:20:52 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/02 23:01:55
         [clientloop.c ssh.1]
         use -KR[bind_address:]port here; ok djm@

commit 427a1d57bb6110dcf2b8fcdcabe566b8290a942a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:20:33 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/02 22:45:59
         [groupaccess.c groupaccess.h includes.h session.c sftp-common.c sshpty.c]
         move #include <grp.h> out of includes.h
         (portable needed uidswap.c too)

commit 5d3ac7f7eeb8a5d060e5dcdd6f33af1cec909d96
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:17:55 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/02 18:36:47
         [gss-serv-krb5.c gss-serv.c]
         no "servconf.h" needed here
         (gss-serv-krb5.c change not applied, portable needs the server options)

commit 991dba43e17f7e4c8706158ecee32f2bfd18cac4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:16:27 2006 +1000

       - stevesk@cvs.openbsd.org 2006/07/02 17:12:58
         [ssh.1 ssh.c ssh_config.5 sshd_config.5]
         more details and clarity for tun(4) device forwarding; ok and help
         jmc@

commit 43020951adc182bb98ac2b3c539fbca86622166d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:16:12 2006 +1000

       - djm@cvs.openbsd.org 2006/06/26 10:36:15
         [clientloop.c]
         mention optional bind_address in runtime port forwarding setup
         command-line help. patch from santhi.amirta AT gmail.com

commit 1e88ea655634749a847c9426a08b635f6198f085
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 10 20:15:56 2006 +1000

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2006/06/14 10:50:42
         [sshconnect.c]
         limit the number of pre-banner characters we will accept; ok markus@

commit e34c96aea139680ffe8101b6527e45420811e0c0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 10 12:55:24 2006 +1000

     - (dtucker) [INSTALL] New autoconf version: 2.60.

commit f32f55259c1209903bac2845cf70e3464158c42d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 6 19:12:08 2006 +1000

     - (dtucker) [INSTALL] A bit more info on autoconf.

commit bdc121279f15b13b103c15555591f784886d0011
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 6 11:56:25 2006 +1000

     - (dtucker) [configure.ac] Try AIX blibpath test in different order when
       compiling with gcc.  gcc 4.1.x will accept (but ignore) -b flags so
       configure would not select the correct libpath linker flags.

commit 365e18db51c23a9894332c753ccd4e3fa35bdb25
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 5 22:48:07 2006 +1000

    whitespace

commit ee9ee9175c7fea9f98a95933256252cd7727e941
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 5 22:47:21 2006 +1000

    whitespace

commit daf6ff431264dc15650633c3de190cd6fa1ea710
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 5 21:35:48 2006 +1000

     - (dtucker) [ssh-rand-helper.c] Don't exit if mkdir fails because the
       target already exists.

commit db4c54bed101d48e0fc844e8b8d37ec025d9f50d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 30 16:20:58 2006 +1000

     - (dtucker) [INSTALL] Bug #1202: Note when autoconf is required and which
       version.

commit 7243f9db6034bc9fac9d9b88217cc465b3ded3ca
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 30 11:47:49 2006 +1000

     - (dtucker) [openbsd-compat/getrrsetbyname.c] Undef _res before defining it,
       prevents warnings on platforms where _res is in the system headers.

commit 66c32d5caa533560a16638ab688772833e602d28
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 30 10:51:32 2006 +1000

     - (dtucker) [openbsd-compat/openbsd-compat.h] SNPRINTF_CONST for snprintf
       declaration too.  Patch from russ at sludge.net.

commit 8b272ab09b722222cc4d6bb79fe6d7812c0b2f7f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 27 11:20:28 2006 +1000

     - (dtucker) [configure.ac] Bug #1203: Add missing '[', which causes problems
       with autoconf 2.60.  Patch from vapier at gentoo.org.

commit 144e8d60cd3dcfdbf23c6df06617adf28b1235b8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 25 08:25:25 2006 +1000

     - (dtucker) [channels.c serverloop.c] Apply the bug #1102 workaround to ptys
       only, otherwise sshd can hang exiting non-interactive sessions.

commit 03890e44cd4814c2a9909febe5130fef722c7f4b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 24 16:58:45 2006 +1000

     - (dtucker) [serverloop.c] Get ifdef/ifndef the right way around for the bug
       #1102 workaround.

commit 0249f93c4d9c552cdcaf2dec7af1f2fc20fdcbaa
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 24 12:10:07 2006 +1000

     - (dtucker) [configure.ac] Bug #1193: Define PASSWD_NEEDS_USERNAME on Solaris.
       Works around limitation in Solaris' passwd program for changing passwords
       where the username is longer than 8 characters.  ok djm@

commit 9afe115f0ac738204d4edb66b9353a765826ae46
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 23 21:24:12 2006 +1000

     - (dtucker) [channels.c configure.ac serverloop.c] Bug #1102: Around AIX
       4.3.3 ML3 or so, the AIX pty layer starting passing zero-length writes
       on the pty slave as zero-length reads on the pty master, which sshd
       interprets as the descriptor closing.  Since most things don't do zero
       length writes this rarely matters, but occasionally it happens, and when
       it does the SSH pty session appears to hang, so we add a special case for
       this condition.  ok djm@

commit 3eb4834489426bd796da90299b2f8174b744dddd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 23 21:05:12 2006 +1000

     - (dtucker) [README.platform configure.ac openbsd-compat/port-tun.c] Add
       tunnel support for Mac OS X/Darwin via a third-party tun driver.  Patch
       from reyk@, tested by anil@

commit 643460803f5c8c5a9bec9455a62d8a5217699f43
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 13:15:54 2006 +1000

     - (djm) [getput.h] This file has been replaced by functions in misc.c

commit a6680a4e35f08f490cba8477c990964ce9ff0a9d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 13:10:18 2006 +1000

       - djm@cvs.openbsd.org 2006/06/13 01:18:36
         [ssh-agent.c]
         always use a format string, even when printing a constant
       - djm@cvs.openbsd.org 2006/06/13 02:17:07
         [ssh-agent.c]
         revert; i am on drugs. spotted by alexander AT beard.se

commit 2e5fe88ebe5a09477a655a36b047063282bfd86c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 13:10:00 2006 +1000

       - markus@cvs.openbsd.org 2006/06/08 14:45:49
         [readpass.c sshconnect.c sshconnect2.c uidswap.c uidswap.h]
         do not set the gid, noted by solar; ok djm

commit 6b4069ad563ce578cbfa6f90e76b462d26483e67
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 13:05:15 2006 +1000

       - markus@cvs.openbsd.org 2006/06/06 10:20:20
         [readpass.c sshconnect.c sshconnect.h sshconnect2.c uidswap.c]
         replace remaining setuid() calls with permanently_set_uid() and
         check seteuid() return values; report Marcus Meissner; ok dtucker djm

commit eb13e556e58a52a3ff0c734a8690ad41686cf92c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 13:03:53 2006 +1000

       - markus@cvs.openbsd.org 2006/06/01 09:21:48
         [sshd.c]
         call get_remote_ipaddr() early; fixes logging after client disconnects;
         report mpf@; ok dtucker@

commit 7b1e757b28a19eafd5f834307ea7c4493210095d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 13:03:34 2006 +1000

       - mk@cvs.openbsd.org 2006/05/30 11:46:38
         [ssh-add.c]
         Sync usage() with man page and reality.
         ok deraadt dtucker

commit fbc94c857a263bbee6580b6229502dcea0250c14
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 13:03:16 2006 +1000

       - jmc@cvs.openbsd.org 2006/05/29 16:13:23
         [ssh.1]
         add GSSAPI to the list of authentication methods supported;

commit 3c6ed7bbd569a33d31533587e41b8ff87d282de0
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 13:01:41 2006 +1000

       - jmc@cvs.openbsd.org 2006/05/29 16:10:03
         [ssh_config.5]
         oops - previous was too long; split the list of auths up

commit 81a38928eb2728efb36e970259dde8f108c08db7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 13:01:09 2006 +1000

       - dtucker@cvs.openbsd.org 2006/05/29 12:56:33
         [ssh_config]
         Add GSSAPIAuthentication and GSSAPIDelegateCredentials to examples in sample
         ssh_config.  ok markus@

commit 658f9455386fb81d03429a00976986ac18ba4d5e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 13:00:55 2006 +1000

       - dtucker@cvs.openbsd.org 2006/05/29 12:54:08
         [ssh_config.5]
         Add gssapi-with-mic to PreferredAuthentications default list; ok jmc

commit ad6b14d274762b466746519205aec9faae2f3cc3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 13:00:41 2006 +1000

       - miod@cvs.openbsd.org 2006/05/18 21:27:25
         [kexdhc.c kexgexc.c]
         paramter -> parameter

commit 40b5985fe0b2b8e0b78d7bf7f19bcab6018f0a64
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 13:00:25 2006 +1000

       - markus@cvs.openbsd.org 2006/05/17 12:43:34
         [scp.c sftp.c ssh-agent.c ssh-keygen.c sshconnect.c]
         fix leak; coverity via Kylene Jo Hall

commit 24fd8ddd61bbbb4d1a5accb9b8bf640904e12be5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 13:00:09 2006 +1000

       - markus@cvs.openbsd.org 2006/05/16 09:00:00
         [clientloop.c]
         missing free; from Kylene Hall

commit e250a94e697134f463eb51fbe9c8a22e1973198d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 12:59:53 2006 +1000

       - djm@cvs.openbsd.org 2006/05/08 10:49:48
         [sshconnect2.c]
         uint32_t -> u_int32_t (which we use everywhere else)
         (Id sync only - portable already had this)

commit f14b2aa6725f93dce537a0d693d3562c53a85b19
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 21 18:26:40 2006 +1000

     - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
       and slave, we can remove the special-case handling in the audit hook in
       auth_log.

commit f58b29d51508057e729cd142396e28505bae50ab
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed May 17 22:24:56 2006 +1000

     - (dtucker) [ssh-rand-helper.c] Check return code of mkdir and fix file
       pointer leak.  From kjhall at us.ibm.com, found by coverity.

commit 73373877db052f11bf73349e8ce3d698105b109b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 15 17:24:25 2006 +1000

    typo

commit 2c77b7f1c14795012db49b46d70fa423bdc09a80
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 15 17:22:33 2006 +1000

     - (dtucker) [auth-pam.c] Bug #1188: pass result of do_pam_account back and
       do not allow kbdint again after the PAM account check fails.  ok djm@

commit cefd8bb36d307a671fbbe5358d94c97910edf7c6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 15 17:17:29 2006 +1000

     - (dtucker) [defines.h] Find a value for IOV_MAX or use a conservative
       default.  Patch originally from tim@, ok djm

commit 13c539a4dcfa7a7fb34bbd43478aa913e27b8ba6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 15 17:15:56 2006 +1000

     - (dtucker) [openbsd-compat/getrrsetbyname.c] Use _compat_res instead of
       _res, prevents problems on some platforms that have _res as a global but
       don't have getrrsetbyname(), eg IRIX 5.3.  Found and tested by
       georg.schwarz at freenet.de, ok djm@.

commit 43ff44e7dbe28d913506df2673550e91b8003ca6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 6 18:40:53 2006 +1000

       - dtucker@cvs.openbsd.org 2006/05/06 08:35:40
         [auth-krb5.c]
         Add $OpenBSD$ in comment here too

commit f779f672eb8914b3221396afd476ccc708b91b8d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 6 17:48:48 2006 +1000

       - djm@cvs.openbsd.org 2006/04/01 05:37:46
         [OVERVIEW]
         $OpenBSD$ in here too

commit 31cde6828d7772c5ea06c882a17c06fc42845d79
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 6 17:43:33 2006 +1000

       - djm@cvs.openbsd.org 2006/05/04 14:55:23
         [dh.c]
         tighter DH exponent checks here too; feedback and ok markus@

commit 232b76f9f8b883db9ff7e7a3a9942ad7a28119e0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 6 17:41:51 2006 +1000

       - dtucker@cvs.openbsd.org 2006/04/25 08:02:27
         [authfile.c authfile.h sshconnect2.c ssh.c sshconnect1.c]
         Prevent ssh from trying to open private keys with bad permissions more than
         once or prompting for their passphrases (which it subsequently ignores
         anyway), similar to a previous change in ssh-add.  bz #1186, ok djm@

commit d8093e49bf06813a8c97cbc90810f4863388af77
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 4 16:24:34 2006 +1000

     - (dtucker) [auth-pam.c groupaccess.c monitor.c monitor_wrap.c scard-opensc.c
       session.c ssh-rand-helper.c sshd.c openbsd-compat/bsd-cygwin_util.c
       openbsd-compat/setproctitle.c] Convert malloc(foo*bar) -> calloc(foo,bar)
       in Portable-only code; since calloc zeros, remove now-redundant memsets.
       Also add a couple of sanity checks.  With & ok djm@

commit 596d33801f6d703c1e45c74df6f6d6fe7ee085bb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed May 3 19:01:09 2006 +1000

     - (dtucker) [packet.c] Remove in_systm.h since it's also in includes.h
       and double including it on IRIX 5.3 causes problems.  From Georg Schwarz,
       "no objections" tim@

commit 7b50b2030b8f2a1de46f0f89c491afcdca43230b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:31:27 2006 +1000

    missing file

commit 2bdd1c117c82ecbf1949e39fcaf984e5fdd6d911
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:28:53 2006 +1000

     - (djm) [auth.h dispatch.h kex.h] sprinkle in signal.h to get
       sig_atomic_t

commit f53429bebf0cc5e00f117f5602a30c58b55d7018
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:15:08 2006 +1000

       - dtucker@cvs.openbsd.org 2006/04/18 10:44:28
         [bufaux.c bufbn.c Makefile.in]
         Move Buffer bignum functions into their own file, bufbn.c. This means
         that sftp and sftp-server (which use the Buffer functions in bufaux.c
         but not the bignum ones) no longer need to be linked with libcrypto.
         ok markus@

commit 08d4b0ca5d6534c1efdf16aa3cfe353eb2b41130
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:12:24 2006 +1000

       - stevesk@cvs.openbsd.org 2006/04/22 18:29:33
         [crc32.c]
         remove extra spaces

commit 2282c6e305ab16f116133428da64f9f292afd04f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:11:57 2006 +1000

       - djm@cvs.openbsd.org 2006/04/22 04:06:51
         [uidswap.c]
         use setres[ug]id() to permanently revoke privileges; ok deraadt@
         (ID Sync only - portable already uses setres[ug]id() whenever possible)

commit 525a0b090fc03d38bb760c858a5a5958cd0bc276
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:10:49 2006 +1000

       - djm@cvs.openbsd.org 2006/04/20 21:53:44
         [includes.h session.c sftp.c]
         Switch from using pipes to socketpairs for communication between
         sftp/scp and ssh, and between sshd and its subprocesses. This saves
         a file descriptor per session and apparently makes userland ppp over
         ssh work; ok markus@ deraadt@ (ID Sync only - portable makes this
         decision on a per-platform basis)

commit 56e5e6ad115e9f9e072237a6cc95997d610d1bc0
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:08:59 2006 +1000

       - markus@cvs.openbsd.org 2006/04/20 09:47:59
         [sshconnect.c]
         simplify; ok djm@

commit 97c91f688fa8f8d67bbe2e0aa0feb912fc3c00ef
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:08:37 2006 +1000

       - djm@cvs.openbsd.org 2006/04/20 09:27:09
         [auth.h clientloop.c dispatch.c dispatch.h kex.h]
         replace the last non-sig_atomic_t flag used in a signal handler with a
         sig_atomic_t, unfortunately with some knock-on effects in other (non-
         signal) contexts in which it is used; ok markus@

commit 58629fad824ebe0a10974930778beff455f41aea
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:08:19 2006 +1000

       - dtucker@cvs.openbsd.org 2006/04/18 10:44:28
         [bufaux.c bufbn.c]
         Move Buffer bignum functions into their own file, bufbn.c. This means
         that sftp and sftp-server (which use the Buffer functions in bufaux.c
         but not the bignum ones) no longer need to be linked with libcrypto.
         ok markus@

commit b5ea7e7c037be2702fa1664b762aff2e019dcb0e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:06:49 2006 +1000

       - djm@cvs.openbsd.org 2006/04/16 07:59:00
         [atomicio.c]
         reorder sanity test so that it cannot dereference past the end of the
         iov array; well spotted canacar@!

commit 58ca98bfe12b65f4d445dc05b422f672c51caa4b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:06:35 2006 +1000

       - djm@cvs.openbsd.org 2006/04/16 00:54:10
         [sftp-client.c]
         avoid making a tiny 4-byte write to send the packet length of sftp
         commands, which would result in a separate tiny packet on the wire by
         using atomiciov(writev, ...) to write the length and the command in one
         pass; ok deraadt@

commit 6aa139c41ff22f9c91a934a73013265ea0a64afc
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:06:20 2006 +1000

       - djm@cvs.openbsd.org 2006/04/16 00:52:55
         [atomicio.c atomicio.h]
         introduce atomiciov() function that wraps readv/writev to retry
         interrupted transfers like atomicio() does for read/write;
         feedback deraadt@ dtucker@ stevesk@ ok deraadt@

commit 499a0d5ada82acbf8a5c5d496dbf0b4570dde1af
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:06:03 2006 +1000

       - djm@cvs.openbsd.org 2006/04/16 00:48:52
         [buffer.c buffer.h channels.c]
         Fix condition where we could exit with a fatal error when an input
         buffer became too large and the remote end had advertised a big window.
         The problem was a mismatch in the backoff math between the channels code
         and the buffer code, so make a buffer_check_alloc() function that the
         channels code can use to propsectivly check whether an incremental
         allocation will succeed.  bz #1131, debugged with the assistance of
         cove AT wildpackets.com; ok dtucker@ deraadt@

commit 63e437f053bec9e227ba11e5e6205cd1e217baac
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:05:46 2006 +1000

       - djm@cvs.openbsd.org 2006/04/03 07:10:38
         [gss-genr.c]
         GSSAPI buffers shouldn't be nul-terminated, spotted in bugzilla #1066
         by dleonard AT vintela.com. use xasprintf() to simplify code while in
         there; "looks right" deraadt@

commit 603e68f1a29c954f0c08a08b3f429956008ac244
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:05:32 2006 +1000

       - dtucker@cvs.openbsd.org 2006/04/02 08:34:52
         [ssh-keysign.c]
         sessionid can be 32 bytes now too when sha256 kex is used; ok djm@

commit 3db78468024de933202248e0a89bd22d5364f4fe
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:05:16 2006 +1000

       - djm@cvs.openbsd.org 2006/04/01 05:51:34
         [atomicio.c]
         ANSIfy; requested deraadt@

commit 7a656f792207bacd1148eb962919202908d83e9c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:04:46 2006 +1000

       - djm@cvs.openbsd.org 2006/04/01 05:50:29
         [scp.c]
         xasprintification; ok deraadt@

commit 07aa132a5e32f5c08694afabf5ebb14fb7c66006
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 12:04:27 2006 +1000

     - (djm) OpenBSD CVS Sync
       - deraadt@cvs.openbsd.org 2006/04/01 05:42:20
         [scp.c]
         minimal lint cleanup (unused crud, and some size_t); ok djm

commit 73b42d2bb058da914828b53f2951954560a5b6eb
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 22 21:26:08 2006 +1000

     - (djm) [Makefile.in configure.ac session.c sshpty.c]
       [contrib/redhat/sshd.init openbsd-compat/Makefile.in]
       [openbsd-compat/openbsd-compat.h openbsd-compat/port-linux.c]
       [openbsd-compat/port-linux.h] Add support for SELinux, setting
       the execution and TTY contexts. based on patch from Daniel Walsh,
       bz #880; ok dtucker@

commit 2eaf37d899a55c253ad42d13534a824bce9c8ed2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 18 15:13:16 2006 +1000

     - (djm) Reorder IP options check so that it isn't broken by
       mapped addresses; bz #1179 reported by markw wtech-llc.com;
       ok dtucker@

commit dfc6183f13d8c0d033d5b259eeb888b4f1236c2d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 23:14:57 2006 +1100

       - djm@cvs.openbsd.org 2006/03/31 09:13:56
         [ssh_config.5]
         remote user escape is %r not %h; spotted by jmc@

commit c6437cf00a43e45f238928aea1af86457a9e262e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 23:14:41 2006 +1100

       - jmc@cvs.openbsd.org 2006/03/31 09:09:30
         [ssh_config.5]
         kill trailing whitespace;

commit 7a8f5b330dc7a98e7144ec119a7b5b0737a26708
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 23:14:23 2006 +1100

       - dtucker@cvs.openbsd.org 2006/03/30 11:40:21
         [auth.c monitor.c]
         Prevent duplicate log messages when privsep=yes; ok djm@

commit e23209f4349343d75c66fd8c71a57942d8827f54
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 23:13:35 2006 +1100

       - dtucker@cvs.openbsd.org 2006/03/30 11:05:17
         [ssh-keygen.c]
         Correctly handle truncated files while converting keys; ok djm@

commit 6b1d53c2b090130440c3459876c0033c4e5a466a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 23:13:21 2006 +1100

       - djm@cvs.openbsd.org 2006/03/30 10:41:25
         [ssh.c ssh_config.5]
         add percent escape chars to the IdentityFile option, bz #1159 based
         on a patch by imaging AT math.ualberta.ca; feedback and ok dtucker@

commit 3f9418893e1254bda3b87e7d3af7029d11b0a6c7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 23:13:02 2006 +1100

       - djm@cvs.openbsd.org 2006/03/30 09:58:16
         [authfd.c bufaux.c deattack.c gss-serv.c mac.c misc.c misc.h]
         [monitor_wrap.c msg.c packet.c sftp-client.c sftp-server.c ssh-agent.c]
         replace {GET,PUT}_XXBIT macros with functionally similar functions,
         silencing a heap of lint warnings. also allows them to use
         __bounded__ checking which can't be applied to macros; requested
         by and feedback from deraadt@

commit d79b424e8ad424a44119f327e5ab1f79cd35649c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 23:11:44 2006 +1100

       - djm@cvs.openbsd.org 2006/03/30 09:41:25
         [channels.c]
         ARGSUSED for dispatch table-driven functions

commit 89c3fe4a9e937338a235976a11c5411d33309460
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 23:11:28 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/28 01:53:43
         [ssh-agent.c]
         use strtonum() to parse the pid from the file, and range check it
         better; ok djm

commit 57c4e875f88ee7e6eac35e522be51618020cdaa7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 23:11:07 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/28 01:52:28
         [channels.c]
         do not accept unreasonable X ports numbers; ok djm

commit ddd63ab1d0acaa41a41d0afe9f79adc38ecbd7a7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 23:10:51 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/28 00:12:31
         [README.tun ssh.c]
         spacing

commit 2b5a0de9034a0f5943be129039dc56caee23fd94
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 23:10:31 2006 +1100

       - djm@cvs.openbsd.org 2006/03/27 23:15:46
         [sftp.c]
         always use a format string for addargs; spotted by mouring@

commit 5a73c1a34d7ed75295da703c835464746474d297
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 23:09:41 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/27 13:03:54
         [dh.c]
         use strtonum() instead of atoi(), limit dhg size to 64k; ok djm

commit da380becc6d9cc00c7e4c892354d93cd1fc12431
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 31 23:09:17 2006 +1100

     - OpenBSD CVS Sync
       - deraadt@cvs.openbsd.org 2006/03/27 01:21:18
         [xmalloc.c]
         we can do the size & nmemb check before the integer overflow check;
         evol

commit b3cdc220c402b790c7003816d7e1eafb31e107c1
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:30:33 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/26 01:31:48
         [uuencode.c]
         typo

commit 51096383e9bff34c80c9bab424e207767792e782
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:30:00 2006 +1100

       - djm@cvs.openbsd.org 2006/03/25 22:22:43
         [atomicio.h auth-options.h auth.h auth2-gss.c authfd.h authfile.h]
         [bufaux.h buffer.h canohost.h channels.h cipher.h clientloop.h]
         [compat.h compress.h crc32.c crc32.h deattack.h dh.h dispatch.h]
         [dns.c dns.h getput.h groupaccess.h gss-genr.c gss-serv-krb5.c]
         [gss-serv.c hostfile.h includes.h kex.h key.h log.h mac.h match.h]
         [misc.h monitor.h monitor_fdpass.h monitor_mm.h monitor_wrap.h msg.h]
         [myproposal.h packet.h pathnames.h progressmeter.h readconf.h rsa.h]
         [scard.h servconf.h serverloop.h session.h sftp-common.h sftp.h]
         [ssh-gss.h ssh.h ssh1.h ssh2.h sshconnect.h sshlogin.h sshpty.h]
         [ttymodes.h uidswap.h uuencode.h xmalloc.h]
         standardise spacing in $OpenBSD$ tags; requested by deraadt@

commit e3b21a5f59105174ba923beea8132fc20335130a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:29:06 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/25 18:58:10
         [channels.c]
         delete cast not required

commit a0fdce9a47dfa572fde97e1a2ee9b33efb9fd549
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:28:50 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/25 18:56:55
         [bufaux.c channels.c packet.c]
         remove (char *) casts to a function that accepts void * for the arg

commit 08d61505d7229aaa5484439b2f2e98add3052afe
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:28:32 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/25 18:43:30
         [channels.c]
         use strtonum() instead of atoi() [limit X screens to 400, sorry]

commit 1c13bd8d799ced6e2e8234a1d2409c30e7d67815
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:28:14 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/25 18:41:45
         [ssh-agent.c]
         mark two more signal handlers ARGSUSED

commit 5f340065fc047741448e814c7c30018e8012293b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:27:57 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/25 18:40:14
         [ssh-keygen.c]
         cast strtonum() result to right type

commit a1690d08b4ce6a1a40786048a6299c2b2d60507f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:27:35 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/25 18:36:15
         [sshlogin.c sshlogin.h]
         nicer size_t and time_t types

commit 90fdfaf69c9c62476689ccd2dbafe1cce56ee1bd
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:25:37 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/25 18:30:55
         [clientloop.c serverloop.c]
         spacing

commit 8ba29fe72d68c6044b0383bc56931f05f8f35b68
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:25:19 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/25 18:29:35
         [auth-rsa.c authfd.c packet.c]
         needed casts (always will be needed)

commit 48c4ed2b78a831b068529eefd8a002c431a76232
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:25:05 2006 +1100

    oops, rewrap

commit 57c30117c1c97c069bc38af45b4a504a39866e74
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:24:48 2006 +1100

       - djm@cvs.openbsd.org 2006/03/25 13:17:03
         [atomicio.c auth-bsdauth.c auth-chall.c auth-options.c auth-passwd.c]
         [auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth-skey.c auth.c auth1.c]
         [auth2-chall.c auth2-hostbased.c auth2-kbdint.c auth2-none.c]
         [auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfile.c bufaux.c]
         [buffer.c canohost.c channels.c cipher-3des1.c cipher-bf1.c]
         [cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c compress.c]
         [deattack.c dh.c dispatch.c fatal.c groupaccess.c hostfile.c kex.c]
         [kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c log.c]
         [mac.c match.c md-sha256.c misc.c monitor.c monitor_fdpass.c]
         [monitor_mm.c monitor_wrap.c msg.c nchan.c packet.c progressmeter.c]
         [readconf.c readpass.c rsa.c scard.c scp.c servconf.c serverloop.c]
         [session.c sftp-client.c sftp-common.c sftp-glob.c sftp-server.c]
         [sftp.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c]
         [ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c]
         [sshconnect2.c sshd.c sshlogin.c sshpty.c sshtty.c ttymodes.c]
         [uidswap.c uuencode.c xmalloc.c]
         Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
         Theo nuked - our scripts to sync -portable need them in the files

commit 55b04f1d77cdf503bf4c87e7a1ebf7d663b42554
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:23:17 2006 +1100

       - djm@cvs.openbsd.org 2006/03/25 01:30:23
         [sftp.c]
         "abormally" is a perfectly cromulent word, but "abnormally" is better

commit 36812092ecb11a25ca9d6d87fdeaf53e371c5043
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:22:47 2006 +1100

       - djm@cvs.openbsd.org 2006/03/25 01:13:23
         [buffer.c channels.c deattack.c misc.c scp.c session.c sftp-client.c]
         [sftp-server.c ssh-agent.c ssh-rsa.c xmalloc.c xmalloc.h auth-pam.c]
         [uidswap.c]
         change OpenSSH's xrealloc() function from being xrealloc(p, new_size)
         to xrealloc(p, new_nmemb, new_itemsize).
    
         realloc is particularly prone to integer overflows because it is
         almost always allocating "n * size" bytes, so this is a far safer
         API; ok deraadt@

commit 07d86bec5eeaf19fe33dca99c8ebcbe9a77c3938
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:19:21 2006 +1100

       - djm@cvs.openbsd.org 2006/03/25 00:05:41
         [auth-bsdauth.c auth-skey.c auth.c auth2-chall.c channels.c]
         [clientloop.c deattack.c gss-genr.c kex.c key.c misc.c moduli.c]
         [monitor.c monitor_wrap.c packet.c scard.c sftp-server.c ssh-agent.c]
         [ssh-keyscan.c ssh.c sshconnect.c sshconnect2.c sshd.c uuencode.c]
         [xmalloc.c xmalloc.h]
         introduce xcalloc() and xasprintf() failure-checked allocations
         functions and use them throughout openssh
    
         xcalloc is particularly important because malloc(nmemb * size) is a
         dangerous idiom (subject to integer overflow) and it is time for it
         to die
    
         feedback and ok deraadt@

commit 7cd4579eb3c5afd22ae24436fd2611cd3aa0150a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:11:39 2006 +1100

       - djm@cvs.openbsd.org 2006/03/22 21:27:15
         [deattack.c deattack.h packet.c]
         remove IV support from the CRC attack detector, OpenSSH has never used
         it - it only applied to IDEA-CFB, which we don't support.
         prompted by NetBSD Coverity report via elad AT netbsd.org;
         feedback markus@ "nuke it" deraadt@

commit a5a2859275794e080fd1872006402a55498d7e95
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:10:34 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 21:11:53
         [ttymodes.c]
         spacing

commit 4f7becb44f26b61673b8478fd4aeee262adaf446
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:10:14 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 18:48:34
         [channels.c fatal.c kex.c packet.c serverloop.c]
         spacing

commit 1d2b6706ba1b2000bd807731e6d8e35691eaf8df
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:09:54 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 18:42:27
         [canohost.c match.c ssh.c sshconnect.c]
         be strict with tolower() casting

commit 1ff7c642eed4df1c2f9fcc6f247d7d9949b6e81c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:09:09 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 18:41:43
         [dns.c]
         cast xstrdup to propert u_char *

commit 4ae97f1885daee4b6ccfa2b5062530d26cb38806
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:08:10 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 18:35:12
         [channels.c]
         x11_fake_data is only ever used as u_char *

commit 9f3bd53acdf281586910e49b15eef2bf87bfdda2
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:07:52 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 18:27:50
         [monitor.c]
         spacing

commit 9096740f6c39bbd91f2484c8cf58b4996dd8564f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:07:26 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 18:26:55
         [channels.c monitor.c session.c session.h ssh-agent.c ssh-keygen.c]
         [ssh-rsa.c ssh.c sshlogin.c]
         annoying spacing fixes getting in the way of real diffs

commit 91d4b12fcb045d93034b2609aaf56a4b41e6eb4f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:05:20 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 18:17:20
         [auth1.c auth2.c sshd.c]
         sprinkle some ARGSUSED for table driven functions (which sometimes
         must ignore their args)

commit 1b81a49f8669b4fd33100ec349570fc5390d88d4
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:05:02 2006 +1100

    rewrap

commit 71a73671305a2248a6c4a243134ebf28f7d8ee7a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:04:36 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 18:14:02
         [channels.c clientloop.c monitor_wrap.c monitor_wrap.h serverloop.c]
         [ssh.c sshpty.c sshpty.h]
         sprinkle u_int throughout pty subsystem, ok markus

commit 6d39bcf898f2cf296333590330a2d945f2f123a4
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:03:21 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 17:17:23
         [ssh-rsa.c]
         in a switch (), break after return or goto is stupid

commit bbaad7772a1d6f2c1d997e7bb15a92c5128d3863
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:03:03 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 17:13:16
         [key.c]
         djm did a typo

commit 69b7203e6f7c93419aa1a0862962e128d68679e1
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:02:35 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 17:10:19
         [auth.c key.c misc.c packet.c ssh-add.c]
         in a switch (), break after return or goto is stupid

commit 429fcc23db22469ca48d18ad4a2940a265965caf
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:02:16 2006 +1100

       - djm@cvs.openbsd.org 2006/03/20 11:38:46
         [key.c]
         (really) last of the Coverity diffs: avoid possible NULL deref in
         key_free. via elad AT netbsd.org; markus@ ok

commit 96937bd9144f582330478ed5c5b76dd3286c46e4
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:01:54 2006 +1100

       - djm@cvs.openbsd.org 2006/03/20 04:09:44
         [monitor.c]
         memory leaks detected by Coverity via elad AT netbsd.org;
         deraadt@ ok
         that should be all of them now

commit 3305f5591f7a1b17565a1f13683d0b20287130c3
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 14:00:31 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/19 18:59:09
         [authfile.c]
         whoever thought that break after return was a good idea needs to
         get their head examimed

commit 4662d3492f24cf1d7974db805215c801e50cffc3
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:59:59 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/19 18:59:30
         [ssh.c]
         spacing

commit 3bbaba60753b3987ba822a2cbf619fb00072a9e5
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:59:38 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/19 18:59:49
         [ssh-keyscan.c]
         please lint

commit f0b15dfc525227f06a1404231cca2171c62d1178
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:59:20 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/19 18:56:41
         [clientloop.c progressmeter.c serverloop.c sshd.c]
         ARGSUSED for signal handlers

commit c91e556d8a2cf97a5d7075154d39eb8fd4098fe4
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:58:55 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/19 18:53:12
         [kex.c kex.h monitor.c myproposal.h session.c]
         spacing

commit d62f2ca376168c716e4b485512a2b62b461e45b2
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:57:41 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/19 18:52:11
         [auth1.c authfd.c channels.c]
         spacing

commit 4ca108d19235c42fcfc69bb05b1f2e85217ec45e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:57:07 2006 +1100

    id sync

commit 78f16cb07bb0221caea416b5ea83f74dc196fd8a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:54:37 2006 +1100

       - dtucker@cvs.openbsd.org 2006/03/19 11:51:52
         [servconf.c]
         Correct strdelim null test; ok djm@

commit 5790b5910bfc3de69e0886953f9c09341f3fd951
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:54:03 2006 +1100

       - djm@cvs.openbsd.org 2006/03/19 07:41:30
         [sshconnect2.c]
         memory leaks detected by Coverity via elad AT netbsd.org;
         deraadt@ ok

commit 928b23684a1d94dc2bc1cecc75b0e596eb7a4cb9
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:53:32 2006 +1100

       - djm@cvs.openbsd.org 2006/03/19 02:24:05
         [dh.c readconf.c servconf.c]
         potential NULL pointer dereferences detected by Coverity
         via elad AT netbsd.org; ok deraadt@

commit 6db780e259f985b9c88dff222eb56b4726a5a5e1
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:52:20 2006 +1100

       - djm@cvs.openbsd.org 2006/03/19 02:23:26
         [hostfile.c]
         FILE* leak detected by Coverity via elad AT netbsd.org;
         ok deraadt@

commit e0b90a676696c6729467837f6f4030d18999aa34
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:51:44 2006 +1100

       - djm@cvs.openbsd.org 2006/03/19 02:22:56
         [sftp.c]
         more memory leaks detected by Coverity via elad AT netbsd.org;
         deraadt@ ok

commit 6f98a1fea710ab2dae0342f9a3cee8f01372b666
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:51:08 2006 +1100

       - djm@cvs.openbsd.org 2006/03/19 02:22:32
         [serverloop.c]
         memory leaks detected by Coverity via elad AT netbsd.org;
         ok deraadt@ dtucker@

commit 304a940889e7673a017147e2dcbdaefb564f427a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:50:37 2006 +1100

       - djm@cvs.openbsd.org 2006/03/17 22:31:11
         [authfd.c]
         unreachanble statement, found by lint

commit 5b83232b48b83e05856f96a5f7477e0352a29b1e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:50:14 2006 +1100

       - djm@cvs.openbsd.org 2006/03/17 22:31:50
         [authfd.c]
         another unreachable found by lint

commit 745570cd7991f2a47649b414084496128326f5d3
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:49:43 2006 +1100

       - biorn@cvs.openbsd.org 2006/03/16 10:31:45
         [scp.c]
         Try to display errormessage even if remout == -1
         ok djm@, markus@

commit cb314828eb11b3827a096d9b4abcd8d229764a46
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:48:01 2006 +1100

     - OpenBSD CVS Sync
       - jakob@cvs.openbsd.org 2006/03/15 08:46:44
         [ssh-keygen.c]
         if no key file are given when printing the DNS host record, use the
         host key file(s) as default. ok djm@

commit 2dbbf8e9fc058cab975a9bcda21465d34465c92e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 00:11:46 2006 +1100

         [deattack.c deattack.h]
         remove IV support from the CRC attack detector, OpenSSH has never used
         it - it only applied to IDEA-CFB, which we don't support.
         prompted by NetBSD Coverity report via elad AT netbsd.org;
         feedback markus@ "nuke it" deraadt@

commit a1b3d636abea0e2e75d797af22e93f01c424d80a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 00:07:02 2006 +1100

       - jakob@cvs.openbsd.org 2006/03/22 21:16:24
         [ssh.1]
         simplify SSHFP example; ok jmc@

commit 5996294a954e3013ade0719f3c0c7389d3d333f7
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 00:06:48 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 18:41:43
         [dns.c]
         cast xstrdup to propert u_char *

commit 1345e617da1cdf8c62db7c372e2cd5762cb31f7f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 00:06:32 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 18:26:55
         [session.h]
         annoying spacing fixes getting in the way of real diffs

commit ed3986a00492c5a7f1f284f724dc4dd4063ea785
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 00:06:14 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/20 18:14:02
         [monitor_wrap.h sshpty.h]
         sprinkle u_int throughout pty subsystem, ok markus

commit 91a2d9746a0934777e9a43f3671db1daa309c1ab
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 00:05:44 2006 +1100

       - djm@cvs.openbsd.org 2006/03/20 04:08:18
         [gss-serv.c]
         last lot of GSSAPI related leaks detected by Coverity via
         elad AT netbsd.org; reviewed by simon AT sxw.org.uk; deraadt@ ok

commit a66cf68dd78aec58d3f7b35c0739eab7069b6936
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 00:05:23 2006 +1100

       - djm@cvs.openbsd.org 2006/03/20 04:07:49
         [gss-genr.c]
         more GSSAPI related leaks detected by Coverity via elad AT netbsd.org;
         reviewed by simon AT sxw.org.uk; deraadt@ ok

commit f23c09670a2a7a0339daffb7f3340756f6d539de
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 00:04:53 2006 +1100

       - djm@cvs.openbsd.org 2006/03/20 04:07:22
         [auth2-gss.c]
         GSSAPI related leaks detected by Coverity via elad AT netbsd.org;
         reviewed by simon AT sxw.org.uk; deraadt@ ok

commit 51b4f821231446fd36baf991a3d08dd83fc7f6e9
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 00:04:32 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/19 18:53:12
         [kex.h myproposal.h]
         spacing

commit b0fb6872ed2efe3a116083e43dd4f5f47cd4882b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 00:03:21 2006 +1100

       - deraadt@cvs.openbsd.org 2006/03/19 18:51:18
         [atomicio.c auth-bsdauth.c auth-chall.c auth-krb5.c auth-options.c]
         [auth-pam.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c]
         [auth-shadow.c auth-skey.c auth.c auth1.c auth2-chall.c]
         [auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c]
         [auth2-pubkey.c auth2.c authfd.c authfile.c bufaux.c buffer.c]
         [canohost.c channels.c cipher-3des1.c cipher-acss.c cipher-aes.c]
         [cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c]
         [compress.c deattack.c dh.c dispatch.c dns.c entropy.c fatal.c]
         [groupaccess.c hostfile.c includes.h kex.c kexdh.c kexdhc.c]
         [kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c log.c loginrec.c]
         [loginrec.h logintest.c mac.c match.c md-sha256.c md5crypt.c misc.c]
         [monitor.c monitor_fdpass.c monitor_mm.c monitor_wrap.c msg.c]
         [nchan.c packet.c progressmeter.c readconf.c readpass.c rsa.c]
         [scard.c scp.c servconf.c serverloop.c session.c sftp-client.c]
         [sftp-common.c sftp-glob.c sftp-server.c sftp.c ssh-add.c]
         [ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c]
         [ssh-rand-helper.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c]
         [sshconnect2.c sshd.c sshlogin.c sshpty.c sshtty.c ttymodes.c]
         [uidswap.c uuencode.c xmalloc.c openbsd-compat/bsd-arc4random.c]
         [openbsd-compat/bsd-closefrom.c openbsd-compat/bsd-cygwin_util.c]
         [openbsd-compat/bsd-getpeereid.c openbsd-compat/bsd-misc.c]
         [openbsd-compat/bsd-nextstep.c openbsd-compat/bsd-snprintf.c]
         [openbsd-compat/bsd-waitpid.c openbsd-compat/fake-rfc2553.c]
         RCSID() can die

commit 3e96d742743b150025588b7200c7998d7e4ec2c6
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 25 23:39:29 2006 +1100

       - djm@cvs.openbsd.org 2006/03/16 04:24:42
         [ssh.1]
         Add RFC4419 (Diffie-Hellman group exchange KEX) to the list of SSH RFCs
         that OpenSSH supports

commit 9834cab32ef1abd8f0e4e74852ac52c35cfce0ef
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 19 00:07:07 2006 +1100

     - (dtucker) [openbsd-compat/bsd-snprintf.c] Bug #1173: make fmtint() take
       a LLONG rather than a long.  Fixes scp'ing of large files on platforms
       with missing/broken snprintfs.  Patch from e.borovac at bom.gov.au.

commit 66f9eb65ff494e69fc0bdfede303c60763ad5515
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 18 23:04:49 2006 +1100

    - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via
      elad AT NetBSD.org

commit b309203ce0fd065e74ee22349a16488a7713867b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 16 18:22:18 2006 +1100

     - (djm) [kex.c] Slightly more clean deactivation of dhgex-sha256 on old
       OpenSSL; ok tim

commit 425a6886f99235e61faf8ea67c8f573f188eb2b2
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Mar 15 20:17:05 2006 -0800

     - (tim) [kex.c myproposal.h md-sha256.c openbsd-compat/sha2.c,h] Disable
       sha256 when openssl < 0.9.7. Patch from djm@. Corrections/testing by me.

commit c495301bf8cd3a05512e702af212631abab52b88
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 16 08:14:34 2006 +1100

     - (dtucker) [configure.ac md-sha256.c] NetBSD has sha2.h in
       /usr/include/crypto.  Hint from djm@.

commit d82cbcb9da3c2a908bd7704b1d9e5686f936ced3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 16 07:21:35 2006 +1100

     - (dtucker) [entropy.c] Add headers for WIFEXITED and friends.

commit 8bb9e2c9000d5cfe8d5503d67d48a8a4e153ec39
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 15 22:28:17 2006 +1100

     - (dtucker) [configure.ac] login_cap.h requires sys/types.h on NetBSD.

commit dc6118e1272e91fd4faebde7b2ea85a36dd6f08d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 15 22:25:54 2006 +1100

     - (dtucker) [openbsd-compat/openbsd-compat.h] AIX (at least) needs
       sys/ioctl.h for struct winsize.

commit b0024914c98f4e622e1d1ae0ecc67d3fe9dd9830
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 21:48:54 2006 +1100

     - (djm) [includes.h] Put back paths.h, it is needed in defines.h

commit 486d95e6f78e7b27bbdc932ee6fdce0d28b2f8d9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 15 21:31:39 2006 +1100

     - (dtucker) [configure.ac] Fix glob test conversion to AC_TRY_COMPILE

commit 4b23f7c660efee1b4158b6a9fa0197ff9f8f6692
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Mar 14 22:09:50 2006 -0800

     - (tim) [openssh/sshpty.c openssh/openbsd-compat/port-tun.c] put in some
       includes removed from includes.h

commit 7a4cf232c9861ccc5e824005ab696f73511f7520
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Mar 14 21:04:18 2006 -0800

     - (tim) [includes.h] put sys/stat.h back in to quiet some "macro redefined:"
       warnings.

commit 6645e7a70d1b46b2cb408e1a13755c300a0d47c2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 14:42:54 2006 +1100

     - (djm) [auth-pam.c clientloop.c includes.h monitor.c session.c]
       [sftp-client.c ssh-keysign.c ssh.c sshconnect.c sshconnect2.c]
       [sshd.c openbsd-compat/bsd-misc.c openbsd-compat/bsd-openpty.c]
       [openbsd-compat/glob.c openbsd-compat/mktemp.c]
       [openbsd-compat/readpassphrase.c] Lots of include fixes for
       OpenSolaris

commit 34877d2e1744237569555c73afbed02e338218f2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 14:36:55 2006 +1100

     - (djm) [openbsd-compat/sha2.h openbsd-compat/sha2.c] Comment out
       SHA384, which we don't need and doesn't compile without tweaks

commit 42fb06898ed362df4c58226fc449dbe738d4ea3f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 14:03:06 2006 +1100

     - (djm) [ssh-agent.c] Restore dropped stat.h

commit 3717cdac6087c3e5a0df0def4d3c41694e1b55fe
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 14:02:36 2006 +1100

     - (djm) [ssh-rand-helper.c] Needs a bunch of headers

commit a62380786075ece35897bef1ba01386a55f7de33
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 14:02:01 2006 +1100

     - (djm) [openbsd-compat/sha2.h] Avoid include macro clash with
       system sha2.h

commit 627725281e348dee76fa9c588923bd28247e2520
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 14:01:11 2006 +1100

     - (djm) [loginrec.c] Need stat.h

commit b3b4ba3fba90ecc80877f2dbdb2c3b50e9fce227
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 13:13:27 2006 +1100

     - (djm) [regress/.cvsignore] Ignore Makefile here

commit 41e364bcfa11d5a72c242d0b27ead364b0ebaa5d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 13:12:41 2006 +1100

     - (djm) [md-sha256.c configure.ac] md-sha256.c needs sha2.h if present

commit 471e9b3ca6500cff8f97f0a472719b01fa3eeb09
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 13:09:18 2006 +1100

     - (djm) [Makefile.in openbsd-compat/Makefile.in] Add added files

commit dcf4ca110e751208400660317ae2cee6f28cbff9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 13:07:48 2006 +1100

     - (djm) [includes.h] Restore accidentally dropped netinet/in.h

commit af87af165f25b7db22e32c0b2e55606bc68c450c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 13:02:28 2006 +1100

     - (djm) [configure.ac defines.h kex.c md-sha256.c]
       [openbsd-compat/sha2.h openbsd-compat/openbsd-compat.h]
       [openbsd-compat/sha2.c] First stab at portability glue for SHA256
       KEX support, should work with libc SHA256 support or OpenSSL
       EVP_sha256 if present

commit a63128d1a8a4077bc992e09d00e2683d1592e500
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:08:28 2006 +1100

       - djm@cvs.openbsd.org 2006/03/07 09:07:40
         [kex.c kex.h monitor.c myproposal.h ssh-keyscan.c sshconnect2.c sshd.c]
         Implement the diffie-hellman-group-exchange-sha256 key exchange method
         using the SHA256 code in libc (and wrapper to make it into an OpenSSL
         EVP), interop tested against CVS PuTTY
         NB. no portability bits committed yet

commit cc3e8ba3c24357b912dd7071ba34ab863de593bd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:06:55 2006 +1100

       - markus@cvs.openbsd.org 2006/03/14 16:32:48
         [ssh_config.5 sshd_config.5]
         *AliveCountMax applies to protcol v2 only; ok dtucker, djm

commit de85a28825de0dea6aa5b6d3e79f7207d7dda51d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:06:41 2006 +1100

       - djm@cvs.openbsd.org 2006/03/14 00:15:39
         [canohost.c]
         log the originating address and not just the name when a reverse
         mapping check fails, requested by linux AT linuon.com

commit 8275fade44b56aed722ea91bc4586f48babece80
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:06:23 2006 +1100

       - dtucker@cvs.openbsd.org 2006/03/13 10:26:52
         [authfile.c authfile.h ssh-add.c]
         Make ssh-add check file permissions before attempting to load private
         key files multiple times; it will fail anyway and this prevents confusing
         multiple prompts and warnings.  mindrot #1138, ok djm@

commit 306d118f72670f0da447f28b7eec576dcb4a6e38
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:05:59 2006 +1100

       - dtucker@cvs.openbsd.org 2006/03/13 10:14:29
         [misc.c ssh_config.5 sshd_config.5]
         Allow config directives to contain whitespace by surrounding them by double
         quotes.  mindrot #482, man page help from jmc@, ok djm@

commit 8056a9d46ac2d75560c2fd9fc69c75ee46a43922
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:05:40 2006 +1100

       - dtucker@cvs.openbsd.org 2006/03/13 08:43:16
         [ssh-keygen.c]
         Make ssh-keygen handle CR and CRLF line termination when converting IETF
         format keys, in adition to vanilla LF.  mindrot #1157, tested by Chris
         Pepper, ok djm@

commit 314dd4b2f33c22330f3f4272b1605fb0d8fbc58b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:05:22 2006 +1100

       - dtucker@cvs.openbsd.org 2006/03/13 08:33:00
         [packet.c]
         Set TCP_NODELAY for all connections not just "interactive" ones.  Fixes
         poor performance and protocol stalls under some network conditions (mindrot
         bugs #556 and #981). Patch originally from markus@, ok djm@

commit b24c2f8e33781be43702d8cfc69d4fbd0547e638
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:04:36 2006 +1100

       - djm@cvs.openbsd.org 2006/03/13 08:16:00
         [sshd.c]
         don't log that we are listening on a socket before the listen() call
         actually succeeds, bz #1162 reported by Senthil Kumar; ok dtucker@

commit 2ecb6bd95d1f7d47d6071614be99339b290771e0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:03:53 2006 +1100

       - djm@cvs.openbsd.org 2006/03/12 04:23:07
         [ssh.c]
         knf nit

commit ec04f360eb56a75e5f12393e80bc9ca39eacd5e8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:01:34 2006 +1100

       - djm@cvs.openbsd.org 2006/03/04 04:12:58
         [serverloop.c]
         move a debug() outside of a signal handler; ok markus@ a little while back

commit 1cf76d97f91e16cd82ca457220a3e1b40ec2943a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:01:14 2006 +1100

       - djm@cvs.openbsd.org 2006/02/28 01:10:21
         [session.c]
         fix logout recording when privilege separation is disabled, analysis and
         patch from vinschen at redhat.com; tested by dtucker@ ok deraadt@
         NB. ID sync only - patch already in portable

commit 4aea974a1df1396a7b2300a331b5162db69a39f0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:59:39 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/26 18:03:10
         [ssh_config.5]
         comma;

commit e3beba231af4aa4364171c6828b0481067293ab5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:59:25 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/26 18:01:13
         [sshd_config.5]
         subsection is pointless here;

commit b5282c2f06ee40ee2f7e99cb315956b63c56c7cb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:59:08 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/26 17:17:18
         [ssh_config.5]
         move PATTERNS to the end of the main body; requested by dtucker

commit ac73e5139072c444ade00fadc7817451a531788d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:58:49 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/25 12:28:34
         [sshd_config.5]
         document the order in which allow/deny directives are processed;
         help/ok dtucker

commit d450f49d4a306bf70320fc2526ce68917a2a315a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:58:25 2006 +1100

    missed in commit message:
    
         help/ok dtucker

commit 9cfbaecb64cbfbd7e9218faa1e95985a72d73038
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:57:55 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/25 12:26:17
         [ssh_config.5]
         document the possible values for KbdInteractiveDevices;

commit f4f22b54c0e2a454d3ac093d99f845db4da98a81
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:57:25 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/24 23:51:17
         [sshd_config.5]
         oops - bits i missed;

commit 5b0d63f8943dc7f9029ba5171b2a23acfa97f7aa
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:56:56 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/24 23:43:57
         [sshd_config.5]
         some grammar/wording fixes;

commit 45ee2b91e62eb382e0cd0c61a9b34c25b8efc36c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:56:18 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/24 23:20:07
         [ssh_config.5]
         some grammar/wording fixes;

commit 208f1ed6f180cc0cfd3ab59d0b1c33796cc4c641
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:56:03 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/24 20:31:31
         [ssh.1 ssh_config.5 sshd.8 sshd_config.5]
         more consistency fixes;

commit 1faa7133233075776c83a71b427d19e35790280e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:55:31 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/24 20:22:16
         [ssh-keysign.8 ssh_config.5 sshd_config.5]
         some consistency fixes;

commit c7d5b5e4662b5c4d78639b9bfed642917f775da4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:55:08 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/24 10:39:52
         [sshd.8]
         signpost to PATTERNS section;

commit f54a4b9da57eff2b68c09ce7f50b3573f1fc0f4a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:54:36 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/24 10:37:07
         [ssh_config.5]
         tidy up the refs to PATTERNS;

commit 0c2079d81f6244c6bfdc0d091dc575c820af08f1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:54:21 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/24 10:33:54
         [sshd_config.5]
         signpost to PATTERNS;

commit 6def55171fa7625da63f6b5c2fc0a45211208c11
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:54:05 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/24 10:25:14
         [ssh_config.5]
         add section on patterns;
         from dtucker + myself

commit c7b06369a846822b0da77b969d4ed72ea8ee38d4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:53:45 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/22 00:04:45
         [canohost.c clientloop.c includes.h match.c readconf.c scp.c ssh.c]
         [sshconnect.c]
         move #include <ctype.h> out of includes.h; ok djm@

commit 6ff3caddb687a89a5df715337917d0e140985b7f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:52:09 2006 +1100

    oops, this commit is really:
    
       - stevesk@cvs.openbsd.org 2006/02/20 17:02:44
         [clientloop.c includes.h monitor.c progressmeter.c scp.c]
         [serverloop.c session.c sftp.c ssh-agent.c ssh.c sshd.c]
         move #include <signal.h> out of includes.h; ok markus@
    
    the previous was:
    
       - stevesk@cvs.openbsd.org 2006/02/20 17:19:54
         [auth-rhosts.c auth-rsa.c auth.c auth2-none.c auth2-pubkey.c]
         [authfile.c clientloop.c includes.h readconf.c scp.c session.c]
         [sftp-client.c sftp-common.c sftp-common.h sftp-glob.c]
         [sftp-server.c sftp.c ssh-add.c ssh-keygen.c ssh.c sshconnect.c]
         [sshconnect2.c sshd.c sshpty.c]
         move #include <sys/stat.h> out of includes.h; ok markus@

commit f17883e6a0f9462c8bc163cce44331862581b0cb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:45:54 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/20 17:02:44
         [clientloop.c includes.h monitor.c progressmeter.c scp.c]
         [serverloop.c session.c sftp.c ssh-agent.c ssh.c sshd.c]
         move #include <signal.h> out of includes.h; ok markus@

commit 574c41fdb3ff4b8eb7f121b05a08f2415ec7efec
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:40:10 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/20 16:36:15
         [authfd.c channels.c includes.h session.c ssh-agent.c ssh.c]
         move #include <sys/un.h> out of includes.h; ok djm@

commit 5c853b531f3e2af1aa38d1a911529ecc9511c341
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:37:02 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/19 20:12:25
         [ssh_config.5]
         add some vertical space;

commit edd0375d828e0ecbac4c515ae848256e907ba840
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:36:45 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/19 20:05:00
         [sshd.8]
         grammar;

commit 445121fe8dc73601fc301de5be5b7c02b2d20bf9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:36:18 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/19 20:02:17
         [sshd.8]
         sync the (s)hosts.equiv FILES entries w/ those from ssh.1;

commit fd725cf585d0f9aca648f177df35265b6abc10e6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:35:54 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/19 19:52:10
         [sshd.8]
         move the sshrc stuff out of FILES, and into its own section:
         FILES is not a good place to document how stuff works;

commit adc35b9583944203906ef1fd8b078316213e35d5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:35:27 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/16 09:05:34
         [sshd.8]
         sync some of the FILES entries w/ ssh.1;

commit bc1936ad8735cc5f4949eb18172869352e2c5c1c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:35:05 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/15 16:55:33
         [sshd.8]
         remove ietf draft references; RFC list now maintained in ssh.1;

commit 39a93a3305079d6bfab7f749e92d7931491ddf94
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:34:45 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/15 16:53:20
         [ssh.1]
         remove the IETF draft references and replace them with some updated RFCs;

commit 0c8d8f68db86dfee772c51bdeb6d9558d7be97f2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:34:25 2006 +1100

       - david@cvs.openbsd.org 2006/02/15 05:08:24
         [sftp-client.c]
         typo in comment; ok djm@

commit d8702e865d1e0107d50dc0296b22dc0b788d5a0a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:33:56 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/13 11:27:25
         [sshd.8]
         sort FILES and use a -compact list;

commit c8f61cf1996a7374de465d8e2fda93dec34364a2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:33:25 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/13 11:08:43
         [sshd.8]
         - avoid nasty line split
         - `*' does not need to be escaped

commit cc00f5e2592157fa772bd4c287618c357ef7b444
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:33:00 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/13 11:02:26
         [sshd.8]
         turn this into an example ssh_known_hosts file; ok djm

commit 9a7f201d45a5bc2c268ff35668a120487ac8e33c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:32:42 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/13 10:21:25
         [sshd.8]
         small tweaks for the ssh_known_hosts section;

commit 7d2ef02f1c79788e9b73d15a33019e09fe6bec76
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:32:06 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/13 10:16:39
         [sshd.8]
         no need to subsection the authorized_keys examples - instead, convert
         this to look like an actual file. also use proto 2 keys, and use IETF
         example addresses;

commit 31bdc52325c8ba48f23fc7e0b32bfab67ebf47cb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:31:44 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/12 17:57:19
         [sshd.8]
         sort the list of options permissable w/ authorized_keys;
         ok djm dtucker

commit dcfea27f1b4e7af8019f8539dd53188af1ccded3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:31:22 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/12 10:52:41
         [sshd.8]
         rework the description of authorized_keys a little;

commit 20c2ec48c376fc025774bbb903f57de449bb8c5c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:31:01 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/12 10:49:44
         [ssh_config.5]
         slight rewording; ok djm

commit b59d4fe8b505f98f1a95da369c0f4c51b642e042
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:30:38 2006 +1100

       - djm@cvs.openbsd.org 2006/02/12 10:44:18
         [readconf.c]
         raise error when the user specifies a RekeyLimit that is smaller than 16
         (the smallest of our cipher's blocksize) or big enough to cause integer
         wraparound; ok & feedback dtucker@

commit 3ec54c7e58eb9724a5d54d3e985992ebecbd7553
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:30:13 2006 +1100

       - djm@cvs.openbsd.org 2006/02/12 06:45:34
         [ssh.c ssh_config.5]
         add a %l expansion code to the ControlPath, which is filled in with the
         local hostname at runtime. Requested by henning@ to avoid some problems
         with /home on NFS; ok dtucker@

commit 3fd019ecca7d41702111f926f08e370946cf9060
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:29:51 2006 +1100

       - otto@cvs.openbsd.org 2006/02/11 19:31:18
         [atomicio.c]
         type correctness; from Ray Lai in PR 5011; ok millert@

commit 9cf6d077fb87b4364e70c9fd889bf26744718301
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:29:24 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/10 01:44:27
         [includes.h monitor.c readpass.c scp.c serverloop.c session.c^?]
         [sftp.c sshconnect.c sshconnect2.c sshd.c]
         move #include <sys/wait.h> out of includes.h; ok markus@

commit 17e91c0fb01787f9a5974a997bb26114a435dde7
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:28:34 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/10 00:27:13
         [channels.c clientloop.c includes.h misc.c progressmeter.c sftp.c]
         [ssh.c sshd.c sshpty.c]
         move #include <sys/ioctl.h> out of includes.h; ok markus@

commit c47d7e9e1905adbef3489cc2bbdceda02d212f7e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:27:20 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/09 10:10:47
         [sshd.8]
         - move some text into a CAVEATS section
         - merge the COMMAND EXECUTION... section into AUTHENTICATION

commit 1d90540534da87ba4ac5b48037f1d66f82569ff7
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:26:55 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/09 00:32:07
         [includes.h]
         #include <sys/endian.h> not needed; ok djm@
         NB. ID Sync only - we still need this (but it may move later)

commit 88f254b9a56fb87069e9f078ec613d6d08e4dac5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:25:13 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/08 23:51:24
         [includes.h scp.c sftp-glob.c sftp-server.c]
         move #include <dirent.h> out of includes.h; ok markus@

commit 68f8e992bf4ab38263b8619aad8a5e34f238fffb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:24:12 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/08 14:38:18
         [includes.h packet.c]
         move #include <netinet/in_systm.h> and <netinet/ip.h> out of
         includes.h; ok markus@

commit cd4223c24503346477bc7d50249e569ae8ef97ae
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:22:47 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/08 14:31:30
         [includes.h ssh-agent.c ssh-keyscan.c ssh.c]
         move #include <sys/resource.h> out of includes.h; ok markus@

commit 52ab08475511b5700e823f058b7ffebbcbcf7056
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:20:46 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/08 14:16:59
         [sshconnect.c]
         <openssl/bn.h> not needed

commit 0b70b54abc79e73ab0949b56c3d7dd1c3e60bf47
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:20:03 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/08 13:15:44
         [gss-serv.c monitor.c]
         small KNF

commit 3a4051e88b18b4290b07db7aec99adfffe566c96
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:19:42 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/08 12:32:49
         [includes.h misc.c]
         move #include <netinet/tcp.h> out of includes.h; ok markus@

commit a9263d065d1db21c1d0661913673ed5c9b4d6467
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:18:26 2006 +1100

    fix spacing of include

commit 03e2003a2336e576aa1f27eab4f0f5b0b582bddd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:16:59 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/08 12:15:27
         [auth.c clientloop.c includes.h misc.c monitor.c readpass.c]
         [session.c sftp.c ssh-agent.c ssh-keysign.c ssh.c sshconnect.c]
         [sshd.c sshpty.c]
         move #include <paths.h> out of includes.h; ok markus@

commit de6dd0a35f9eb100d02a8953800ae49cc27e9cd5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:12:38 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/07 03:59:20
         [deattack.c]
         duplicate #include

commit 5d7710552751dc58667e5cc73434846395de2480
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:12:13 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/07 03:47:05
         [hostfile.c]
         "packet.h" not needed

commit 972c84b80085235e2a89017991dcc2deaa6e742f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:11:56 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/07 01:52:50
         [sshtty.c]
         "log.h" not needed

commit 99bd21e3fe8f8312cb71c1ebf23c34a82a861429
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:11:28 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/07 01:42:00
         [channels.c clientloop.c clientloop.h includes.h packet.h]
         [serverloop.c sshpty.c sshpty.h sshtty.c ttymodes.c]
         move #include <termios.h> out of includes.h; ok markus@

commit 2eb6340ddd2d1326cb3fd708be21b1bce7355e49
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:09:42 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/07 01:18:09
         [includes.h ssh-agent.c ssh-keyscan.c sshconnect2.c]
         move #include <sys/queue.h> out of includes.h; ok markus@

commit 015cd79ac5bbdac513e1a2c14ba4c5226c0a7ae0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:08:02 2006 +1100

       - stevesk@cvs.openbsd.org 2006/02/07 01:08:04
         [auth-rhosts.c includes.h]
         move #include <netgroup.h> out of includes.h; ok markus@

commit e93eaaa0d1e8e6447eeb6f698f7da50ede0cb926
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:05:59 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/06 21:44:47
         [ssh.1]
         make this a little less ambiguous...

commit 9f67a21de62ca0b0e2db022abaeaf3f2faed5f0c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:05:35 2006 +1100

       - msf@cvs.openbsd.org 2006/02/06 15:54:07
         [ssh.1]
         - typo fix
         ok jmc@

commit d1450dbe2ab1cc06fd54af265014dfcf68c08cc1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 13 19:06:51 2006 +1100

     - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
       since not all platforms support it.  Instead, use internal equivalent while
       computing LLONG_MIN and LLONG_MAX.  Remove special case for alpha-dec-osf*
       as it's no longer required.  Tested by Bernhard Simon, ok djm@

commit f35014af79c7a94e7c39d3ed4b3fb276115d9705
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Mar 4 09:00:19 2006 +1100

    typo

commit 890909ec4821c2143ae6af4550aee977711bf914
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Mar 4 08:59:39 2006 +1100

     - (dtucker) [gss-serv-krb5.c] Bug #1166: Correct #ifdefs for gssapi_krb5.h
       includes.  Patch from gentoo.riverrat at gmail.com.

commit 18614c254d83466ab706ffd0d4f58a8a018dcddf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Mar 4 08:50:31 2006 +1100

     - (dtucker) [contrib/cygwin/ssh-host-config] Require use of lastlog as a
       file rather than directory, required as Cygwin will be importing lastlog(1).
       Also tightens up permissions on the file.  Patch from vinschen@redhat.com.

commit 54b75fe742c43aeaca7277a4c310eba43d057e4d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 26 12:31:48 2006 +1100

     - (dtucker) [configure.ac] Bug #1156: QNX apparently needs SSHD_ACQUIRES_CTTY
       patch from kraai at ftbfs.org.

commit a4904f7bf19fb091b9fcf8059dedd5c5198fc039
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 23 21:35:30 2006 +1100

     - (dtucker) [sshd_config sshd_config.5] Update UsePAM to reflect current
       reality.  Pointed out by tryponraj at gmail.com.

commit 94413cf32ba932537ef215b07eb1833e297fcae5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 22 22:24:47 2006 +1100

     - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Minor tidy up: only
       compile in compat code if required.

commit 3322e0d421676a6931fe01efdd5e0f34af8e5da2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 22 00:00:27 2006 +1100

     - (dtucker) [openbsd-compat/openssl-compat.h] Prevent warning about
       redefinition of SSLeay_add_all_algorithms.

commit fabdb6c29022846ed10fde235db0a7c53f21a6b1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Feb 20 20:17:35 2006 +1100

     - (dtucker) [INSTALL configure.ac openbsd-compat/openssl-compat.{c,h}]
       Add optional enabling of OpenSSL's (hardware) Engine support, via
       configure --with-ssl-engine.  Based in part on a diff by michal at
       logix.cz.

commit 4881c371cef5e3c1065d7dfa314fffc3a5ab0256
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 19 22:50:20 2006 +1100

     - (dtucker) [Makefile.in configure.ac, added openbsd-compat/regress/]
       Add first attempt at regress tests for compat library.  ok djm@

commit bf209f590108a12a9758dcfcdf4297a3d593ce87
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Feb 13 12:46:44 2006 -0800

     - (tim) [buildpkg.sh.in] Make the names consistent.
       s/pkg_post_make_install_fixes.sh/pkg-post-make-install-fixes.sh/ OK dtucker@

commit 6163350eb97774e7f780d5cc9df6164a6803aa0c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 12 16:48:56 2006 +1100

     - (dtucker) [README version.h contrib/caldera/openssh.spec
       contrib/redhat/openssh.spec contrib/suse/openssh.spec] Bump version
       strings to match 4.3p2 release.

commit 2f993465d4584c1eb188e02fde1f0da9dbb4fc88
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Feb 11 18:37:48 2006 -0800

     - (tim) [configure.ac] Bug #1149. Disable /etc/default/login check for QNX.

commit 84af61555a62e39c583522ec1ab356cd595846b3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 12 11:59:08 2006 +1100

     - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Make loop counter unsigned
       to silence compiler warning, from vinschen at redhat.com.

commit 988b3fd161e678c7efc5a9974b51ecc3e2ad8a7b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 8 22:11:27 2006 +1100

     - (dtucker) [configure.ac] Typo in Ultrix and NewsOS sections (NEED_SETPRGP
       -> NEED_SETPGRP), reported by Berhard Simon.  ok tim@

commit 83d2f5fedfac201f24205c41691a03f23bd35df0
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 7 15:17:44 2006 -0800

     - (tim) [session.c] Logout records were not updated on systems with
       post auth privsep disabled due to bug 1086 changes. Analysis and patch
       by vinschen at redhat.com. OK tim@, dtucker@.

commit ac9b0609e17e36fec8fc4d4bc8f805696fbffc08
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Feb 5 11:27:10 2006 -0800

     - (tim) [configure.ac] Remove unnecessary tests for net/if.h and
       netinet/in_systm.h. OK dtucker@.

commit 70335a6b5f54b9e9e2460cb22957c872d7eca5fb
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Feb 4 17:42:58 2006 -0800

     - (tim) [configure.ac] Bug #1149. Changes in QNX section only. Patch by
       kraai at ftbfs.org.

commit 0daad78fab0ff6b6b4064e3e7a5090d258d945a8
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Feb 4 17:33:55 2006 -0800

     - (tim) [configure.ac] Add AC_REVISION. Add sys/time.h to lastlog.h test
       for Solaris. OK dtucker@.

commit fd80ddcb2349e2ac28f4fc6f682c20c8d1dc06ad
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Feb 2 19:11:56 2006 -0800

     - (tim) [configure.ac] test for egrep (AC_PROG_EGREP) before first
       AC_CHECK_HEADERS test. Without it, if AC_CHECK_HEADERS is first run
       by a platform specific check, builtin standard includes tests will be
       skipped on the other platforms.
       Analysis and suggestion by vinschen at redhat.com, patch by dtucker@.
       OK tim@, djm@.

commit cc7c212830e3f5adabe1996e6b498f01e963cfee
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 2 18:44:19 2006 +1100

     - (dtucker) [configure.ac] Bug #1148: Fix "crippled AES" test so that it
       works with picky compilers.  Patch from alex.kiernan at thus.net.

commit bfd52192f3f6b2c836136019e07dbcbb56cc63a0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 1 22:32:17 2006 +1100

     - (djm) Release OpenSSH 4.3p1

commit c79824bbabd95f0cb8aae3ed33687e7459be55d5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 1 22:27:31 2006 +1100

       - markus@cvs.openbsd.org 2006/02/01 11:27:22
         [version.h]
         openssh 4.3

commit 0d689568a480b317b6149f679b3e0bd17bb0e5ff
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 1 22:10:47 2006 +1100

     - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Update versions ahead of release

commit 2ac05779f76c651928eba7899165a4dca02f7b8f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 1 22:05:42 2006 +1100

       - jmc@cvs.openbsd.org 2006/02/01 09:11:41
         [sshd.8]
         small tweak;

commit 8bbdf90f3333a148eb655993e47b0168d907693d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 1 22:05:25 2006 +1100

     - (djm) OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2006/02/01 09:06:50
         [sshd.8]
         - merge sections on protocols 1 and 2 into a single section
         - remove configuration file section
         ok markus

commit e682cb07803f71ec01e15394ac8445431cfda176
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 1 11:21:01 2006 +1100

     - (djm) [regress/test-exec.sh] Try 'logname' as well as 'whoami' to
       determine the user's login name - needed for regress tests on Solaris
       10 and OpenSolaris

commit 923f1ce0b779e59bb7c0cf46351b8a262964e7f3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 22:11:37 2006 +1100

       - djm@cvs.openbsd.org 2006/01/31 10:35:43
         [scp.c]
         "scp a b c" shouldn't clobber "c" when it is not a directory, report and
         fix from biorn@; ok markus@

commit 50c6eedce395ad0b828067c5e65ce9eb9e1543af
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 22:06:41 2006 +1100

       - djm@cvs.openbsd.org 2006/01/31 10:36:33
         [scp.sh]
         regress test for "scp a b c" where "c" is not a directory

commit 7410ad79f85a62361a6e40ac4ea11e6504408666
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 22:06:14 2006 +1100

       - djm@cvs.openbsd.org 2006/01/31 10:23:23
         [scp.sh]
         regression test for CVE-2006-0225 written by dtucker@

commit 0b996462f842e6b5a5d409ad4538e1779dd69bf6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 22:05:23 2006 +1100

       - djm@cvs.openbsd.org 2006/01/27 06:49:21
         [scp.sh]
         regress test for local to local scp copies; ok dtucker@

commit 15a815bb6476ddba55508b177773c9c99c6fe46e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 22:03:11 2006 +1100

       - dtucker@cvs.openbsd.org 2005/12/14 04:36:39
         [regress/scp-ssh-wrapper.sh]
         Fix assumption about how many args scp will pass; ok djm@
         NB. ID sync only, we already had this

commit 27a0dfaea9e4bcea6d434a5ea5363869dfe2f73a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 22:02:16 2006 +1100

       - grunk@cvs.openbsd.org 2005/11/14 21:25:56
         [regress/agent-getpeereid.sh]
         all other scripts in this dir use $SUDO, not 'sudo', so pull this even
         ok markus@

commit 10c5fa7e8766c332b1e04e95fc5d761ee2407214
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 22:01:42 2006 +1100

       - markus@cvs.openbsd.org 2005/06/30 11:02:37
         [regress/scp.sh]
         allow SUDO=sudo; from Alexander Bluhm

commit ec7b2f12f00cf0655d88dc543323621df2f36c64
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 21:59:35 2006 +1100

       - djm@cvs.openbsd.org 2005/05/24 04:10:54
         [regress/try-ciphers.sh]
         oops, new arcfour modes here too

commit 76be6b8765f88b72c354941b523efbefa14561fe
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 21:59:01 2006 +1100

       - djm@cvs.openbsd.org 2005/05/20 23:14:15
         [regress/test-exec.sh]
         force addressfamily=inet for tests, unbreaking dynamic-forward regress for
         recently committed nc SOCKS5 changes

commit f0cbb3d7cbaad8ac4fad999f4e98d69da510d0ef
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 21:58:23 2006 +1100

     - (djm) Sync regress tests to OpenBSD:
       - dtucker@cvs.openbsd.org 2005/03/10 10:20:39
         [regress/forwarding.sh]
         Regress test for ClearAllForwardings (bz #994); ok markus@

commit c34940c1f522b09ffe7086dea0253ebe5c104417
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 21:57:27 2006 +1100

       - dtucker@cvs.openbsd.org 2005/04/25 09:54:09
         [regress/multiplex.sh]
         Don't call cleanup in multiplex as test-exec will cleanup anyway
         found by tim@, ok djm@
         NB. ID sync only, we already had this

commit edaeff5b9dbb47d24597c1e65d250b7e98b0a20e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 21:56:24 2006 +1100

       - dtucker@cvs.openbsd.org 2005/03/10 10:20:39
         [regress/forwarding.sh]
         Regress test for ClearAllForwardings (bz #994); ok markus@

commit 3eec6b73a2c446225fce546d61d83cfc695fbaa0
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 21:49:27 2006 +1100

       - djm@cvs.openbsd.org 2006/01/31 10:19:02
         [misc.c misc.h scp.c sftp.c]
         fix local arbitrary command execution vulnerability on local/local and
         remote/remote copies (CVE-2006-0225, bz #1094), patch by
         t8m AT centrum.cz, polished by dtucker@ and myself; ok markus@

commit b5dd55cccc7096d3db59378bba44920183f34110
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 21:47:58 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/30 13:37:49
         [ssh.1]
         remove an incorrect sentence;
         reported by roumen petrov;
         ok djm markus

commit e204f6aa0dc399dfb709f3def13b9c4f8ab35357
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 21:47:15 2006 +1100

       - reyk@cvs.openbsd.org 2006/01/30 12:22:22
         [channels.c]
         mark channel as write failed or dead instead of read failed on error
         of the channel output filter.
         ok markus@

commit bbc59094b95aee8456918c35a8138179d34008a1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 21:46:51 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/26 08:47:56
         [ssh.1]
         add a section on verifying host keys in dns;
         written with a lot of help from jakob;
         feedback dtucker/markus;
         ok markus

commit 7602cba59d11822c51346b44c043a39ef2fe608a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 21:46:20 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/25 09:07:22
         [sshd.8]
         move subsections to full sections;

commit 99cc4a8f1e4e1ab45e41600518aa888e24b4df64
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 21:45:53 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/25 09:04:34
         [sshd.8]
         move the options description up the page, and a few additional tweaks
         whilst in here;
         ok markus

commit ddfddf1ba3f767c27b8a57d0d70648ce925609a4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 31 21:39:03 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/20 11:21:45
         [ssh_config.5]
         - word change, agreed w/ markus
         - consistency fixes

commit fbea76400f557cb4ec6a7c97c92f895d8d0929a7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 30 00:22:39 2006 +1100

     - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the
       opensshd.init script interpretter if /sbin/sh does not exist.  ok tim@

commit 1d4ebbf14331f410d6757640ed02ea6396949802
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jan 29 16:46:13 2006 +1100

    Correct format in debug message

commit 62388b2b63394c6a6ee44271426a13de5e0ce827
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 20 11:31:47 2006 +1100

       - dtucker@cvs.openbsd.org 2006/01/20 00:14:55
         [scp.1 ssh.1 ssh_config.5 sftp.1]
         Document RekeyLimit.  Based on patch from jan.iven at cern.ch from mindrot
         #1056 with feedback from jmc, djm and markus; ok jmc@ djm@

commit 248dd13c4686bcf1c1b29533a7f5c2e4264083cf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 20 11:30:58 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/18 10:53:29
         [ssh.1]
         add a section on ssh-based vpn, based on reyk's README.tun;

commit 94299ec251c84fb07329f3322cd5d6390d70eb7d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 20 11:30:14 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/15 17:37:05
         [ssh.1]
         correction from deraadt

commit 4a8dc9e2974063b51da3c5c9e6732f64362a783a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 14 10:10:31 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/12 22:34:12
         [ssh.1]
         back out a sentence - AUTHENTICATION already documents this;

commit e9d001e02b55f065b7a16d3e2b3d041d32ee9176
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 14 10:10:17 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/12 22:26:02
         [ssh_config.5]
         refer to TCP forwarding, rather than TCP/IP forwarding;

commit 7c24b81699c9b45f277ccefa5523e1a8d64a98a5
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 14 10:09:56 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/12 22:20:00
         [sshd.8]
         refer to TCP forwarding, rather than TCP/IP forwarding;

commit 8bfaf93f607ab97ed09a9247bbf23ca82ffcf75e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 14 10:09:30 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/12 18:48:48
         [ssh.1]
         refer to `TCP' rather than `TCP/IP' in the context of connection
         forwarding;
         ok markus

commit f31771810cf89a3e687112e71264be266012b2de
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 14 10:09:13 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/12 14:44:12
         [ssh.1]
         split sections on tcp and x11 forwarding into two sections.
         add an example in the tcp section, based on sth i wrote for ssh faq;
         help + ok: djm markus dtucker

commit 7e76e1f101cf672df9ca1822f2a04cb4289df519
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 14 10:08:57 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/06 13:29:10
         [ssh.1]
         final round of whacking FILES for duplicate info, and some consistency
         fixes;
         ok djm

commit e87eb4ce3ce4711b94a72d729352c240047f17c1
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 14 10:08:36 2006 +1100

     - (djm) OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2006/01/06 13:27:32
         [ssh.1]
         weed out some duplicate info in the known_hosts FILES entries;
         ok djm

commit e78c6ce8cfe5a31db0090f91728d3b14e9875cd5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 10 00:02:44 2006 +1100

     - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on
       tcpip service so it's always started after IP is up.  Patch from
       vinschen at redhat.com.

commit 72c5b7d85d06d6f71960ff00e780b87ca9d33d78
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 6 14:50:44 2006 +1100

       - djm@cvs.openbsd.org 2006/01/05 23:43:53
         [misc.c]
         check that stdio file descriptors are actually closed before clobbering
         them in sanitise_stdfd(). problems occurred when a lower numbered fd was
         closed, but higher ones weren't. spotted by, and patch tested by
         Frédéric Olivié

commit c27f83a63c818b04f957a3225d6781526084c481
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 6 14:50:26 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/04 19:50:09
         [ssh.1]
         -.Xr gzip 1 ,

commit 128a0f114d2c0db4e4e94f055f591e79708f9990
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 6 14:50:11 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/04 19:40:24
         [ssh.1]
         +.Xr ssh-keyscan 1 ,

commit a246d3b9b25d2b0ea3f71972e11553fd7b70517f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 6 14:49:54 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/04 18:45:01
         [ssh.1]
         remove .Xr's to rsh(1) and telnet(1): they are hardly needed;

commit 1bcdb50a3dd315178ad889070d0313e3a3e5ff04
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 6 14:49:38 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/04 18:42:46
         [ssh.1]
         chop out some duplication in the .{r,s}hosts/{h,sh}osts.equiv FILES
         entries;
         ok markus

commit 4c102eede39e71cf6a32b9cca6149ed67f6178aa
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 6 14:49:17 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/03 16:55:18
         [ssh.1]
         tweak the description of ~/.ssh/environment

commit fb8ea74116bebb5cf68b1c346604895bd16c45e5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 6 14:48:52 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/03 16:52:36
         [ssh.1]
         put FILES in some sort of order: sort by pathname

commit 6aa2290b0c57fb35125c03e99cfc017ee4730df9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 6 14:48:34 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/03 16:35:30
         [ssh.1]
         use a larger width for the ENVIRONMENT list;

commit 7655f5cd9fe856bb833de92521d415b66bf4d5d4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 6 14:48:18 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/03 16:31:10
         [ssh.1]
         move FILES to a -compact list, and make each files an item in that list.
         this avoids nastly line wrap when we have long pathnames, and treats
         each file as a separate item;
         remove the .Pa too, since it is useless.

commit a969437645550a8f7595ba017c7658c4341d77d1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 4 07:27:50 2006 +1100

     - (djm) [channels.c] clean up harmless merge error, from reyk@

commit b797770da28c07a10b51528f79af3bacae2ff613
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 3 18:47:31 2006 +1100

     - (djm) OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2006/01/02 17:09:49
         [ssh_config.5 sshd_config.5]
         some corrections from michael knudsen;

commit a07a59188a5a236c0fb8ef3fb8188ca3d6227458
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 2 23:41:37 2006 +1100

       - jmc@cvs.openbsd.org 2006/01/02 12:31:06
         [ssh.1]
         start to cut some duplicate info from FILES;
         help/ok djm

commit a1d9a18e142d05cb8cfe10dc7abf253f1e2c6a5b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 2 23:41:21 2006 +1100

       - reyk@cvs.openbsd.org 2006/01/02 07:53:44
         [misc.c]
         clarify tun(4) opening - set the mode and bring the interface up. also
         (re)sets the tun(4) layer 2 LINK0 flag for existing tunnel interfaces.
         suggested and ok by djm@

commit 5444618987402d50fb9c6c722919fe2d428d05bb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 2 23:40:50 2006 +1100

       - djm@cvs.openbsd.org 2006/01/02 01:20:31
         [sftp-client.c sftp-common.h sftp-server.c]
         use a common max. packet length, no binary change

commit a210d522355b9dfacfc4691f483ee18896bfe4b8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 2 23:40:30 2006 +1100

       - stevesk@cvs.openbsd.org 2006/01/01 10:08:48
         [misc.c]
         no trailing "\n" for debug()

commit 3beb852e09a1de1b6db0103b1c39e56f9dfeff09
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 2 23:40:10 2006 +1100

       - stevesk@cvs.openbsd.org 2006/01/01 08:59:27
         [includes.h misc.c]
         move <net/if.h>; ok djm@

commit 1164c299f15ecf424960d9dbebe71c19c3cf4b53
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 2 23:38:37 2006 +1100

       - jmc@cvs.openbsd.org 2005/12/31 13:45:19
         [ssh.1]
         .Nm does not require an argument;

commit 14af93ee770f90a15ace4fb4f15506ffee75fe17
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 2 23:38:21 2006 +1100

       - jmc@cvs.openbsd.org 2005/12/31 13:44:04
         [ssh.1]
         clean up ENVIRONMENT a little;

commit 48c94abf5b4d262ce4572c5b26d0ffdff8d25a87
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 2 23:38:00 2006 +1100

     - (djm) OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2005/12/31 10:46:17
         [ssh.1]
         merge the "LOGIN SESSION AND REMOTE EXECUTION" and "SERVER
         AUTHENTICATION" sections into "AUTHENTICATION";
         some rewording done to make the text read better, plus some
         improvements from djm;
         ok djm

commit 90cd1c549b4e6be1c5a664ca4d4646a3d3768c2f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 2 20:23:18 2006 +1100

     - (djm) [README.tun] Add README.tun, missed during sync of tun(4) support

commit 5df52e89b4d83f4f56eba73f5d37ed5a6fc64c08
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 1 21:15:50 2006 +1100

     - (djm) [openbsd-compat/port-tun.c] Linux needs linux/if.h too

commit bd4e4108179939db5c5fc117fed828996c1a62b6
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 1 21:03:30 2006 +1100

     - (djm) [configure.ac] Fix linux/if_tun.h test

commit 2dcddbfaf6b68bd58b5b1422ebeef7767c0c2633
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 1 19:47:05 2006 +1100

     - (djm) [Makefile.in configure.ac includes.h misc.c]
             [openbsd-compat/port-tun.c openbsd-compat/port-tun.h] Add support
             for tunnel forwarding for FreeBSD and NetBSD. NetBSD's support is
             limited to IPv4 tunnels only, and most versions don't support the
             tap(4) device at all.

commit c4bcc917519e55f449044e558228a2e11b80740c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 31 17:05:58 2005 +1100

     - (djm) [configure.ac] oops, make that linux/if_tun.h

commit 89e03bae5c7390019d66e1ff9a550b3b53150476
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 31 16:42:03 2005 +1100

     - (djm) [configure.ac] Disable Linux tun(4) compat code if linux/tun.h does
       not exist

commit 598bbc2d8fd5025ad16f5d9ee71db4e0bf872cd2
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 31 16:33:36 2005 +1100

     - (djm) [openbsd-compat/port-tun.c openbsd-compat/port-tun.h configure.ac]
       [serverloop.c ssh.c openbsd-compat/Makefile.in]
       [openbsd-compat/openbsd-compat.h] Implement tun(4) forwarding
       compatability support for Linux, diff from reyk@

commit 88b25524b885885896e23e01e1aa873864ca7386
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 31 16:23:15 2005 +1100

       - stevesk@cvs.openbsd.org 2005/12/31 01:38:45
         [ssh.1]
         document -MM; ok djm@

commit 134eb81383dab4b7f87e45c3c52172cc139f347c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 31 16:22:55 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/30 16:59:00
         [sftp.1]
         do not suggest that interactive authentication will work
         with the -b flag;
         based on a diff from john l. scarfone;
         ok djm

commit 077b23864f567551dc7147db8ccd69559617976e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 31 16:22:32 2005 +1100

       - reyk@cvs.openbsd.org 2005/12/30 15:56:37
         [channels.c channels.h clientloop.c]
         add channel output filter interface.
         ok djm@, suggested by markus@

commit 5eb137c6d11be7db14dc03ea12a74884bebea3e3
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 31 16:19:53 2005 +1100

     - (djm) OpenBSD CVS Sync
       - stevesk@cvs.openbsd.org 2005/12/28 22:46:06
         [canohost.c channels.c clientloop.c]
         use 'break-in' for consistency; ok deraadt@ ok and input jmc@

commit 8db70e2398ff1830e18533a75c6e8e5fa98a78e2
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Dec 28 14:28:08 2005 -0800

     (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd

commit 7bff1a9b5e6a0958ebc8201542eb6d359d987a1e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 24 14:59:12 2005 +1100

       - djm@cvs.openbsd.org 2005/12/24 02:27:41
         [session.c sshd.c]
         eliminate some code duplicated in privsep and non-privsep paths, and
         explicitly clear SIGALRM handler; "groovy" deraadt@

commit 35978210462d089a53a3e4764b8fb21e1963acba
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 24 14:56:47 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/23 23:46:23
         [ssh.1]
         less mark up for -c;

commit 2142ba0769a2ddd69bcde786a78e83045216acae
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 24 14:56:29 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/23 14:55:53
         [ssh.1]
         - sync the description of -e w/ synopsis
         - simplify the description of -I
         - note that -I is only available if support compiled in, and that it
         isn't by default
         feedback/ok djm@

commit cf1e342c6c10dc216ce165684bca058377c3b7e6
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 24 14:56:04 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/22 11:23:42
         [ssh.1]
         expand the description of -w somewhat;
         help/ok reyk

commit e8cd741929796ef87ee61eb27ae7149ed7cbe1bb
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 24 14:55:47 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/22 10:31:40
         [ssh_config.5]
         put the description of "UsePrivilegedPort" in the correct place;

commit d7f308f6d8b3583d8c97fa71cfb9b10f07ee5418
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 24 14:55:16 2005 +1100

       - stevesk@cvs.openbsd.org 2005/12/21 22:44:26
         [sshd.8]
         clarify precedence of -p, Port, ListenAddress; ok and help jmc@

commit 1530f2431ce107abc29f1926badf84a28bb43b86
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 24 14:54:03 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/21 12:53:31
         [ssh.1]
         -Y does X11 forwarding too;
         ok markus

commit 9a765b22b78d3e2d3102db094bc08a3ad33436bb
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 24 14:53:44 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/21 11:57:25
         [ssh.1]
         options now described `above', rather than `later';

commit 329cb016386a7e5eaa839fc34e6e53c9428e76db
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 24 14:53:23 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/21 11:48:16
         [ssh.1]
         -L and -R descriptions are now above, not below, ~C description;

commit e9b333a54494fbc51b76e6877d52ecb2ef8845fa
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 24 14:53:04 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/20 22:09:41
         [ssh.1]
         move info on ssh return values and config files up into the main
         description;

commit 52d2061ab09517e31d4a7cb548bd05e7b232647c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 24 14:52:36 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/20 22:02:50
         [ssh.1]
         .Ss -> .Sh: subsections have not made this page more readable

commit c93a813802cc2a339bcf1dc41c60878a5b1c0373
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 24 14:52:13 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/20 21:59:43
         [ssh.1]
         merge the sections on protocols 1 and 2 into one section on
         authentication;
         feedback djm dtucker
         ok deraadt markus dtucker

commit e9a9b71c6b7927ea0f875cde42dffc1f4b195011
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 20 16:15:51 2005 +1100

       - dtucker@cvs.openbsd.org 2005/12/20 04:41:07
         [ssh.c]
         exit(255) on error to match description in ssh(1); bz #1137; ok deraadt@

commit 7eba820ca7e989ab723d87af630677ac892084ca
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 20 16:15:14 2005 +1100

       - stevesk@cvs.openbsd.org 2005/12/17 21:36:42
         [ssh_config.5]
         spelling: intented -> intended

commit 635518705a419c9e5e85eaa715c607846895aacd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 20 16:14:15 2005 +1100

       - stevesk@cvs.openbsd.org 2005/12/17 21:13:05
         [ssh_config.5 session.c]
         spelling: fowarding, fowarded

commit 5652924ad9f3ebfb4691ef9893e154f5cd64de8d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 20 16:12:24 2005 +1100

    missed changelog entry

commit 5434cfe3680541727dc7b89426ffb329a5141495
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 20 16:11:35 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/16 18:14:40
         [ssh.1]
         signpost the protocol sections;

commit ff9f484f45e919b54ec27f64f87c90627f100238
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 20 16:10:45 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/16 18:12:22
         [ssh.1]
         make the description of -c a little nicer;

commit b18c867c9d638589e9dc20bd52b32aac4f43d8dc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 20 16:10:09 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/16 18:08:53
         [ssh.1]
         simplify a sentence;

commit d3877b995ac0e1245c70e520cc986aac99c901be
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 20 16:09:36 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/16 18:07:08
         [ssh.1]
         move the option descriptions up the page: start of a restructure;
         ok markus deraadt

commit 0d0e8f0173bd10a8a2325fbb3ef83e04a91abdcc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 20 16:08:42 2005 +1100

     - (dtucker) OpenBSD CVS Sync
       - reyk@cvs.openbsd.org 2005/12/13 15:03:02
         [serverloop.c]
         if forced_tun_device is not set, it is -1 and not SSH_TUNID_ANY

commit 129d0bb6a65dcd9639e841cc3fd2ef3490420d7b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 19 17:40:40 2005 +1100

     - (dtucker) [cipher-aes.c cipher-ctr.c cipher.c configure.ac
       openbsd-compat/openssl-compat.h] Check for and work around broken AES
       ciphers >128bit on (some) Solaris 10 systems.  ok djm@

commit d40c66cf3f5d7713ea9489778dc450a48984a81d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Dec 17 22:32:03 2005 +1100

     - (dtucker) [configure.ac openbsd-compat/bsd-snprintf.c] Bug #1133: Our
       snprintf replacement can have a conflicting declaration in HP-UX's system
       headers (const vs. no const) so we now check for and work around it.  Patch
       from the dynamic duo of David Leonard and Ted Percival.

commit 98cfc4ce9d2a6f34b63f1354f3149b501398a160
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Dec 17 22:04:08 2005 +1100

     - (dtucker) [defines.h] HP-UX system headers define "YES" and "NO" which
       scp.c also uses, so undef them here.

commit 3154358d66c99636021e7f1b9555064d9cc38e00
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Dec 14 15:39:20 2005 +1100

       - dtucker@cvs.openbsd.org 2005/12/30 04:36:39
         [regress/scp-ssh-wrapper.sh]
         Fix assumption about how many args scp will pass; ok djm@

commit 62a31c9fd06506ab976a4dc2050882f29ab24693
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 13 20:44:13 2005 +1100

     - (djm) [misc.c] Disable tunnel code for non-OpenBSD (for now), enable
       again by providing a sys_tun_open() function for your platform and
       setting the CUSTOM_SYS_TUN_OPEN define. More work is required to match
       OpenBSD's tunnel protocol, which prepends the address family to the
       packet

commit d47c62a714c2c3e6a564aa498e3ef0445c9f9ea3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 13 19:33:57 2005 +1100

       - markus@cvs.openbsd.org 2005/12/12 13:46:18
         [channels.c channels.h session.c]
         make sure protocol messages for internal channels are ignored.
         allow adjust messages for non-open channels; with and ok djm@

commit 7746c391b105dd9b1a348b816ca0150bf701e1e2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 13 19:33:37 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/08 21:37:50
         [ssh_config.5]
         new sentence, new line;

commit 7b58e800364870d05630514945687d2f26e3c065
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 13 19:33:19 2005 +1100

       - reyk@cvs.openbsd.org 2005/12/08 18:34:11
         [auth-options.c includes.h misc.c misc.h readconf.c servconf.c]
         [serverloop.c ssh.c ssh_config.5 sshd_config.5 configure.ac]
         two changes to the new ssh tunnel support. this breaks compatibility
         with the initial commit but is required for a portable approach.
         - make the tunnel id u_int and platform friendly, use predefined types.
         - support configuration of layer 2 (ethernet) or layer 3
         (point-to-point, default) modes. configuration is done using the
         Tunnel (yes|point-to-point|ethernet|no) option is ssh_config(5) and
         restricted by the PermitTunnel (yes|point-to-point|ethernet|no) option
         in sshd_config(5).
         ok djm@, man page bits by jmc@

commit 957d4e430ed40265cffc483abdc5b0e6a58c69ed
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 13 19:30:45 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/08 15:06:29
         [ssh_config.5]
         keep options in order;

commit 4b2319fb85203fa07a90c9b36560a77080feb2ad
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 13 19:30:27 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/08 14:59:44
         [ssh.1 ssh_config.5]
         make `!command' a little clearer;
         ok reyk

commit f0c8c15322fcb26911f9552e696810c3639f7341
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 13 19:29:58 2005 +1100

       - jmc@cvs.openbsd.org 2005/12/07 10:52:13
         [ssh.1]
         - avoid line split in SYNOPSIS
         - add args to -w
         - kill trailing whitespace

commit aeb31d6120681f42ad1b91adc5352159a6a5d345
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 13 19:29:36 2005 +1100

       - djm@cvs.openbsd.org 2005/12/07 03:52:22
         [clientloop.c]
         reyk forgot to compile with -Werror (missing header)

commit d27b947178df3689bfb7fdfb62a5f1337ef73481
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 13 19:29:02 2005 +1100

       - reyk@cvs.openbsd.org 2005/12/06 22:38:28
         [auth-options.c auth-options.h channels.c channels.h clientloop.c]
         [misc.c misc.h readconf.c readconf.h scp.c servconf.c servconf.h]
         [serverloop.c sftp.c ssh.1 ssh.c ssh_config ssh_config.5 sshconnect.c]
         [sshconnect.h sshd.8 sshd_config sshd_config.5]
         Add support for tun(4) forwarding over OpenSSH, based on an idea and
         initial channel code bits by markus@. This is a simple and easy way to
         use OpenSSH for ad hoc virtual private network connections, e.g.
         administrative tunnels or secure wireless access. It's based on a new
         ssh channel and works similar to the existing TCP forwarding support,
         except that it depends on the tun(4) network interface on both ends of
         the connection for layer 2 or layer 3 tunneling. This diff also adds
         support for LocalCommand in the ssh(1) client.
    
         ok djm@, markus@, jmc@ (manpages), tested and discussed with others

commit 6dbdb6afeec1820b2799c2693fc8e8b364be8228
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 13 19:25:43 2005 +1100

       - jmc@cvs.openbsd.org 2005/11/30 11:45:20
         [ssh.1]
         avoid ambiguities in describing TZ;
         ok djm@

commit c94ebbc723234b7246cfbdcc78f1ca0b36743211
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 13 19:25:21 2005 +1100

     - (djm) OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2005/11/30 11:18:27
         [ssh.1]
         timezone -> time zone

commit 1bbbf24f4cdcc4e54331541efa1029903123acd9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Dec 1 22:21:04 2005 +1100

    Bump release note URL

commit 7677be5d6cc4ade7dad11437fdc07ab78b7733d9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 1 12:51:59 2005 +1100

     - (djm) [envpass.sh] Remove regress script that was accidentally committed
       in top level directory and not noticed for over a year :)

commit 46259d86a22512f9c53da031d7b829f45720f011
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Nov 28 18:40:34 2005 -0800

     - (tim) [configure.ac sshd.8] Enable locked account check (a "*LK*" string)
       for UnixWare.

commit 3af2ac56a28dd49226388505b5ebbfc778335f9c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 29 13:10:24 2005 +1100

       - dtucker@cvs.openbsd.org 2005/11/29 02:04:55
         [ssh-keygen.c]
         Populate default key sizes before checking them; from & ok tim@

commit 660c3405f95fa3f1169cbeaba2bc74a37bcbea9e
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Nov 28 17:45:32 2005 -0800

     - (tim) [ssh-keygen.c] Move DSA length test after setting default when
       bits == 0.

commit ac0c8a533d7b79f8404f904a05655e48aa792a45
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 28 22:28:59 2005 +1100

     - (dtucker) [includes.h] Bug #1122: __USE_GNU is a glibc internal macro, use
       _GNU_SOURCE instead.  Patch from t8m at centrum.cz.

commit 3a4634f67415ae6c69b97f042b284b8d98955f97
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 28 17:05:40 2005 +1100

       - dtucker@cvs.openbsd.org 2005/11/28 06:02:56
         [ssh-agent.1]
         Update agent socket path templates to reflect reality, correct xref for
         time formats.  bz#1121, patch from openssh at roumenpetrov.info, ok djm@

commit 9f647335d21daf0bf23257e47be98b3e18219b63
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 28 16:41:46 2005 +1100

         [ssh-keygen.1 ssh-keygen.c]
         Enforce DSA key length of exactly 1024 bits to comply with FIPS-186-2,
         increase minumum RSA key size to 768 bits and update man page to reflect
         these.  Patch originally bz#1119 (senthilkumar_sen at hotpop.com),
         ok djm@, grudging ok deraadt@.

commit b1a8777f3ac863890bb9d324866d1a78c42c6597
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 28 16:41:03 2005 +1100

     - (dtucker) [regress/yes-head.sh] Work around breakage caused by some
       versions of GNU head.  Based on patch from zappaman at buraphalinux.org

commit 91d25a0c4537ce7f43f78498a5fc767a4d6ab0b7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 26 22:24:09 2005 +1100

     - (dtucker) [configure.ac] Bug #1126: AIX 5.2 and 5.3 (and presumably newer,
       when they're available) need the real UID set otherwise pam_chauthtok will
       set ADMCHG after changing the password, forcing the user to change it
       again immediately.

commit e0be30426a18f3c8038f98cdb10171200b134d60
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 25 14:44:55 2005 +1100

     - (dtucker) [progressmeter.c scp.c sftp-server.c] Use correct casts for
       snprintf formats, fixes warnings on some 64 bit platforms.  Patch from
       shaw at vranix.com, ok djm@

commit 58e298d11b8752062c21b693126e4206458bdad8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 25 13:14:58 2005 +1100

     - (dtucker) [configure.ac] Apply tim's fix for older systems where the
       resolver state in resolv.h is "state" not "__res_state".  With slight
       modification by me to also work on old AIXes.  ok djm@

commit faec5ca73f27d4fe5a0d6c2075de8031160037b0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 24 23:18:54 2005 +1100

     - (dtucker) [regress/test-exec.sh] Use 1024 bit keys since we generate so
       many and use them only once.  Speeds up testing on older/slower hardware.

commit 79d09fad52f8a645c26220ece978e156df2021c4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 24 22:34:54 2005 +1100

     - (dtucker) [configure.ac] Fix typos in comments and AC_SEARCH_LIB argument
       order in Reliant Unix block.  Patch from johane at lysator.liu.se.

commit 57f3915b5513495b11e7052df0260c7896b7b612
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 24 19:58:19 2005 +1100

     - (djm) [configure.ac openbsd-compat/Makefile.in openbsd-compat/bsd-asprintf.c
       openbsd-compat/bsd-snprintf.c openbsd-compat/openbsd-compat.h] Add an
       asprintf() implementation, after syncing our {v,}snprintf() implementation
       with some extra fixes from Samba's version. With help and debugging from
       dtucker and tim; ok dtucker@

commit efc17470e0548dae4b6ffc34370ad15562d83239
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 22 19:55:13 2005 +1100

     - (dtucker) [loginrec.c] Add casts to prevent compiler warnings, patch
       from shaw at vranix.com.

commit 593bae7e10e61c41b73c5939e2f045e93ccd605e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 22 19:43:26 2005 +1100

       - dtucker@cvs.openbsd.org 2005/11/22 03:36:03
         [hostfile.c]
         Correct format/arguments to debug call; spotted by shaw at vranix.com
         ok djm@

commit f4732f647572f40d93f4fbd1e65d744ed10b2620
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 22 19:42:42 2005 +1100

       - dtucker@cvs.openbsd.org 2005/11/21 09:42:10
         [auth-krb5.c]
         Perform Kerberos calls even for invalid users to prevent leaking
         information about account validity.  bz #975, patch originally from
         Senthil Kumar, sanity checked by Simon Wilkinson, tested by djm@, biorn@,
         ok markus@

commit e8400da9d53700872c9dea6b9d52af98c59022b9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 22 19:41:33 2005 +1100

       - millert@cvs.openbsd.org 2005/11/15 11:59:54
         [includes.h]
         Include sys/queue.h explicitly instead of assuming some other header
         will pull it in.  At the moment it gets pulled in by sys/select.h
         (which ssh has no business including) via event.h.  OK markus@
         (ID sync only in -portable)

commit 33f86bc2843b23c89f1b40e4250ced5b84e4c141
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 22 19:38:06 2005 +1100

       - deraadt@cvs.openbsd.org 2005/11/12 18:38:15
         [scp.c]
         avoid close(-1), as in rcp; ok cloder

commit b736d8d8292cd2222e6ad37518d562026d87f1dd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 22 19:37:08 2005 +1100

       - deraadt@cvs.openbsd.org 2005/11/12 18:37:59
         [ssh-add.c]
         space

commit 4123636471185c739a3d03c763cebee2661f8c2d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Nov 20 14:09:59 2005 +1100

     - (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what
       is going on.

commit cb6ecdea6c56c21da4b9ba0612ce4a035ffe6417
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 12 21:30:07 2005 +1100

     - (dtucker) [regress/reconfigure.sh] Fix potential race in the reconfigure
       test: if sshd takes too long to reconfigure the subsequent connection will
       fail.  Zap pidfile before HUPing sshd which will rewrite it when it's ready.

commit 5bfe1687dd85151649584aaaaf9bd85b67c9b61a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 12 18:42:36 2005 +1100

     - (dtucker) [configure.ac] Remove duplicate utimes() check.  ok djm@

commit 3f9545ee67d66cad8cf40c3afbccc71d59b062da
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 12 15:20:52 2005 +1100

     - (dtucker) [configure.ac] Use "$AWK" instead of "awk" in gcc version test.

commit 5a0bdf770cd3df4c39f832b997c223a3e7df1fd2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 12 14:28:05 2005 +1100

     - (dtucker) [openbsd-compat/{realpath.c,stroll.c,rresvport.c}] $OpenBSD tag.

commit 7cb2a78ae2657fa85f9996f63b053d036531331e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 12 14:14:52 2005 +1100

     - (dtucker) [openbsd-compat/realpath.c] Sync $OpenBSD tag.

commit 16fd99c72702049030901b15a158a2159fe8f428
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 12 14:06:29 2005 +1100

     - (dtucker) [openbsd-compat/getrrsetbyname.c] Restore Portable-specific
       ifdef lost during sync.  Spotted by tim@.

commit f032435de7849ae80aa53df8028902711889a414
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 21:30:36 2005 +1100

    - (dtucker) [configure.ac] Try to get the gcc version number in a way that
       doesn't change between versions, and use a safer default.

commit 9d30d1392289645b5275646bf63b42cc17ef0cac
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 19:43:48 2005 +1100

     - (dtucker) [openbsd-compat/sigact.h] Update from OpenBSD 1.2 -> 1.3.
       Id and copyright sync only, there were no substantial changes we need.

commit 581203438f61ea238b1c01173c135b7a547ae055
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 19:31:37 2005 +1100

    typo

commit ce1cb1f160506b5f96dd3403be988b9b5e9651e9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 19:31:08 2005 +1100

     - (dtucker) [openbsd-compat/bsd-closefrom.c openbsd-compat/base64.c]
       -Wall fixes from djm.

commit 30d6974124fd54c5bd9f101d9e31291fc9eda1b9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 19:29:12 2005 +1100

     - (dtucker) [openbsd-compat/sigact.c] Update from OpenBSD 1.3 -> 1.4.
       Id and copyright sync only, there were no substantial changes we need.

commit fe80d7a0683d5e8e55a9cb057f9271f9a5b883c5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:54:46 2005 +1100

     - (dtucker) [openbsd-compat/bindresvport.c] Update from OpenBSD 1.16 -> 1.17.

commit 6f15c07ce33cb621e08fa43b16576236a961e989
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:52:08 2005 +1100

     - (dtucker) [openbsd-compat/bindresvport.c] Add "OPENBSD ORIGINAL" marker.

commit 91b34dc18373cd403a8e25ca5ca69cddb2486edc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:42:40 2005 +1100

     - (dtucker) [openbsd-compat/rresvport.c] Update from OpenBSD 1.6 -> 1.8.

commit ffcd0ecf6be104caec2dbaf27460a11eb425cf52
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:37:02 2005 +1100

     - (dtucker) [openbsd-compat/mktemp.c] Update from OpenBSD 1.17 -> 1.19.

commit 8f0d8f8ea2a902c58b19d596c22999db61cf39d2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:33:00 2005 +1100

     - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.10 -> 1.13.

commit 4e8c2490bbb87345abc44995b448f5c59a939788
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:28:35 2005 +1100

     - (dtucker) [openbsd-compat/strsep.c] Update from OpenBSD 1.5 -> 1.6.

commit b10b49768234f02343c7ae6a95ebc33279d04ea2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:27:25 2005 +1100

     - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.5 -> 1.6.

commit 2864039a7ceebbda6fb3e0d99b891c04eb1324bd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:25:26 2005 +1100

     - (dtucker) [openbsd-compat/inet_ntop.c] Update from OpenBSD 1.5 -> 1.7.

commit de9d623960b6e5562a73600b225d82c2497dfc58
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:23:54 2005 +1100

     - (dtucker) [openbsd-compat/inet_nto.c] Update from OpenBSD 1.4 -> 1.6.

commit c7e05d679a8fdbc7cfa2eefb54f9fcb84ff715ae
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:21:21 2005 +1100

     - (dtucker) [openbsd-compat/inet_aton.c] Update from OpenBSD 1.7 -> 1.9.

commit 0a149d19d3ca291c33f449c304d4b0c5601c127a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:15:06 2005 +1100

     - (dtucker) [openbsd-compat/getcwd.c] Replace lstat with fstat to match up
       with OpenBSD code since we don't support platforms without fstat any more.

commit 31ba53e333458abda2337f5d3ded0205485bd355
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:11:29 2005 +1100

     - (dtucker) [openbsd-compat/getcwd.c] Update from OpenBSD 1.9 -> 1.14.

commit 50a221ba7ac156ce8b961d4f860886f4a5499cdf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:03:22 2005 +1100

     - (dtucker) [openbsd-compat/glob.h] Update from OpenBSD 1.8 -> 1.9.

commit 6524d4f161d0505af2926c34e19032e1fcd102fd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 17:02:21 2005 +1100

     - (dtucker) [openbsd-compat/glob.c] Update from OpenBSD 1.22 -> 1.25.

commit d76b4c74f808d356ac620fa18ee9e3c3ab75dd0c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 16:58:47 2005 +1100

     - (dtucker) [openbsd-compat/readpassphrase.h] Update from OpenBSD 1.3 -> 1.5.

commit dbb631cebe0108bae40ff73fd67f9873abed5cd5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 16:56:28 2005 +1100

     - (dtucker) [openbsd-compat/readpassphrase.c] Update from OpenBSD 1.16 -> 1.18.

commit f5ebfe9f68ab32adaa1d5ac3418eba838fed5f92
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 16:48:10 2005 +1100

     - (dtucker) [openbsd-compat/strtoul.c] Update from OpenBSD 1.5 -> 1.7.

commit f976e6f883879a3749d79dc64d3f8513095ee9e0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 16:46:26 2005 +1100

     - (dtucker) [openbsd-compat/strtoll.c] Update from OpenBSD 1.4 -> 1.5.
       Removal of rcsid.

commit ad1dada0b4c2d450346984c88e3bc74cdfe2a888
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 16:42:51 2005 +1100

     - (dtucker) [openbsd-compat/basename.c] Update from OpenBSD 1.11 -> 1.14.
       Removal of rcsid, will no longer strlcpy parts of the string.

commit 09471d8a1f7e46116ba44f0f08c756196dbf6c70
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 16:38:54 2005 +1100

     - (dtucker) [openbsd-compat/strmode.c] Update from OpenBSD 1.5 -> 1.7.
       Removal of rcsid, "whiteout" inode type.

commit 925d1de3fb44ef62f72589966ea9a2823b567762
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 16:31:55 2005 +1100

     - (dtucker) [openbsd-compat/sigact.h] Add "OPENBSD ORIGINAL" marker.

commit 52245663035ec7322ec2e1288d9692be7b2e4181
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 16:26:17 2005 +1100

     - (dtucker) [openbsd-compat/strlcpy.c] Update from OpenBSD 1.8 -> 1.10.

commit 7f24a0e64774e6566242f44b0f06ab06607d0c97
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 16:18:56 2005 +1100

     - (dtucker) [openbsd-compat/{LOTS}] Move the "OPENBSD ORIGINAL" markers to
       after the copyright notices.  Having them at the top next to the CVSIDs
       guarantees a conflict for each and every sync.

commit 80c0d7eb885d244d4745b55a392ee07b03e41676
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 16:05:37 2005 +1100

     - (dtucker) [openbsd-compat/strlcat.c] Sync OpenBSD revs 1.11 - 1.12 (removal
       of "register").

commit e5a2b5288dea7f17373d97f4e81972de6935ae07
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 15:56:44 2005 +1100

     - (dtucker) [openbsd-compat/getgrouplist.c] Sync OpenBSD revs 1.10 - 1.2 (ANSI
       prototypes, removal of "register").

commit b0288098c9e9c4753e8e9537051eef4b7f417585
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 14:46:48 2005 +1100

     - (dtucker) [configure.ac] Disable pointer-sign warnings on gcc 4.0+
       since they're not useful right now.  Patch from djm@.

commit 618db97fe17c7249cef1b53ed1adc9582b10f7f4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 14:43:11 2005 +1100

     - (dtucker) [auth-krb5.c] Fix -Wsign-compare warning in non-Heimdal path.
       Patch from djm@.

commit 063ba7455fa6c726771fe0d8495544a38c29fa51
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 10:38:45 2005 +1100

     - (dtucker) [openbsd-compat/setenv.c] Sync changes from OpenBSD setenv.c
       revs 1.7 - 1.9.

commit 32b531067dbfaf1570faad9abadc359b1675e324
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 10:13:06 2005 +1100

     - (dtucker) [openbsd-compat/getenv.c] Make __findenv static, remove
       unnecessary prototype.

commit b8c89d14bbd6ea20e1ef785adcfd27d067009f3d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 10 10:10:10 2005 +1100

     - (dtucker) [openbsd-compat/getenv.c] Merge changes for __findenv from
       OpenBSD getenv.c revs 1.4 - 1.8 (ANSIfication of arguments, removal of
       "register").

commit 9b59ada7ca95a7ab42c49ae7b7cd6ff713b1bea0
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 16:56:52 2005 +1100

     - (djm) [openbsd-compat/getrrsetbyname.c] Sync to latest OpenBSD version,
       resolving memory leak bz#1111 reported by kremenek AT cs.stanford.edu;
       ok dtucker@

commit 3a38c5a856073672228b8033599e96fe749cb116
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 5 16:28:35 2005 +1100

     - (dtucker) [README.platform] Add PAM section.

commit 5fd8b02b440fac52cbf70c203fbfc716a3620074
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 16:04:36 2005 +1100

       - djm@cvs.openbsd.org 2005/11/05 05:01:15
         [bufaux.c]
         Fix leaks in error paths, bz #1109 and #1110 reported by kremenek AT
         cs.stanford.edu; ok dtucker@

commit 19bb3a57f88adc789d61964fcb8f50165026b322
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:19:35 2005 +1100

       - djm@cvs.openbsd.org 2005/11/04 05:15:59
         [kex.c kex.h kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c]
         remove hardcoded hash lengths in key exchange code, allowing
         implementation of KEX methods with different hashes (e.g. SHA-256);
         ok markus@ dtucker@ stevesk@

commit 24ecf612614d83622d9777349b4ecd21ee22bb2a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:16:52 2005 +1100

       - dtucker@cvs.openbsd.org 2005/11/03 13:38:29
         [canohost.c]
         Cache reverse lookups with and without DNS separately; ok markus@

commit 83d0d39d0e30d545d9caa94089b92739a479dff1
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:16:27 2005 +1100

       - jmc@cvs.openbsd.org 2005/10/31 19:55:25
         [ssh-keygen.1]
         grammar;

commit c7e2d3fa1049c13d33d043e15c524f19e2791586
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:16:12 2005 +1100

       - djm@cvs.openbsd.org 2005/10/31 11:48:29
         [serverloop.c]
         make sure we clean up wtmp, etc. file when we receive a SIGTERM,
         SIGINT or SIGQUIT when running without privilege separation (the
         normal privsep case is already OK). Patch mainly by dtucker@ and
         senthilkumar_sen AT hotpop.com; ok dtucker@

commit f14be5ce03b0a40857f381819436602fa67c4d75
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:15:49 2005 +1100

       - djm@cvs.openbsd.org 2005/10/31 11:12:49
         [ssh-keygen.1 ssh-keygen.c]
         generate a protocol 2 RSA key by default

commit 653b93be5d67a918419e63db34383aa3a552db12
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:15:23 2005 +1100

       - dtucker@cvs.openbsd.org 2005/10/31 06:15:04
         [sftp.c]
         Fix sorting with "ls -1" command. From Robert Tsai, "looks right" deraadt@

commit 788f212aed68781efe7aa80e625c5f8cd4d98100
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:14:59 2005 +1100

       - djm@cvs.openbsd.org 2005/10/30 08:52:18
         [clientloop.c packet.c serverloop.c session.c ssh-agent.c ssh-keygen.c]
         [ssh.c sshconnect.c sshconnect1.c sshd.c]
         no need to escape single quotes in comments, no binary change

commit 713de76f66d4a27134938ebf6836ef97471c128a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:13:49 2005 +1100

       - jmc@cvs.openbsd.org 2005/10/30 08:43:47
         [ssh_config.5]
         remove trailing whitespace;

commit 4d3fd54c91dae68ea2642387196015931ee83200
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:13:24 2005 +1100

       - dtucker@cvs.openbsd.org 2005/10/30 08:29:29
         [canohost.c sshd.c]
         Check for connections with IP options earlier and drop silently.  ok djm@

commit aa3bb1094011e640488e9f2ebd718a79960b147d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:12:59 2005 +1100

       - djm@cvs.openbsd.org 2005/10/30 04:03:24
         [ssh.c]
         fix misleading debug message; ok dtucker@

commit 4bbacb706b36e35f341d41a25ee0cfa6b37af047
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:12:28 2005 +1100

       - djm@cvs.openbsd.org 2005/10/30 04:01:03
         [ssh-keyscan.c]
         make ssh-keygen discard junk from server before SSH- ident, spotted by
         dave AT cirt.net; ok dtucker@

commit b3bfbb735583ed13d6141bba61bae0dc65fec291
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:11:48 2005 +1100

       - djm@cvs.openbsd.org 2005/10/30 01:23:19
         [ssh_config.5]
         mention control socket fallback behaviour, reported by
         tryponraj AT gmail.com

commit 319550a52b08a56eee54af494433bb9bca547d82
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:11:15 2005 +1100

       - stevesk@cvs.openbsd.org 2005/10/17 14:13:35
         [dns.c dns.h]
         more cleanups; ok jakob@

commit 7e8795d3082de5b0f86728b5ecceff56d69db491
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:10:42 2005 +1100

       - stevesk@cvs.openbsd.org 2005/10/17 14:01:28
         [dns.c]
         remove #ifdef LWRES; ok jakob@

commit 6571249074b1f1af37f51bdbcfb5c0e857903d14
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:09:27 2005 +1100

       - stevesk@cvs.openbsd.org 2005/10/17 13:45:05
         [dns.c]
         fix memory leaks from 2 sources:
             1) key_fingerprint_raw()
             2) malloc in dns_read_rdata()
         ok jakob@

commit c1af1d5f409f75420b421ec85749753071ee843e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:08:57 2005 +1100

       - stevesk@cvs.openbsd.org 2005/10/15 15:28:12
         [sshconnect.c]
         make external definition static; ok deraadt@

commit 0a0176e9f3853528c4a2af999fc58ad1fb2027a3
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:07:59 2005 +1100

       - stevesk@cvs.openbsd.org 2005/10/14 02:29:37
         [channels.c clientloop.c]
         free()->xfree(); ok djm@

commit 15d72a00a3cd922f284b8a779a955733f487450f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:07:33 2005 +1100

       - stevesk@cvs.openbsd.org 2005/10/14 02:17:59
         [ssh-keygen.c ssh.c sshconnect2.c]
         no trailing "\n" for log functions; ok djm@

commit 6fd6defbce4c03820b8070b106bfe52bf2bed60a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:07:05 2005 +1100

       - stevesk@cvs.openbsd.org 2005/10/13 22:24:31
         [auth2-gss.c gss-genr.c gss-serv.c monitor.c]
         KNF; ok djm@

commit 20afc24363eb4e88351d66792275ee9d4b1eaaa4
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:06:38 2005 +1100

       - stevesk@cvs.openbsd.org 2005/10/13 19:13:41
         [dns.c]
         unneeded #include, unused declaration, little knf; ok deraadt@

commit 5f916c8f6c0f2cd2dbe93927b289585d3d42f10d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:05:28 2005 +1100

       - stevesk@cvs.openbsd.org 2005/10/13 19:08:08
         [gss-serv-krb5.c gss-serv.c]
         unused declarations; ok deraadt@
         (id sync only for gss-serv-krb5.c)

commit 9fac26363961641cfb0ab7dd9bacc396f0b435de
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:03:48 2005 +1100

       - stevesk@cvs.openbsd.org 2005/10/13 14:20:37
         [gss-serv.c]
         spelling in comments

commit 5434eb2a69eb1b3a30bed5fce1a72f75cd7e2d4a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 15:03:24 2005 +1100

       - stevesk@cvs.openbsd.org 2005/10/13 14:03:01
         [auth2-gss.c gss-genr.c gss-serv.c]
         remove unneeded #includes; ok markus@

commit 5e7fd076f517e01cbab0549cbb43245f66c1ac70
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 14:53:39 2005 +1100

       - djm@cvs.openbsd.org 2005/10/11 23:37:37
         [channels.c]
         bz #1076 set SO_REUSEADDR on X11 forwarding listner sockets, preventing
         bind() failure when a previous connection's listeners are in TIME_WAIT,
         reported by plattner AT inf.ethz.ch; ok dtucker@

commit 39eda6eb6a8364e8df6779e71e0b434eaae3edd5
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 14:52:50 2005 +1100

       - djm@cvs.openbsd.org 2005/10/10 10:23:08
         [channels.c channels.h clientloop.c serverloop.c session.c]
         fix regression I introduced in 4.2: X11 forwardings initiated after
         a session has exited (e.g. "(sleep 5; xterm) &") would not start.
         bz #1086 reported by t8m AT centrum.cz; ok markus@ dtucker@

commit 3f54a9f5b7978e8e7085f86722bc2704f7fab2e2
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 5 14:52:18 2005 +1100

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2005/10/07 11:13:57
         [ssh-keygen.c]
         change DSA default back to 1024, as it's defined for 1024 bits only
         and this causes interop problems with other clients.  moreover,
         in order to improve the security of DSA you need to change more
         components of DSA key generation (e.g. the internal SHA1 hash);
         ok deraadt

commit d32e293c045025b80892e8b05285ca9617d83ef6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Nov 2 09:07:31 2005 +1100

     - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
       Reported by olavi at ipunplugged.com and antoine.brodin at laposte.net
       via FreeBSD.

commit 42308a43745ef51d51fb941d15554be0bf379b1f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 30 15:31:55 2005 +1100

     - (dtucker) [session.c] Bug #1045do not check /etc/nologin when PAM is
       enabled, instead allow PAM to handle it.  Note that on platforms using PAM,
       the pam_nologin module should be added to sshd's session stack in order to
       maintain exising behaviour.  Based on patch and discussion from t8m at
       centrum.cz, ok djm@

commit 88edf6255bbc6c0ba87239608bb9b80656391330
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 30 11:55:45 2005 +1100

     - (djm) [contrib/suse/openssh.spec contrib/suse/rc.
       sshd contrib/suse/sysconfig.ssh] Bug #1106: Updated SuSE spec and init
       files from imorgan AT nas.nasa.gov

commit a841dceb4c506fd21cd4278bd2dbf04fc4f13fc2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 25 18:55:00 2005 +1000

     - (dtucker) [contrib/cygwin/ssh-user-config] Remove duplicate yes/no
       prompt.  Patch from vinschen at redhat.com.

commit e73745543045070ac638a8f5a4c8e40de7f72958
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 25 18:52:31 2005 +1000

     - (dtucker) [configure.ac] Bug #1104: Tru64's printf family doesn't
       understand "%lld", even though the compiler has "long long", so handle
       it as a special case.  Patch tested by mcaskill.scott at epa.gov.
    
    (actually was included in previous commit)

commit 537f1ed7df2f52b88ac49177bd6af9cbbe381dc3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 25 18:38:33 2005 +1000

     - (dtucker) [configure.ac] Relocate LLONG_MAX calculation to after the
       sizeof(long long) checks, to make fixing bug #1104 easier (no changes
       yet).

commit 314d89e050fa43771379d05733464294ba2a9c4e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 17 23:29:23 2005 +1000

     - (dtucker) [configure.ac] Bug #1097: Fix configure for cross-compiling.
       /etc/default/login report and testing from aabaker at iee.org, corrections
       from tim@.

commit 9ac1a65acb80ac607eaabcba4c9ea4e0182d8a02
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Oct 9 11:40:03 2005 +1000

     - (dtucker) [configure.ac defines.h openbsd-compat/vis.{c,h}] Sync current
       versions from OpenBSD.  ok djm@

commit e04ec6fdfd1d5b71d18e2dd94d5a2aede8c45455
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 8 16:21:19 2005 +1000

     - (djm) [configure.ac] missing 'test' call for -with-Werror test

commit 1e6616bb14d2c97bcb85f0ffaf837e1dc698d7dc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Oct 8 12:07:01 2005 +1000

     - (dtucker) [configure.ac] Bug #1098: define $MAIL for HP-UX; report from
       brian.smith at agilent com.

commit ac7e630b855fa052ec6a3f68d9696b5e58465f41
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 6 01:39:58 2005 +1000

    typo

commit b18f15100a6b303734f22061d777352603a8968a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 5 23:02:16 2005 +1000

     - (dtucker) [configure.ac sshd.8] Enable locked account check (a prepended
       "*LOCKED*" string) for FreeBSD.  Patch jeremie at le-hen.org and
       senthilkumar_sen at hotpop.com.

commit 1f85dc703499a11d8154b0b9b1f58eb4f98d2609
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 20:14:18 2005 +1000

     - (dtucker) [regress/README.regress] Bug #989: Document limitation that scp
       is required in the system path for the multiplex test to work.

commit b0b12296f9c781e896fecbcab0ecd8223ecacc0a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 18:23:44 2005 +1000

       - dtucker@cvs.openbsd.org 2005/10/03 07:44:42
         [canohost.c]
         Relocate check_ip_options call to prevent logging of garbage for
         connections with IP options set.  bz#1092 from David Leonard,
         "looks good" deraadt@

commit 28e8e59b3560e364e9bee758b2e4b2f987683267
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 18:20:28 2005 +1000

       - jaredy@cvs.openbsd.org 2005/09/30 20:34:26
         [ssh-keyscan.1]
         deploy .An -nosplit; ok jmc

commit 45b01426431836396e11263692153a19de4c417b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 18:20:00 2005 +1000

       - djm@cvs.openbsd.org 2005/09/21 23:37:11
         [sshd.c]
         change label at markus@'s request

commit e2dd2d5baa8c411671f6356156a77181f8b0a05f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 18:19:06 2005 +1000

       - djm@cvs.openbsd.org 2005/09/21 23:36:54
         [sshd_config.5]
         aquire -> acquire, from stevesk@

commit 1e4308e6fa41a1436e64ff9faaa4174bf73fa166
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 18:18:40 2005 +1000

       - djm@cvs.openbsd.org 2005/09/19 23:31:31
         [ssh.1]
         spelling nit from stevesk@

commit 895d698515c12a4ef90746924c0804ac0f97f18e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 18:18:05 2005 +1000

       - jmc@cvs.openbsd.org 2005/09/19 15:42:44
         [ssh.c]
         update -D usage here too;

commit 05d4dfe38fe786a8e9fd675c8eeef7ab801443de
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 18:17:38 2005 +1000

       - jmc@cvs.openbsd.org 2005/09/19 15:38:27
         [ssh.1]
         some more .Bk/.Ek to avoid ugly line split;

commit 8813bbbca90dbba5dc9d7a970e4115cb49cf4255
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 18:17:02 2005 +1000

       - djm@cvs.openbsd.org 2005/09/19 11:48:10
         [gss-serv.c]
         typo

commit a2cdbda2de465c9f14984fb988fb1c679f69ea69
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 18:16:02 2005 +1000

       - djm@cvs.openbsd.org 2005/09/19 11:47:09
         [sshd.c]
         stop connection abort on rekey with delayed compression enabled when
         post-auth privsep is disabled (e.g. when root is logged in); ok dtucker@

commit c8d6421a645529a3c831dccc5d9d9e073de68657
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 18:13:42 2005 +1000

       - djm@cvs.openbsd.org 2005/09/19 11:37:34
         [ssh_config.5 ssh.1]
         mention ability to specify bind_address for DynamicForward and -D options;
         bz#1077 spotted by Haruyama Seigo

commit ce321d8a30a81222d11a4c27fd353804a9afecd3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 18:11:24 2005 +1000

       - djm@cvs.openbsd.org 2005/09/13 23:40:07
         [sshd.c ssh.c misc.h sftp.c ssh-keygen.c ssh-keysign.c sftp-server.c
         scp.c misc.c ssh-keyscan.c ssh-add.c ssh-agent.c]
         ensure that stdio fds are attached; ok deraadt@

commit d89dbf29ff288ac8ba1755d15f63d2bd58dcb71b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 18:05:26 2005 +1000

       - markus@cvs.openbsd.org 2005/09/09 19:18:05
         [clientloop.c]
         typo; from mark at mcs.vuw.ac.nz, bug #1082

commit d3d0fa15588c8515751eb5a29f105b30318e9441
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Oct 3 18:03:05 2005 +1000

       - markus@cvs.openbsd.org 2005/09/07 08:53:53
         [channels.c]
         enforce chanid != NULL; ok djm

commit d4f04ae2476dded8c3743b0b9152cfe023758236
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 30 10:23:21 2005 +1000

     - (dtucker) [monitor.c] Bug #1087: Send loginmsg to preauth privsep
       child during PAM account check without clearing it.  This restores the
       post-login warnings such as LDAP password expiry.  Patch from Tomas Mraz
       with help from several others.

commit 6e4221129e58d792ec14025af823f654b5898cd6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 30 09:55:49 2005 +1000

     - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype
       for strtoll.  Patch from o.flebbe at science-computing.de.

commit 372c8fbe9be87789106fb004ea684a65984712e9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 29 22:01:10 2005 +1000

     - (dtucker) [monitor_wrap.c] Remove duplicate definition of loginmsg
       introduced during sync.

commit 7b1e69584611837d58f2651ec4e90210e1b26afe
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Sep 28 22:33:27 2005 +1000

     - (dtucker) [auth-pam.c] Bug #1028: send final non-query messages from
       PAM via keyboard-interactive.  Patch tested by the folks at Vintela.

commit 46e7ba5d53b13787f56402910e0b8e8f5c2248b3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Sep 28 08:26:30 2005 +1000

     - (dtucker) [entropy.c] Use u_char for receiving RNG seed for consistency

commit c6f8219e0d4ee1f64fb7b4da88523c951a03c68a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 27 22:46:32 2005 +1000

     - (dtucker) [entropy.c entropy.h sshd.c] Pass RNG seed to the reexec'ed
       process when sshd relies on ssh-random-helper.  Should result in faster
       logins on systems without a real random device or prngd.  ok djm@

commit f1377bdeed3ca7268c6a5d3fa171a09df7be9064
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 27 19:50:25 2005 +1000

     - (dtucker) [entropy.c] Remove unnecessary tests for getuid and geteuid
       calls, since they can't possibly fail.  ok djm@

commit d3eff2bfa56dbb37dbb2ea25cf4804193411ba4f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 24 12:43:51 2005 +1000

     - (dtucker) [auth2.c] Move start_pam() calls out of if-else block to remove
       duplicate call.  ok djm@

commit 82171c66075254a6aedc0bde704b604da32c2ba4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 22 20:19:54 2005 +1000

     - (dtucker) [configure.ac] Fix help for --with-opensc; patch from skeleten at
       shillest.net.

commit c373a56343f0f70ef88db1848a3888e84b18bd33
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 22 20:15:08 2005 +1000

     - (dtucker) [configure.ac] Use -R linker flag for libedit too; patch from
       skeleten at shillest.net.

commit 542f62b9d29f4e6f596261f00d2b953cfcb826a5
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Sep 19 09:36:55 2005 -0700

    remove acconfig.h

commit 7df8d39a5fd3e2faeb7d2293e9cceed5023ce1d5
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Sep 19 09:33:39 2005 -0700

     - (tim) [aclocal.m4 configure.ac] Delete acconfig.h and add templates to
       AC_DEFINE and AC_DEFINE_UNQUOTED to quiet autoconf 2.59 warning messages.

commit fd9e9e3ba6b43b4458846a1b5bb89de6d76c33a4
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Sep 12 17:36:10 2005 -0700

     - (tim) [configure.ac] Bug 1078. Fix --without-kerberos5. Reported by
       Mike Frysinger.

commit 784d4f538f26f5048c0c2de6239a7d65b5e393a4
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Sep 8 22:04:59 2005 -0700

    Last commit skipped defines.h
     - (tim) [defines.h openbsd-compat/port-uw.c] Add long password support to
       OpenServer 6 and add osr5bigcrypt support so when someone migrates
       passwords between UnixWare and OpenServer they will still work. OK dtucker@

commit 64ead485ac8fa10cb4db9c316e0c72c51a95e82e
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Sep 8 21:56:33 2005 -0700

     - (tim) [defines.h openbsd-compat/port-uw.c] Add long password support to
       OpenServer 6 and add osr5bigcrypt support so when someone migrates
       passwords between UnixWare and OpenServer they will still work. OK dtucker@

commit c8ab8ceacbe4dbdd7afea4e890d92e86282d050e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 1 19:10:48 2005 +1000

     - (djm) Update RPM spec file versions

commit 66fd217e8e57f0c86179d77dc14e42efd3098320
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Aug 31 09:59:49 2005 -0700

     - (tim) [configure.ac auth.c defines.h session.c openbsd-compat/port-uw.c
       openbsd-compat/port-uw.h openbsd-compat/xcrypt.c] libiaf cleanup. Disable
       libiaf bits for OpenServer6. Free memory allocated by ia_get_logpwd().
       Feedback and OK dtucker@

commit d0a47cd2435abdbb4aaabbdd408e855431ce9ccd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 1 00:05:56 2005 +1000

     - (dtucker) [README] Update release note URL to 4.2

commit ae37959bfbe84e6e10a73a11fca9d7a40381c397
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 31 19:47:07 2005 +1000

       - markus@cvs.openbsd.org 2005/08/31 09:28:42
         [version.h]
         4.2

commit da9984fc3aafc194485556ae2c7dc6c52cbd56c2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 31 19:46:26 2005 +1000

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2005/08/30 22:08:05
         [gss-serv.c sshconnect2.c]
         destroy credentials if krb5_kuserok() call fails. Stops credentials being
         delegated to users who are not authorised for GSSAPIAuthentication when
         GSSAPIDeletegateCredentials=yes and another authentication mechanism
         succeeds; bz#1073 reported by paul.moore AT centrify.com, fix by
         simon AT sxw.org.uk, tested todd@ biorn@ jakob@; ok deraadt@

commit ca9ce95bdda599dbfa566385e66732327f27dd30
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 31 19:42:20 2005 +1000

    correct bug number

commit eb456545fd5365297ede22d28afbedcc1eb3d482
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Aug 30 07:12:02 2005 -0700

     - (tim) [configure.ac] Back out last change. It needs to be done differently.

commit 2016865b954c83ddcdc76ebeef3a5fe3dfd6d9d2
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Aug 29 17:17:37 2005 -0700

     - (tim) [configure.ac] ia_openinfo() seems broken on OSR6. Limit UW long
       password support to 7.x for now.

commit 2291c00ab2aef934391c23227645121719df4c4b
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Aug 26 13:15:19 2005 -0700

     - (tim) [CREDITS LICENCE auth.c configure.ac defines.h includes.h session.c
       openbsd-compat/Makefile.in openbsd-compat/openbsd-compat.h
       openbsd-compat/xcrypt.c] New files [openssh/openbsd-compat/port-uw.c
       openssh/openbsd-compat/port-uw.h] Support long passwords (> 8-char)
       on UnixWare 7 from Dhiraj Gulati and Ahsan Rashid. Cleanup and testing
       by tim@. Feedback and OK dtucker@

commit 8cc2ad68cd886d5f55a40b46a8e4d60931217a33
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Aug 23 17:18:21 2005 -0700

     - (tim) [defines.h] PATH_MAX bits for OpenServer OK dtucker@

commit 3db1e3fc685cb0c570b4e17a60e0e041fa48b32f
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Aug 23 17:11:26 2005 -0700

     - (tim) [configure.ac ] Not all gcc's support -Wsign-compare

commit 114572f7ee4acd2aab331784f658851e5fbad9a4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 23 23:32:05 2005 +1000

     - (dtucker) [regress/test-exec.sh] Do not prepend an extra "/" to a fully-
       qualified sshd pathname since some systems (eg Cygwin) may consider "/foo"
       and "//foo" to be different.  Spotted by vinschen at redhat.com.

commit 93e7e8f345367136b4c3881c6eb3d756a43fe148
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 23 08:06:55 2005 +1000

     - (dtucker) [configure.ac defines.h includes.h sftp.c] Add support for
       LynxOS, patch from Olli Savia (ops at iki.fi).  ok djm@

commit 1d10976c161cfb2e7ec114b7c72885e6f195a3d5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 16 21:32:09 2005 +1000

     - (djm) [ttymodes.c] bugzilla #1054: Fix encoding of _POSIX_VDISABLE,
       from Jacob Nevins; ok dtucker@

commit c1819c831f044905298ca91cf5848aba3177be00
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Aug 15 17:48:40 2005 -0700

     - (tim) [configure.ac] corrections to libedit tests. Report and patches
       by skeleten AT shillest.net

commit 027e8b10f520866dccfff08afb6ff12cac20ac7f
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Aug 15 14:52:50 2005 -0700

     - (tim) wrap el_end() in #ifdef USE_LIBEDIT

commit 0e2c1028583da14b61e311fdcf8859f4335fc3be
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 12 22:16:22 2005 +1000

       - jaredy@cvs.openbsd.org 2005/08/08 13:22:48
         [sftp.c]
         sftp prompt enhancements:
         - in non-interactive mode, do not print an empty prompt at the end
           before finishing
         - print newline after EOF in editline mode
         - call el_end() in editline mode
         ok dtucker djm

commit 8e489484a1dbb8e2a15855e04b5897e33b2480c4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 12 22:11:58 2005 +1000

    oops, that last commit was:
    
         Report from Janusz Mucka; ok djm@

commit 203c70579eb87f8fd012a5ab2cad8635e3260e59
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 12 22:11:37 2005 +1000

       - dtucker@cvs.openbsd.org 2005/08/06 10:03:12
         [servconf.c]
         Unbreak sshd ListenAddress for bare IPv6 addresses.

commit 43f6db64ff57f147ef9fb77e4dd2748a02a00fea
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 12 22:11:18 2005 +1000

       - djm@cvs.openbsd.org 2005/07/30 02:03:47
         [readconf.c]
         listen_hosts initialisation here too; spotted greg AT y2005.nest.cx

commit be1045dc588ff001674033bce06a65db73ad3654
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 12 22:10:56 2005 +1000

       - djm@cvs.openbsd.org 2005/07/30 01:26:16
         [ssh.c]
         fix -D listen_host initialisation, so it picks up gateway_ports setting
         correctly

commit b5c012577eacee821313ca586464e6e4c2e5daa5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 12 22:10:28 2005 +1000

       - markus@cvs.openbsd.org 2005/07/28 17:36:22
         [packet.c]
         missing packet_init_compression(); from solar

commit 73f671a0902163c342ec5f1948f7fdad6905adee
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 10 21:52:36 2005 +1000

     - (dtucker) [LICENCE configure.ac defines.h openbsd-compat/realpath.c]
       Sync current (thread-safe) version of realpath.c from OpenBSD (which is
       in turn based on FreeBSD's).  ok djm@

commit c7572b26611241cb86319193693b940f5dbf47c9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 10 20:34:15 2005 +1000

     - (dtucker) [configure.ac] Test libedit library and headers for compatibility.
       Report from skeleten AT shillest.net, ok djm@

commit 8bc6b900ed8609d67e75bc7266b9b533a703eb4a
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Aug 9 10:09:53 2005 -0700

     - (tim) [configure.ac] Allow --with-audit=no. OK dtucker@
       Report by skeleten AT shillest.net

commit 9825697d3cf75e262dc81f01f7f6bf1e234306d3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 3 15:36:21 2005 +1000

     - (dtucker) [openbsd-compat/fake-rfc2553.h] MAX_INT -> INT_MAX since the
       latter is specified in the standard.

commit 212cfc4b4869fbbe5b038f7480e67d26f60f1545
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 3 10:57:15 2005 +1000

     - (dtucker) [openbsd-compat/fake-rfc2553.h] Check for EAI_* defines
       individually and use a value less likely to collide with real values from
       netdb.h.  Fixes compile warnings on FreeBSD 5.3.  ok djm@

commit 7da23cb5d307a98bb7a58445a845fab7abc35024
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 3 00:20:15 2005 +1000

     - (dtucker) [configure.ac] Add a --with-Werror option to configure for
       adding -Werror to CFLAGS when all of the configure tests are done. ok djm@

commit dd352b675be9af7571ea04635435bf138732f931
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 2 17:21:29 2005 +1000

     - (dtucker) [configure.ac] Enable -Wuninitialized by default when compiling
       with gcc.  ok djm@

commit 408585391520e7131d6b2dc73b8e17211c009568
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 2 17:07:07 2005 +1000

       - dtucker@cvs.openbsd.org 2005/07/27 10:39:03
         [scp.c hostfile.c sftp-client.c]
         Silence bogus -Wuninitialized warnings; ok djm@

commit 9786e6e2a034a8273b5d0d3b8cd8caf063bb875a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 26 21:54:56 2005 +1000

       - markus@cvs.openbsd.org 2005/07/25 11:59:40
         [kex.c kex.h myproposal.h packet.c packet.h servconf.c session.c]
         [sshconnect2.c sshd.c sshd_config sshd_config.5]
         add a new compression method that delays compression until the user
         has been authenticated successfully and set compression to 'delayed'
         for sshd.
         this breaks older openssh clients (< 3.5) if they insist on
         compression, so you have to re-enable compression in sshd_config.
         ok djm@

commit 47655ee03a67ed89ef55c957e5a8183ca3113d2c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 26 21:54:11 2005 +1000

     - (djm) OpenBSD CVS Sync
       - otto@cvs.openbsd.org 2005/07/19 15:32:26
         [auth-passwd.c]
         auth_usercheck(3) can return NULL, so check for that. Report from
         mpech@. ok markus@

commit ac1910f1a523b8e5d4c6a764a419244a91e5f390
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 26 12:00:42 2005 +1000

     - (dtucker) [configure.ac] Update zlib warning message too, pointed out by
       tim@.

commit 41097edcf6e7912350af27e3390e4ff94fefefc5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 25 15:24:21 2005 +1000

     - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096.

commit 04b65335a8248e562bc06136f58c4cccb53c45ca
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 17 17:53:31 2005 +1000

     - (djm) [monitor.c monitor_wrap.c] -Wsign-compare for PAM monitor calls

commit b6f72f5294ee8ab476ba59a97e8509ef864c5072
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 17 17:26:43 2005 +1000

     -(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c]
      [ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too

commit 0dc1bef12d30162ba09bfcc0b1cd6a5535ebdaab
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 17 17:22:45 2005 +1000

       - djm@cvs.openbsd.org 2005/07/17 07:17:55
         [auth-rh-rsa.c auth-rhosts.c auth2-chall.c auth2-gss.c channels.c]
         [cipher-ctr.c gss-genr.c gss-serv.c kex.c moduli.c readconf.c]
         [serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c]
         [sshconnect.c sshconnect2.c]
         knf says that a 2nd level indent is four (not three or five) spaces

commit 2b9b045d930b8d724f768fafdd9a46fa453b9a3e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 17 17:19:24 2005 +1000

     - (djm) [auth-pam.c sftp.c] spaces vs. tabs at start of line
       - djm@cvs.openbsd.org 2005/07/17 06:49:04
         [channels.c channels.h session.c session.h]
         Fix a number of X11 forwarding channel leaks:
         1. Refuse multiple X11 forwarding requests on the same session
         2. Clean up all listeners after a single_connection X11 forward, not just
            the one that made the single connection
         3. Destroy X11 listeners when the session owning them goes away
         testing and ok dtucker@

commit 37294fb6307202e6f52d7046b3ddb56a4786d27f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 17 17:18:49 2005 +1000

     - (djm) [auth-pam.c sftp.c] spaces vs. tabs at start of line

commit 94cf4c8448bab8f1ad563868089bb0ea1ff92213
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 17 17:04:47 2005 +1000

     - (djm) [acss.c auth-pam.c auth-shadow.c auth-skey.c auth1.c canohost.c]
       [cipher-acss.c loginrec.c ssh-rand-helper.c sshd.c] Fix whitespace at EOL
       in portable too ("perl -p -i -e 's/\s+$/\n/' *.[ch]")

commit 46d38de48b1018c74040d2399bafbedf50247529
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 17 17:02:09 2005 +1000

       - djm@cvs.openbsd.org 2005/07/16 01:35:24
         [auth1.c channels.c cipher.c clientloop.c kex.c session.c ssh.c]
         [sshconnect.c]
         spacing

commit 4f1adad4f65d63645689d2d947876848b0813390
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 16 11:33:06 2005 +1000

     - (dtucker) [auth-pam.c] Ensure that only one side of the authentication
       socketpair stays open on in both the monitor and PAM process.  Patch from
       Joerg Sonnenberger.

commit 4a42257b06fed3f2ec60ca27175d7db76761aebc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 14 17:22:11 2005 +1000

     - (dtucker) [configure.ac defines.h] Define __sentinel__ to nothing if the
       compiler doesn't understand it to prevent warnings.  If any mainstream
       compiler versions acquire it we can test for those versions.  Based on
       discussion with djm@.

commit 8e2eb308d09f6bbf5c66c029090c527bc9346db8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 14 17:07:21 2005 +1000

       - dtucker@cvs.openbsd.org 2005/07/14 04:00:43
         [misc.h]
         use __sentinel__ attribute; ok deraadt@ djm@ markus@

commit 6c71d20d7689bf2c9c22f39b2355de8db975b586
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 14 17:06:50 2005 +1000

       - jmc@cvs.openbsd.org 2005/07/08 12:53:10
         [ssh_config.5]
         new sentence, new line;

commit 89f4d47e66697d10d9f48461e20da67640cbd220
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 14 17:06:21 2005 +1000

       - dtucker@cvs.openbsd.org 2005/07/08 10:20:41
         [ssh_config.5]
         change BindAddress to match recent ssh -b change; prompted by markus@

commit ce377c3ff17b674236de531b4a260f96db803d46
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 14 17:05:51 2005 +1000

       - markus@cvs.openbsd.org 2005/07/08 09:41:33
         [channels.h]
         race when efd gets closed while there is still buffered data:
         change CHANNEL_EFD_OUTPUT_ACTIVE()
            1) c->efd must always be valid AND
            2a) no EOF has been seen OR
            2b) there is buffered data
         report, initial fix and testing Chuck Cranor

commit bee73d5ce0dec4e011174b321e7d52fac3150691
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 14 17:05:02 2005 +1000

       - dtucker@cvs.openbsd.org 2005/07/08 09:26:18
         [misc.c]
         Make comment match code; ok djm@

commit a5cf85584cbf3dcb156ebee6730616872ddd3be8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 14 17:04:18 2005 +1000

       - dtucker@cvs.openbsd.org 2005/07/06 09:33:05
         [ssh.1]
         clarify meaning of ssh -b ; with & ok jmc@

commit 893c602ef05e2a11d76a945ac19c75bcc029c515
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 7 20:33:36 2005 +1000

     - (dtucker) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Remove
       calls to krb5_init_ets, which has not been required since krb-1.1.x and
       most Kerberos versions no longer export in their public API.  From sxw
       at inf.ed.ac.uk, ok djm@

commit a83f2612c275aea3168cadd94433590aa15a8ad3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 7 20:09:35 2005 +1000

     - (dtucker) [auth-krb5.c] There's no guarantee that snprintf will set errno
       in the case where the buffer is insufficient, so always return ENOMEM.
       Also pointed out by sxw at inf.ed.ac.uk.

commit a916d143a16c59a6bc82df5e1d6b046e17d31848
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 7 11:50:20 2005 +1000

     - [auth-krb5.c auth.h gss-serv-krb5.c] Move KRB5CCNAME generation for the MIT
       Kerberos code path into a common function and expand mkstemp template to be
       consistent with the rest of OpenSSH.  From sxw at inf.ed.ac.uk, ok djm@

commit f92c0794ec9162f4e0d5291fe58e4fcb5a00f6d3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 6 09:45:26 2005 +1000

       - markus@cvs.openbsd.org 2005/07/04 14:04:11
         [channels.c]
         don't forget to set x11_saved_display

commit fd94fbaf563d2d9a0c512e59085fe91d7e693576
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 6 09:44:59 2005 +1000

       - jmc@cvs.openbsd.org 2005/07/04 11:29:51
         [ssh_config.5]
         fix Xr and a little grammar;

commit 1339002e8b05d89b10767849d9ee9be55e460f4c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 6 09:44:19 2005 +1000

       - djm@cvs.openbsd.org 2005/07/04 00:58:43
         [channels.c clientloop.c clientloop.h misc.c misc.h ssh.c ssh_config.5]
         implement support for X11 and agent forwarding over multiplex slave
         connections. Because of protocol limitations, the slave connections inherit
         the master's DISPLAY and SSH_AUTH_SOCK rather than distinctly forwarding
         their own.
         ok dtucker@ "put it in" deraadt@

commit a7270309fc5e95b29c91d0190b13ef5a9b1df339
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 6 09:36:05 2005 +1000

       - markus@cvs.openbsd.org 2005/07/01 13:19:47
         [channels.c]
         don't free() if getaddrinfo() fails; report mpech@

commit dba6354c05da46a185fc792126077fc2162efd82
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 26 08:56:48 2005 +1000

    wrap

commit 7c71cc738c87905561d64eeb95ea7327917089f2
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 26 08:56:31 2005 +1000

       - djm@cvs.openbsd.org 2005/06/25 22:47:49
         [ssh.c]
         do the default port filling code a few lines earlier, so it really
         does fix %p

commit 8f74c8fc3216af41e466dbe7abbe8660679588ad
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 26 08:56:03 2005 +1000

       - djm@cvs.openbsd.org 2005/06/18 04:30:36
         [ssh.c ssh_config.5]
         allow ControlPath=none, patch from dwmw2 AT infradead.org; ok dtucker@

commit 9651fe690a95378cdb9b2a1cf3e8c5cb625052c7
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 26 08:55:25 2005 +1000

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2005/06/17 22:53:47
         [ssh.c sshconnect.c]
         Fix ControlPath's %p expanding to "0" for a default port,
         spotted dwmw2 AT infradead.org; ok markus@

commit 52c8afeec57cd8f04e08816e1f4563e689f70f83
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 19 10:19:43 2005 +1000

     - (djm) [loginrec.c ssh-rand-helper.c] Fix -Wsign-compare for portable,
       tested and fixes tim@

commit 106075314795dab5eeea6ca547dd6a7573168f7a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 19 09:10:40 2005 +1000

    +opensshd.init

commit 06221f152770ec493ff4e8ec5ff18b39e1258f72
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 19 07:36:10 2005 +1000

       - djm@cvs.openbsd.org 2005/06/17 02:44:33
       [auth1.c] make this -Wsign-compare clean; ok avsm@ markus@

commit 6abf57ccbf13a043a2a2b7c8a662fc3e50d71d20
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 19 07:31:37 2005 +1000

       - djm@cvs.openbsd.org 2005/05/20 12:57:01;
       [auth1.c] split protocol 1 auth methods into separate functions, makes
       authloop much more readable; fixes and ok markus@ (portable ok &
       polish dtucker@)

commit f0bd352429f26f99b7bdacd23baf46b39a9f600a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 17 21:15:20 2005 +1000

     - (dtucker) [cipher.c openbsd-compat/openbsd-compat.h
       openbsd-compat/openssl-compat.c] only include openssl compat stuff where
       it's needed as it can cause conflicts elsewhere (eg xcrypt.c).  Found by
       and ok tim@
    ----------------------------------------------------------------------
    automatically CVS: CVS: Committing in .  CVS: CVS: Modified Files:
    ----------------------------------------------------------------------

commit eccb9de72aa29da5a3fad87a4287b32438689c1f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 17 12:59:34 2005 +1000

       - djm@cvs.openbsd.org 2005/06/17 02:44:33
         [auth-rsa.c auth.c auth1.c auth2-chall.c auth2-gss.c authfd.c authfile.c]
         [bufaux.c canohost.c channels.c cipher.c clientloop.c dns.c gss-serv.c]
         [kex.c kex.h key.c mac.c match.c misc.c packet.c packet.h scp.c]
         [servconf.c session.c session.h sftp-client.c sftp-server.c sftp.c]
         [ssh-keyscan.c ssh-rsa.c sshconnect.c sshconnect1.c sshconnect2.c sshd.c]
         make this -Wsign-compare clean; ok avsm@ markus@
         NB. auth1.c changes not committed yet (conflicts with uncommitted sync)
         NB2. more work may be needed to make portable Wsign-compare clean

commit 677257fe07dd2b9a58817e1d42fc2c25bb618a4d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 17 12:55:03 2005 +1000

       - markus@cvs.openbsd.org 2005/06/16 08:00:00
         [canohost.c channels.c sshd.c]
         don't exit if getpeername fails for forwarded ports; bugzilla #1054;
         ok djm

commit 17e7ed0e754577ae61cdd5e3f03b33fba2a09337
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 17 12:54:33 2005 +1000

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2005/06/16 03:38:36
         [channels.c channels.h clientloop.c clientloop.h ssh.c]
         move x11_get_proto from ssh.c to clientloop.c, to make muliplexed xfwd
         easier later; ok deraadt@

commit 46f55d366508ab7eab3c1dcdf0ec8c61f0e798a3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 16 13:21:17 2005 +1000

       - dtucker@cvs.openbsd.org 2005/06/09 13:43:49
         [cipher.c]
         Correctly initialize end of array sentinel; ok djm@
         (Id sync only, change already in portable)

commit d14b1e731cf4cb79c3ff5ced9315cc11f1fceced
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 16 13:19:41 2005 +1000

       - djm@cvs.openbsd.org 2005/06/08 11:25:09
         [clientloop.c readconf.c readconf.h ssh.c ssh_config.5]
         add ControlMaster=auto/autoask options to support opportunistic
         multiplexing; tested avsm@ and jakob@, ok markus@

commit ac7ef6a7360f7b1e417790d288f42f474c4ceb55
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 16 13:19:06 2005 +1000

       - djm@cvs.openbsd.org 2005/06/08 03:50:00
         [ssh-keygen.1 ssh-keygen.c sshd.8]
         increase default rsa/dsa key length from 1024 to 2048 bits;
         ok markus@ deraadt@

commit 6476cad9bb6b8a9524a153639b4ebceb3427e743
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 16 13:18:34 2005 +1000

       - djm@cvs.openbsd.org 2005/06/06 11:20:36
         [auth.c auth.h misc.c misc.h ssh.c ssh_config.5 sshconnect.c]
         introduce a generic %foo expansion function. replace existing % expansion
         and add expansion to ControlPath; ok markus@

commit 05656967b111a7c2b1f831eab0c31002dfac6fa9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 16 13:18:04 2005 +1000

     - (djm) OpenBSD CVS Sync
       - jaredy@cvs.openbsd.org 2005/06/07 13:25:23
         [progressmeter.c]
         catch SIGWINCH and resize progress meter accordingly; ok markus dtucker

commit 488d6026180d1616ae0aaaae4ae8a658a0df817f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 9 23:40:39 2005 +1000

    typo

commit a55ec7701336230c76b63ad426057146ae516a4f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 9 21:45:10 2005 +1000

     - (dtucker) [cipher.c openbsd-compat/Makefile.in
       openbsd-compat/openbsd-compat.{c,h} openbsd-compat/openssl-compat.h]
       Move compatibility code for supporting older OpenSSL versions to the
       compat layer.  Suggested by and "no objection" djm@

commit 431f022263a59595dd7894181515832828a950f9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 7 17:53:40 2005 +1000

     - (dtucker) [configure.ac] Continue the hunt for LLONG_MIN and LLONG_MAX:
       in today's episode we attempt to coax it from limits.h where it may be
       hiding, failing that we take the DIY approach.  Tested by tim@

commit c0e014d5beaceed128ef5f8672a6567035ee7c9c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 5 09:21:41 2005 +1000

     - (djm) [README README.privsep] Mention FreeBSD and NetBSD as being
       supported by privsep. Requested by des AT des.no

commit 6a45f3dab42f00733070ca386bc841d73afa3b24
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 3 19:33:10 2005 +1000

     - (dtucker) [configure.ac] Point configure's reporting address at the
       openssh-unix-dev list.  ok tim@ djm@

commit 67b3703da3c4a1f766b25dbe31aa2fed4a2ad656
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 3 17:58:31 2005 +1000

     - (dtucker) [configure.ac] Only try gcc -std=gnu99 if LLONG_MAX isn't
       defined, and check that it helps before keeping it in CFLAGS.  Some old
       gcc's don't set an error code when encountering an unknown value in -std.
       Found and tested by tim@.

commit fcc7ff1de8db0647357a5846e4d629f4ca54a6b9
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jun 2 20:28:29 2005 -0700

     - (tim) [configure.ac] Some platforms need sys/types.h for arpa/nameser.h.
       Take AC_CHECK_HEADERS test out of ultrix section. It caused other platforms
       to skip builtin standard includes tests. (first AC_CHECK_HEADERS test
       must be run on all platforms) Add missing ;; to case statement. OK dtucker@

commit 4dbacffe7bd6160c66c89093969eba469fb90b55
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jun 1 20:09:28 2005 -0700

     - (tim) [configure.ac] set TEST_SHELL for OpenServer 6

commit 5f7075800ae03d516c84a05ea2d3710413535577
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jun 1 19:57:45 2005 -0700

     - (tim) [config.guess config.sub] Update to '2005-05-27' version.

commit 0814d3136f086a74c9d85ede5b6be2fd2bbab674
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 1 23:08:51 2005 +1000

       - djm@cvs.openbsd.org 2005/05/27 08:30:37
         [ssh.c]
         fix -O for cases where no ControlPath has been specified or socket at
         ControlPath is not contactable; spotted by and ok avsm@

commit 2db8ae671eef747f97d3b50eafb525d3778c5dae
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 1 23:02:25 2005 +1000

       - dtucker@cvs.openbsd.org 2005/05/26 09:08:12
         [ssh-keygen.c]
         uint32_t -> u_int32_t for consistency; ok djm@

commit fc4f2dd3470681dae24e9ec95aceb2a2a94c3d7e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 1 23:01:12 2005 +1000

       - avsm@cvs.openbsd.org 2005/05/26 02:08:05
         [scp.c]
         If copying multiple files to a target file (which normally fails, as it
         must be a target directory), kill the spawned ssh child before exiting.
         This stops it trying to authenticate and spewing lots of output.
         deraadt@ ok

commit 81eb5d5e10d4c3ce0f0cc91fab7efbb22fb97f07
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 1 21:39:33 2005 +1000

     - (dtucker) [configure.ac openbsd-compat/Makefile.in openbsd-compat/strtoll.c]
       Add strtoll to the compat library, from OpenBSD.

commit d886e1ca2c52c7998f54d03db824626cbbdfb85f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 1 18:57:45 2005 +1000

     - (dtucker) [configure.ac] Look for _getshort and _getlong in
       arpa/nameser.h.

commit f5615962c04936a5537889518e7ee9c801f3a89e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue May 31 16:59:16 2005 +1000

     - (dtucker) [mdoc2man.awk] Teach it to understand .Ox.

commit 11fb0f290fa0c8dce5948d4ea1c407ac7ee0946f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue May 31 16:51:07 2005 +1000

     - (dtucker) [contrib/aix/pam.conf] Correct comments.  From davidl at
       vintela.com.

commit fd46f39ca6996fa0b009ab179efc0e80569d9b4e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 30 09:58:40 2005 +1000

     - (dtucker) [README] Link to new release notes.  Beter late than never...

commit d188a127650fa3921407cbd2046f34a29114d62f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 29 17:22:29 2005 +1000

    typo in comment

commit f9fea65ba91c6c8002185fab31266f60c6b33a78
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 29 10:54:27 2005 +1000

     - (dtucker) [openbsd-compat/port-aix.c] Minor correction to debug message,
       spotted by tim@.

commit 6b2fe31def24b50c4cc705f2a3b861348b1be8e2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 29 10:32:47 2005 +1000

     - (dtucker) [openbsd-compat/port-aix.c] Whitespace cleanups while there.

commit 782727ac611b159973a5dd05f8d8cfa82cd734d0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 29 10:28:48 2005 +1000

    20050529
     - (dtucker) [openbsd-compat/port-aix.c] Bug #1046: AIX 5.3 expects the
       argument to passwdexpired to be initialized to NULL.  Suggested by tim@
       While at it, initialize the other arguments to auth functions in case they
       ever acquire this behaviour.

commit 5d72a40d67d606a22f75999dc8bf1b846815ec2a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 28 20:28:39 2005 +1000

     - (dtucker) [openbsd-compat/port-aix.h] Use the HAVE_DECL_* definitions as
       per the autoconf man page.  Configure should always define them but it
       doesn't hurt to check.

commit fd33328a253f2db759e4728935a323b44ea2159d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 28 18:31:42 2005 +1000

     - (dtucker) [configure.ac] Merge HP-UX blocks into a common block with minor
       version-specific variations as required.

commit 7d2171b2cd9633bfc7a8fb64a327630dc1a4ad9c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 28 16:57:00 2005 +1000

     - (dtucker) [configure.ac] getpgrp may be defined in unistd.h, so check for
       its presence before doing AC_FUNC_GETPGRP.

commit 390b6d5dbf879e5daaa924c91cb1448a5748b558
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 28 16:54:36 2005 +1000

     - (dtucker) [configure.ac] strsep() may be defined in string.h, so check
       for its presence and include it in the strsep check.

commit e910be1c4248953f46c46f66507c5eaf3f9c5d02
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 28 16:01:18 2005 +1000

    missing space

commit 0c9653f57e10e1a555905c7de906dbcac91ede93
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 28 15:58:14 2005 +1000

     - (dtucker) [configure.ac] For AC_CHECK_HEADERS() and AC_CHECK_FUNCS() have
       one entry per line to make it easier to merge changes.  ok djm@

commit 2be1cbb7be25d32bc5741c96cc4d6951bd91fc30
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 27 21:13:40 2005 +1000

     - (dtucker) [acconfig.h configure.ac defines.h includes.h sshpty.c
       openbsd-compat/bsd-misc.c] Add support for Ultrix.  No, that's not a typo.
       Required changes from Bernhard Simon, integrated by me.  ok djm@

commit 287b4591945c27b374f810f44053b33206fb5eec
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 27 19:36:56 2005 +1000

     - (djm) [defines.h] Use our realpath if we have to define PATH_MAX, spotted by
       David Leach; ok dtucker@

commit de3cb0a3dc1bd98762afa3d71f3ffcdb76029fad
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 20:48:25 2005 +1000

     - (djm) [configure.ac openbsd-compat/Makefile.in]
             [openbsd-compat/openbsd-compat.h openbsd-compat/strtonum.c]
             Add strtonum(3) from OpenBSD libc, new code needs it.
             Unfortunately Linux forces us to do a bizarre dance with compiler
             options to get LLONG_MIN/MAX; Spotted by and ok dtucker@

commit 84ce9b455d04e7f145d43ef8dac2ddc59e41802d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 26 20:12:15 2005 +1000

     - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Bug #1033: Provide
       templates for _getshort and _getlong if missing to prevent compiler warnings
       on Linux.

commit f08bdb5a7e599ff95c72df7a92def141360c9b80
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 26 19:59:48 2005 +1000

     - (dtucker) [auth-pam.c] Bug #1033: Fix warnings building with PAM on Linux:
      warning: dereferencing type-punned pointer will break strict-aliasing rules
      warning: passing arg 3 of `pam_get_item' from incompatible pointer type
      The type-punned pointer fix is based on a patch from SuSE's rpm.  ok djm@

commit d98dce6929de5ce98f53f968e02a8d1cbe696151
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 26 13:43:57 2005 +1000

     - (dtucker) [regress/reexec.sh] Add ${EXEEXT} so this test also works on
       Cygwin.

commit b253cc42136649e3eac80e02667f8fbc1e43baaa
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:23:44 2005 +1000

       - avsm@cvs.openbsd.org 2005/05/24 17:32:44
         [atomicio.c atomicio.h authfd.c monitor_wrap.c msg.c scp.c sftp-client.c]
         [ssh-keyscan.c sshconnect.c]
         Switch atomicio to use a simpler interface; it now returns a size_t
         (containing number of bytes read/written), and indicates error by
         returning 0.  EOF is signalled by errno==EPIPE.
         Typical use now becomes:
    
         if (atomicio(read, ..., len) != len)
                 err(1,"read");
    
         ok deraadt@, cloder@, djm@

commit 02e754f1f01470c11a175a0d07381361afe37fff
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:19:39 2005 +1000

       - avsm@cvs.openbsd.org 2005/05/24 02:05:09
         [ssh-keygen.c]
         some style nits from dmiller@, and use a fatal() instead of a printf()/exit

commit 3710f278ae76751118fb3ced2ee6e8e320b91002
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:19:17 2005 +1000

       - djm@cvs.openbsd.org 2005/05/23 23:32:46
         [cipher.c myproposal.h ssh.1 ssh_config.5 sshd_config.5]
         add support for draft-harris-ssh-arcfour-fixes-02 improved arcfour modes;
         ok markus@

commit b089fb5fe15a6b1936262a33417265f8cb9b0afb
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:16:18 2005 +1000

       - avsm@cvs.openbsd.org 2005/05/23 22:44:01
         [moduli.c ssh-keygen.c]
         - removes signed/unsigned comparisons in moduli generation
         - use strtonum instead of atoi where its easier
         - check some strlcpy overflow and fatal instead of truncate

commit dfec2941acfdcadb81adb149f452f0eece26625d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:14:32 2005 +1000

       - jmc@cvs.openbsd.org 2005/05/20 11:23:32
         [ssh_config.5]
         oops - article and spacing;

commit ebcfedce85310aba939049b29804bf68697c9a1f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:13:56 2005 +1000

       - djm@cvs.openbsd.org 2005/05/20 10:50:55
         [ssh_config.5]
         give a ProxyCommand example using nc(1), with and ok jmc@

commit 459735a0c60607ecf07c3e5d6aa0c599cab8bd3b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:13:42 2005 +1000

       - djm@cvs.openbsd.org 2005/05/19 02:42:26
         [includes.h]
         fix cast, from grunk AT pestilenz.org

commit 06b75ad56b29cb102b7289e3935b95435545e695
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:12:37 2005 +1000

       - djm@cvs.openbsd.org 2005/05/19 02:40:52
         [sshd_config]
         whitespace nit, from grunk AT pestilenz.org

commit 1594ad5a780400e1a8bfe92bd041ae82450d3d17
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:12:19 2005 +1000

       - djm@cvs.openbsd.org 2005/05/19 02:39:55
         [sshd_config.5]
         sort config options, from grunk AT pestilenz.org; ok jmc@

commit 17b23d86577314547647aeda2a0e1205026f1769
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:11:56 2005 +1000

       - markus@cvs.openbsd.org 2005/05/16 15:30:51
         [readconf.c servconf.c]
         check return value from strdelim() for NULL (AddressFamily); mpech

commit 538c9b71ecb11669053271ff95d7ce8a6d40294f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:11:28 2005 +1000

       - djm@cvs.openbsd.org 2005/05/10 10:30:43
         [ssh.c]
         report real errors on fallback from ControlMaster=no to normal connect

commit 924c25a64e063cf37eeeb3e5e5c0fa9a523435ff
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:09:32 2005 +1000

       - djm@cvs.openbsd.org 2005/05/10 10:28:11
         [ssh.c]
         print nice error message for EADDRINUSE as well (ID sync only)

commit d2ebd450f035e2bc549d778389313441a433b173
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:07:47 2005 +1000

       - markus@cvs.openbsd.org 2005/05/02 21:13:22
         [readpass.c]
         missing {}

commit 41bfc29ea5416ea0a389635291bcf388d4bdc225
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:07:32 2005 +1000

       - moritz@cvs.openbsd.org 2005/04/28 10:17:56
         [progressmeter.c ssh-keyscan.c]
         add snprintf checks. ok djm@ markus@

commit dadfd4dd3862df5cebae2f2dc9b7f112321fa85e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:07:13 2005 +1000

       - jakob@cvs.openbsd.org 2005/04/26 13:08:37
         [ssh.c ssh_config.5]
         fallback gracefully if client cannot connect to ControlPath. ok djm@

commit ac7a0059e2a2721b7c35ffe77b9ed3d07f19c945
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:05:49 2005 +1000

       - jmc@cvs.openbsd.org 2005/04/26 12:59:02
         [sftp-client.h]
         spelling correction in comment from wiz@netbsd;

commit ddeb75294bed504a6182efa4b047e44363ba6eb7
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:05:28 2005 +1000

       - dtucker@cvs.openbsd.org 2005/04/23 23:43:47
         [readpass.c]
         Add debug message if read_passphrase can't open /dev/tty; bz #471;
         ok djm@

commit ddee575b988e1f4858abfff0aca13d7ba016f2e4
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:05:05 2005 +1000

       - djm@cvs.openbsd.org 2005/04/21 11:47:19
         [ssh.c]
         don't allocate a pty when -n flag (/dev/null stdin) is set, patch from
         ignasi.roca AT fujitsu-siemens.com (bz #829); ok dtucker@

commit 167ea5d0268243991ad3c55cb20fa2b53f577b37
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:04:02 2005 +1000

       - djm@cvs.openbsd.org 2005/04/21 06:17:50
         [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 ssh_config.5 sshd.8]
         [sshd_config.5] OpenSSH doesn't ever look at the $HOME environment
         variable, so don't say that we do (bz #623); ok deraadt@

commit a31c929f3601561d6d147a2940d7a81a2a40e377
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:03:31 2005 +1000

       - jakob@cvs.openbsd.org 2005/04/20 10:05:45
         [dns.c]
         do not try to look up SSHFP for numerical hostname. ok djm@

commit 3dc967e17b7eb226ac1211f17ee6fabfc0234015
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:03:15 2005 +1000

       - jmc@cvs.openbsd.org 2005/04/14 12:30:30
         [ssh.1]
         arg to -b is an address, not if_name;
         ok markus@

commit 5fd38c0ed985d7d699e6be1ff5d211cac130b71e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:02:14 2005 +1000

       - djm@cvs.openbsd.org 2005/04/09 04:32:54
         [misc.c misc.h tildexpand.c Makefile.in]
         replace tilde_expand_filename with a simpler implementation, ahead of
         more whacking; ok deraadt@

commit 1b0de9a04127eeec9a5352abd16113bb8faa494c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 12:01:22 2005 +1000

       - dtucker@cvs.openbsd.org 2005/04/06 12:26:06
         [ssh.c]
         Fix debug call for port forwards; patch from pete at seebeyond.com,
         ok djm@ (ID sync only - change already in portable)

commit 4f1d6b2c112be24f6ecfcb81b56f0180ec76ea66
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 11:59:32 2005 +1000

       - djm@cvs.openbsd.org 2005/04/06 09:43:59
         [sshd.c]
         avoid harmless logspam by not performing setsockopt() on non-socket;
         ok markus@

commit 9278ffaf71c035fe5a50c9704dda36d2f2fd7a06
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 11:59:06 2005 +1000

     - (djm) OpenBSD CVS Sync
       - otto@cvs.openbsd.org 2005/04/05 13:45:31
         [ssh-keygen.c]

commit 9d0ccb8d496e3ce72aa301bf808a5adbcb47da1a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 11:47:54 2005 +1000

    typo

commit 2c04deb8881f6c7913afd04f495ada6d3e69992e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 11:35:37 2005 +1000

     - (djm) [mpaux.c mpaux.h Makefile.in] Remove old mpaux.[ch] code, it has not
       been used for a while

commit 7dff869dd92c025689b73d67960658cbfe29601c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 11:34:51 2005 +1000

    tiny KNF nit

commit 6b6d5be5914426d6ee46fe207ee216944f289dea
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 26 11:34:36 2005 +1000

     - Release 4.1p1

commit ae8c91ec0749282e220f9c56efee1444a072cf62
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed May 25 19:42:10 2005 +1000

     - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Ensure sufficient memory
       allocation when retrieving core Windows environment.  Add CYGWIN variable
       to propagated variables.  Patch from vinschen at redhat.com, ok djm@

commit 328118aa798878a68398b92ba85adfb630bc5434
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed May 25 16:18:09 2005 +1000

     - (dtucker) [auth-pam.c] Since people don't seem to be getting the message
       that USE_POSIX_THREADS is unsupported, not recommended and generally a bad
       idea, it is now known as UNSUPPORTED_POSIX_THREADS_HACK.  Attempting to use
       USE_POSIX_THREADS will now generate an error so we don't silently change
       behaviour.  ok djm@

commit 4d8f560c398530d652c72e9d91c1a0cb8ff19a6c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 25 14:43:47 2005 +1000

     - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
             [contrib/suse/openssh.spec] Update spec file versions to 4.1p1

commit 101afbbb170bdbc81026b0385ab735e9f23a2835
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 24 16:42:00 2005 +1000

    restore portable-specific tweak

commit 308c8b147bb6a5598902870675c6c5d5975470aa
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 24 16:39:03 2005 +1000

    nicer fix from millert@

commit df548bc31062fcc7f5ab618821ab4653b170ec60
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 24 15:54:27 2005 +1000

     - (djm) [openbsd-compat/readpassphrase.c] bz #950: Retry tcsetattr to ensure
       terminal modes are reset correctly. Fix from peak AT argo.troja.mff.cuni.cz;
       "looks ok" dtucker@

commit b58bd0327ea9282be941db786ff191bea033eec1
Author: Tim Rice <tim@multitalents.net>
Date:   Thu May 12 10:32:19 2005 -0700

    20050512
     - (tim) [buildpkg.sh.in] missing ${PKG_INSTALL_ROOT} in init script
       hard link section. Bug 1038.

commit fa2211d93d3ad66ec16e4d23a14e5730a105c559
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 9 23:48:17 2005 +1000

     - (dtucker) [contrib/cygwin/ssh-host-config] Add a test and warning for a
       user-mode mounts in Cygwin installation.  Patch from vinschen at redhat.com.

commit 4f10e25684fdbe00b9e563b510e03f9c2aa7a192
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 4 15:33:09 2005 +1000

     - (djm) [ssh.c] some systems return EADDRINUSE on a bind to an already-used
       unix domain socket, so catch that too; from jakob@ ok dtucker@

commit 5b115d4401453a99313996dc48e6b8f3e54c5b54
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue May 3 19:05:32 2005 +1000

     - (dtucker) [canohost.c] normalise socket addresses returned by
       get_remote_hostname().  This means that IPv4 addresses in log messages
       on IPv6 enabled machines will no longer be prefixed by "::ffff:" and
       AllowUsers, DenyUsers, AllowGroups, DenyGroups will match IPv4-style
       addresses only for 4-in-6 mapped connections, regardless of whether
       or not the machine is IPv6 enabled.  ok djm@

commit 149da8577e5d494d17e1bd0235b24f4d9f2de49c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Apr 25 17:03:29 2005 +1000

    typo

commit af342556b9d240dc5f6ad918ddd686cf87eb325e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Apr 25 17:01:26 2005 +1000

     - (dtucker) [regress/multiplex.sh] Put control socket in /tmp so running
       "make tests" works even if you'r building on a filesystem that doesn't
       support sockets.  From deengert at anl.gov, ok djm@

commit bf2b3983277c88ecef8bd50eab9a2b5e103d4b38
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Apr 25 14:49:48 2005 +1000

     - (dtucker) [regress/multiplex.sh] Remove cleanup call since test-exec.sh
       will clean up anyway.  From tim@

commit faefd2e73d242a1bb482a81a33e3b7434aa72733
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Apr 25 14:48:22 2005 +1000

     - (dtucker) [regress/multiplex.sh] Use "kill -0 $pid" to check for the
       existence of a process since it's more portable.  Found by jbasney at
       ncsa.uiuc.edu; ok tim@

commit 2f0b5c4869bab45bccb8472590bbd3edb44c092a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Apr 24 17:52:22 2005 +1000

     - (dtucker) [INSTALL configure.ac] Make zlib version check test for 1.1.4 or
       1.2.1.2 or higher.  With tim@, ok djm@

commit 4149ebc0db98cf6b51dbb5083a11c20c9695e744
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Apr 23 18:17:29 2005 -0700

     - (tim) [config.guess] Add support for OpenServer 6.

commit 48554152b9f063f0f226f3eeb9f199be69975c2f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Apr 21 19:50:55 2005 +1000

     - (dtucker) [session.c] Bug #1024: Don't check pam_session_is_open if
       UseLogin is set as PAM is not used to establish credentials in that
       case.  Found by Michael Selvesteen, ok djm@

commit 8d158c9937e74cfa5c65187fca83f5ebc0dbef4c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Apr 19 15:40:51 2005 +1000

     - (dtucker) [INSTALL] Fix s/key text too.

commit ad1e5e286c13e4e4f3a4df308ab5581a8f46925a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Apr 19 15:31:49 2005 +1000

     - (dtucker) [INSTALL] Put the s/key text and URL back together.

commit d9c88138f779e07209ddb0f6bccf6b78427be6ed
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Apr 19 12:21:21 2005 +1000

     - (dtucker) [INSTALL] Reference README.privsep for the privilege separation
       requirements.  Pointed out by Bengt Svensson.

commit 2f97b8b08857ab99edca506bc90ceefe65ff6566
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Apr 11 19:00:18 2005 -0700

     - (tim) [configure.ac] UnixWare needs PASSWD_NEEDS_USERNAME

commit 0f5eeff23dc88b7ea6ac5f0345bd088ea3f49750
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Apr 5 21:00:47 2005 +1000

     - (dtucker) [auth-passwd.c auth-sia.h] Remove duplicate definitions of
       sys_auth_passwd, pointed out by cmadams at hiwaay.net.

commit 00cadb8c35fd1d178665a32899aea2a851077aaa
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Apr 5 20:58:37 2005 +1000

     - (dtucker) [auth-sia.c] Constify sys_auth_passwd, fixes build error on
       Tru64.  Patch from cmadams at hiwaay.net.

commit 9d2562cf201e82d14d10abdd34009d8ab16a9d25
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Apr 5 19:22:45 2005 +1000

     - (dtucker) [configure.ac] Define HAVE_SO_PEERCRED if we have it.  ok djm@

commit 69152291e7dd83db673a85aba6a6f8d265f1871b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Apr 3 12:44:23 2005 +1000

     - (dtucker) [monitor.c] Don't free buffers in audit functions, monitor_read
       will free as needed.  ok tim@ djm@

commit 4942de57199424734567879dacad61c00e96ffab
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 3 10:16:39 2005 +1000

       - djm@cvs.openbsd.org 2005/04/02 12:41:16
         [scp.c]
         since ssh has xstrdup, use it instead of strdup+test. unbreaks -Werror
         build

commit 3dae15c6111a90a4a7417a34fa47a1cfee16963e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 3 10:16:11 2005 +1000

       - deraadt@cvs.openbsd.org 2005/03/31 18:39:21
         [scp.c]
         copy argv[] element instead of smashing the one that ps will see; ok otto

commit de0de39082ee971aa3ff442e0201d9eff5c75cca
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 31 23:52:04 2005 +1000

     - (dtucker) [monitor.c] Remaining part of fix for bug #1006.

commit 73ba43798a3e81149f65a03d51f23bf9fa928011
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 31 21:51:54 2005 +1000

     - (dtucker) [ssh.c] Prevent null pointer deref in port forwarding debug
       message on some platforms.  Patch from pete at seebeyond.com via djm.

commit f3bb4341777eb44df1ca7db0d574f849821a186c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 31 21:39:25 2005 +1000

     - (dtucker) [auth.h sshd.c openbsd-compat/port-aix.c] Bug #1006: fix bug in
       handling of password expiry messages returned by AIX's authentication
       routines, originally reported by robvdwal at sara.nl.

commit 83d5a9866d590844ed78c92fe09bc862424a8c55
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 31 21:33:50 2005 +1000

       - jmc@cvs.openbsd.org 2005/03/18 17:05:00
         [sshd_config.5]
         typo;

commit 1f04ca240d8c3d988a6bdf21961343ee22f2a289
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 31 21:31:54 2005 +1000

       - markus@cvs.openbsd.org 2005/03/16 21:17:39
         [version.h]
         4.1

commit 5ede2ad8a74a66059a2bf02ae7b4867140b67874
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 31 21:31:10 2005 +1000

       - jmc@cvs.openbsd.org 2005/03/16 11:10:38
         [ssh_config.5]
         get the syntax right for {Local,Remote}Forward;
         based on a diff from markus;
         problem report from ponraj;
         ok dtucker@ markus@ deraadt@

commit 6e1defdc5a597902f6899b71e635e718ffa8a2b6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 29 23:24:12 2005 +1000

     - (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're
       interested in which is much faster in large (eg LDAP or NIS) environments.
       Patch from dleonard at vintela.com.

commit e66519d94207187a71d274ab70a6647318ed877d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 21 22:46:34 2005 +1100

     - (dtucker) [configure.ac openbsd-compat/port-aix.h] Prevent redefinitions
       of setauthdb on AIX 5.3, reported by anders.liljegren at its.uu.se.

commit 1df61452ea479323b22bd6f522e7d1f09fca5fe6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 21 09:58:07 2005 +1100

     - (dtucker) [configure.ac] Make configure error out if the user specifies
       --with-libedit but the required libs can't be found, rather than silently
       ignoring and continuing.  ok tim@

commit 86a5f8dd0afd10c8b844c81b04b436dd2bb852a3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 21 09:55:17 2005 +1100

     - (dtucker) [configure.ac] Prevent configure --with-zlib from adding -Iyes
       and -Lyes to CFLAGS and LIBS.  Pointed out by peter at slagheap.net,
       with & ok tim@

commit eae17cc80ec1083a06eaa062547b926d01b91798
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 17 16:52:20 2005 -0800

     - (tim) [configure.ac] remove trailing white space.

commit 35cc69dcb49394f8ce5950e42adc90866901256d
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 17 16:44:25 2005 -0800

     - (tim) [configure.ac] make some configure options a little more error proof.

commit 8bb561b5009dec1a763b6978aebbb26323982219
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 17 16:23:19 2005 -0800

     - (tim) [configure.ac] portability changes on test statements. Some shells
       have problems with -a operator.

commit 12ee8e241eb38308be8c1e4dd57ac7d8c02f3297
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 17 13:37:04 2005 -0800

     - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional.
       Make --without-opensc work.

commit c3939e22fdcc9c22102b8d3d894f5885105a1a04
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Mar 14 17:24:51 2005 -0800

     - (tim) [contrib/caldera/openssh.spec] links in rc?.d were getting trashed
       with a rpm -F

commit c53c3a423c659041d2935391d3108fb417f658d8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 14 23:24:43 2005 +1100

    credit patch author

commit 11327cc5d7437b17f98580f1f173918873872c0d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 14 23:22:25 2005 +1100

       - markus@cvs.openbsd.org 2005/03/14 11:46:56
         [buffer.c buffer.h channels.c]
         limit input buffer size for channels; bugzilla #896; with and ok dtucker@

commit a8f553df53bf116c16de409a0d6bc897d0a2f228
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 14 23:17:27 2005 +1100

       - dtucker@cvs.openbsd.org 2005/03/14 11:44:42
         [auth.c]
         Populate host for log message for logins denied by AllowUsers and
         DenyUsers (bz #999); ok markus@

commit da1adbc2cc0cc26a61102d9129241fcb61c33cb1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 14 23:15:58 2005 +1100

       - dtucker@cvs.openbsd.org 2005/03/14 10:09:03
         [ssh-keygen.1]
         Correct description of -H (bz #997);  ok markus@, punctuation jmc@

commit 1adc2bd8d72e7ee0c8f65f84e6f36dafe5421d12
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 14 23:14:20 2005 +1100

       - jmc@cvs.openbsd.org 2005/03/12 11:55:03
         [ssh_config.5]
         escape `.' at eol to avoid double spacing issues;

commit 9f438a9d63a346121685b9872cb220294ca22db4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 14 23:09:18 2005 +1100

       - markus@cvs.openbsd.org 2005/03/11 14:59:06
         [ssh-keygen.c]
         typo, missing \n; mpech

commit 90b9e0223049702df3ee7d2154aa9fd6a08e3467
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 14 23:08:50 2005 +1100

       - deraadt@cvs.openbsd.org 2005/03/10 22:40:38
         [auth-options.c]
         spacing

commit 47eede77ed15bd53922394cc1f5c9eb3d011ccb2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 14 23:08:12 2005 +1100

       - deraadt@cvs.openbsd.org 2005/03/10 22:01:05
         [misc.c ssh-keygen.c servconf.c clientloop.c auth-options.c ssh-add.c
         monitor.c sftp-client.c bufaux.h hostfile.c ssh.c sshconnect.c channels.c
         readconf.c bufaux.c sftp.c]
         spacing

commit f899e6a5265ac173acbac51022a2512643ec909c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 14 23:02:46 2005 +1100

    20050312
     - (dtucker) [regress/test-exec.sh] DEBUG can cause problems where debug
       output ends up in the client's output, causing regress failures.  Found
       by Corinna Vinschen.
    
    (got 4.0 branch and HEAD slightly askew, this is to resync)

commit 1d55ca748d6f1cab42aba290a0b77bd142830401
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 14 22:58:40 2005 +1100

       - dtucker@cvs.openbsd.org 2005/03/10 10:15:02
         [readconf.c]
         Check listen addresses for null, prevents xfree from dying during
         ClearAllForwardings (bz #996).  From  Craig Leres, ok markus@

commit a21380b70e0a72ce20ec8ebd4f9bb1e03134ca22
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 13 21:20:18 2005 +1100

     - (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the
       localized name of the local administrators group more reliable.  From
       vinschen at redhat.com.

commit 835903da7bc133033186765c4a31421016de0895
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 9 20:12:47 2005 +1100

     - (djm) [log.c] Fix dumb syntax error; ok dtucker@
    
    (pulled from 4.0 branch).

commit b2169235c79c3c58bdfce665136bef3da6593450
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 9 14:32:28 2005 +1100

    4.0 here too

commit aa1dba62b0513ebcd7f0d8977a46959901f5bfa4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 9 11:03:08 2005 +1100

     - (djm) Release OpenSSH 4.0p1

commit 6f632bf2aa9d8cf00d7cec479afbb6be20018c2c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 9 11:02:41 2005 +1100

     - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
       [contrib/suse/openssh.spec] Update spec file versions

commit aca8626cf7981a74f62746667af911480946ee34
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 9 11:00:42 2005 +1100

       - djm@cvs.openbsd.org 2005/03/08 23:49:48
         [version.h]
         OpenSSH 4.0

commit b096ac4674b584a3c65cfd27d17242aec64db826
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 9 11:00:05 2005 +1100

       - jmc@cvs.openbsd.org 2005/03/07 23:41:54
         [ssh.1 ssh_config.5]
         more macro simplification;

commit 50c7db92d6222a753b03a23bb041ed86febd2057
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 9 10:02:55 2005 +1100

     - (dtucker) [regress/test-exec.sh] Set BIN_SH=xpg4 on OSF1/Digital Unix/Tru64
       so that regress tests behave.  From Chris Adams.

commit c390c8dc6827effbb0b515f8d33cb9e5856d1a91
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Mar 7 01:21:37 2005 -0800

     - (tim) [configure.ac] SCO 3.2v4.2 no longer supported. This platform is
    too old and too broken.

commit 4b9ac3319e78621eb38a993c0627654c08d7c1ad
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 7 19:15:06 2005 +1100

     - (dtucker) [regress/test-exec.sh] Put SUDO in the right place.

commit 5d909f077336318267d4089f41c7deb5e4b6c64d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 7 18:35:34 2005 +1100

       - djm@cvs.openbsd.org 2005/03/04 08:48:46
         [Makefile envpass.sh]
         regress test for SendEnv config parsing bug; ok dtucker@

commit 894823ec69fbf5249c2d181e74cf42e392c623c3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 7 18:34:04 2005 +1100

       - djm@cvs.openbsd.org 2005/02/27 23:13:36
         [login-timeout.sh]
         avoid nameservice lookups in regress test; ok dtucker@

commit a0f3ba71a01428fb468ee7a6bc2fed42436c83f8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 7 18:33:02 2005 +1100

       - dtucker@cvs.openbsd.org 2005/02/27 11:33:30
         [multiplex.sh test-exec.sh sshd-log-wrapper.sh]
         Add optional capability to log output from regress commands; ok markus@
         Use with: make TEST_SSH_LOGFILE=/tmp/regress.log

commit b712fccc18b218e98bd6ef69c85308cd00a6e543
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 7 18:27:28 2005 +1100

       - david@cvs.openbsd.org 2005/01/14 04:21:18
         [Makefile test-exec.sh]
         pass the SUDO make variable to the individual sh tests; ok dtucker@ markus@

commit 68f7213a2cb1fa846d8eab215f1cde35e2abc20b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 7 18:25:53 2005 +1100

       - fgsch@cvs.openbsd.org 2004/12/10 01:31:30
         [Makefile sftp-glob.sh]
         some globbing regress; prompted and ok djm@

commit 1c56ef6ac3c7818e5c71dd1f62a9473f340be9f2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 7 17:36:18 2005 +1100

     - (dtucker) OpenBSD CVS Sync (regress/)
       - fgsch@cvs.openbsd.org 2004/12/10 01:31:30
         [Makefile]
         some globbing regress; prompted and ok djm@

commit 0d0966934eb612ac96a01fc79f570cdf4b76bb84
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 7 17:34:45 2005 +1100

     - (dtucker) [configure.ac] Disable gettext search when configuring with
       BSM audit support for the time being.  ok djm@

commit 2b59a6dad6ed7c127a2942fe941dac7092337ea4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 6 22:38:51 2005 +1100

     - (dtucker) [session.c sshd.c] Bug #125 comment #49: Send disconnect audit
       events earlier, prevents mm_request_send errors reported by Matt Goebel.

commit 3745e2bb6261b9ee9408b103b2c003f5320ceff2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Mar 6 22:31:35 2005 +1100

     - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor
       when attempting to audit disconnect events.  Reported by Phil Dibowitz.

commit f8e7accd01d216439bd76e2bd13e87f4bfa6eca2
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 5 11:22:50 2005 +1100

       - djm@cvs.openbsd.org 2005/03/04 08:48:06
         [readconf.c]
         fix SendEnv config parsing bug found by Roumen Petrov; ok dtucker@

commit b022b23584f72970c3028401e33577282371cfe7
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 5 11:22:36 2005 +1100

       - jmc@cvs.openbsd.org 2005/03/02 11:45:01
         [ssh.1]
         missing word;

commit 7ffa367a936566e35b04a8371d3e961f29429eae
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 5 11:20:40 2005 +1100

     - (djm) [contrib/cygwin/README] Improve Cygwin build documentation. Patch
       from vinschen at redhat.com

commit f8f3016f9e959e5f1220ccdcd8f5d1c48b6bdb25
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Mar 2 21:49:56 2005 -0800

     - (tim) [regress/agent-ptrace.sh] add another possible gdb error.

commit 947219e6e6d8be46d42c70239a907e4227e62d4a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 2 13:22:30 2005 +1100

       - djm@cvs.openbsd.org 2005/03/02 02:21:07
         [ssh.1]
         bz#987: mention ForwardX11Trusted in ssh.1,
         reported by andrew.benham AT thus.net; ok deraadt@

commit 89eac8010a80589bcd3abda8f253cd0cd3d2088c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 2 12:33:04 2005 +1100

       - djm@cvs.openbsd.org 2005/03/02 01:27:41
         [ssh-keygen.c]
         ignore hostnames with metachars when hashing; ok deraadt@

commit 1227d4c93c44d09694e547b62b643afa2a321a17
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 2 12:06:51 2005 +1100

       - djm@cvs.openbsd.org 2005/03/02 01:00:06
         [sshconnect.c]
         fix addition of new hashed hostnames when CheckHostIP=yes;
         found and ok dtucker@

commit 265d309ebc97447f5e710df04196e626f018cad8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 2 12:05:06 2005 +1100

       - jmc@cvs.openbsd.org 2005/03/01 18:15:56
         [ssh-keygen.1]
         sort options (no attempt made at synopsis clean up though);
         spelling (occurance -> occurrence);
         use prompt before examples;
         grammar;

commit 792c01749a754db5e2e6932869d315113c180461
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 2 12:04:50 2005 +1100

       - jmc@cvs.openbsd.org 2005/03/01 17:32:19
         [ssh-add.1]
         sort options;

commit 02faeceb5632393de553ef2b4b7d31d6f7b022c4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 2 12:04:32 2005 +1100

       - jmc@cvs.openbsd.org 2005/03/01 17:22:06
         [ssh.c]
         sync usage() w/ man SYNOPSIS;
         ok markus@

commit 27e9c5125e9a8a3d7cb5086a875a00a9eb556e90
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 2 12:04:16 2005 +1100

       - jmc@cvs.openbsd.org 2005/03/01 17:19:35
         [scp.1 sftp.1]
         add HashKnownHosts to -o list;
         ok markus@

commit 9a2fdbd0d6e13dd28612a351561adb6b32b94bd5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 2 12:04:01 2005 +1100

       - jmc@cvs.openbsd.org 2005/03/01 15:47:14
         [ssh-keyscan.1 ssh-keyscan.c]
         sort options and sync usage();

commit 4c9c6fdcfe21dcb220fb51177e6caa75e97c3d38
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 2 12:03:43 2005 +1100

       - jmc@cvs.openbsd.org 2005/03/01 15:05:00
         [ssh-keygen.1]
         whitespace;

commit 718fd4b9b8e934e3de9b7e4b153cb86a2fef5f1e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 2 12:03:23 2005 +1100

       - jmc@cvs.openbsd.org 2005/03/01 14:59:49
         [sshd.8]
         new sentence, new line;
         whitespace;

commit f8c554629057b7bc59444201ae83f1505f4c74a1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 2 12:03:05 2005 +1100

       - jmc@cvs.openbsd.org 2005/03/01 14:55:23
         [ssh_config.5]
         do not mark up punctuation;
         whitespace;

commit 36bf7dd18456a7b2b19cac55772cd6ab8225bda0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 2 12:02:47 2005 +1100

       - jmc@cvs.openbsd.org 2005/03/01 14:47:58
         [ssh.1]
         remove some unneccesary macros;
         do not mark up punctuation;

commit 4b42d7f195fc38bc6eda25c2e0782321ff1f2a16
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 1 21:48:35 2005 +1100

       - djm@cvs.openbsd.org 2005/03/01 10:42:49
         [ssh-keygen.1 ssh-keygen.c ssh_config.5]
         add tools for managing known_hosts files with hashed hostnames, including
         hashing existing files and deleting hosts by name; ok markus@ deraadt@

commit db7b8171ee084cbbe3a5ec5ef26df88e17aa3905
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 1 21:48:03 2005 +1100

       - djm@cvs.openbsd.org 2005/03/01 10:41:28
         [ssh-keyscan.1 ssh-keyscan.c]
         option to hash hostnames output by ssh-keyscan; ok markus@ deraadt@

commit e1776155d19db4f3ab2ff42323d6499f0712cfa4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 1 21:47:37 2005 +1100

       - djm@cvs.openbsd.org 2005/03/01 10:40:27
         [hostfile.c hostfile.h readconf.c readconf.h ssh.1 ssh_config.5]
         [sshconnect.c sshd.8]
         add support for hashing host names and addresses added to known_hosts
         files, to improve privacy of which hosts user have been visiting; ok
         markus@ deraadt@

commit f91ee4c3def4de8b4b9409f07ab26a61e535e1e6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 1 21:24:33 2005 +1100

       - djm@cvs.openbsd.org 2005/03/01 10:09:52
         [auth-options.c channels.c channels.h clientloop.c compat.c compat.h]
         [misc.c misc.h readconf.c readconf.h servconf.c ssh.1 ssh.c ssh_config.5]
         [sshd_config.5]
         bz#413: allow optional specification of bind address for port forwardings.
         Patch originally by Dan Astorian, but worked on by several people
         Adds GatewayPorts=clientspecified option on server to allow remote
         forwards to bind to client-specified ports.

commit 1717fd422f2c5691d745a7daf6908df9a6458904
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 1 21:17:31 2005 +1100

       - djm@cvs.openbsd.org 2005/02/28 00:54:10
         [ssh_config.5]
         bz#849: document timeout on untrusted x11 forwarding sessions. Reported by
         orion AT cora.nwra.com; ok markus@

commit 70a908ec89b8bd5feb14abed5957ebb063796e94
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 1 21:17:09 2005 +1100

       - jmc@cvs.openbsd.org 2005/02/25 10:55:13
         [sshd.8]
         add /etc/motd and $HOME/.hushlogin to FILES;
         from michael knudsen;

commit 64e8d44fbd556c7a78bba1d8ff3bee5b07b2440d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 1 21:16:47 2005 +1100

       - djm@cvs.openbsd.org 2005/02/20 22:59:06
         [sftp.c]
         turn on ssh batch mode when in sftp batch mode, patch from
         jdmossh AT nand.net;
         ok markus@

commit 9b8073e1e0900fd9ebe3a5843b4fe5a606b4dab0
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 1 21:16:18 2005 +1100

       - djm@cvs.openbsd.org 2005/02/18 03:05:53
         [canohost.c]
         better error messages for getnameinfo failures; ok dtucker@

commit 3eb48b62457b78a9308d10e5b968e85c2bc18525
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 1 21:15:46 2005 +1100

       - otto@cvs.openbsd.org 2005/02/16 09:56:44
         [ssh.c]
         Better diagnostic if an identity file is not accesible. ok markus@ djm@

commit dc8fc621036147ff43f3fb1e8a1aa0d8026e5208
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Feb 26 10:12:38 2005 +1100

     - (dtucker) [Makefile.in] Add a install-nosysconf target for installing the
       binaries without the config files.  Primarily useful for packaging.
       Patch from phil at usc.edu.  ok djm@

commit 3804903a094f41d09e8b294dbd69a846dcf7fe94
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Feb 26 10:07:37 2005 +1100

     - (dtucker) [acconfig.h configure.ac openbsd-compat/bsd-misc.{c,h}]
       Remove SETGROUPS_NOOP, was only used by Cygwin, which doesn't need it any
       more.  Patch from vinschen at redhat.com.

commit 34233830a1f42e95ddad5ff1cff9f9024d422861
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Feb 26 10:04:28 2005 +1100

     - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c]
       Remove two obsolete Cygwin #ifdefs.  Patch from vinschen at redhat.com.

commit 848b99363987c3cc7abffb182d519dbea8c4f8ab
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 24 12:12:34 2005 +1100

     - (djm) [configure.ac] in_addr_t test needs sys/types.h too

commit 2ea9b18918162bd17758f1480247c9fa4e75e418
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 22 17:57:13 2005 +1100

     - (dtucker) [uidswap.c] Skip uid restore test on Cygwin.  Patch from
       vinschen at redhat.com.

commit 04cfbe04aaa0ff43c3e8f131c858411e1b0151a2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 20 23:27:11 2005 +1100

     - (dtucker) [configure.ac] Missing comma in AIX section, somehow causes
       unrelated platforms to be configured incorrectly.

commit 8fe079451161b6b478dc686f43d8fe455974b4f8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 20 21:08:00 2005 +1100

     - (dtucker) [LICENCE Makefile.in README.platform audit-bsm.c configure.ac
       defines.h] Bug #125: Add *EXPERIMENTAL* BSM audit support.  Configure
       --with-audit=bsm to enable.  Patch originally from Sun Microsystems,
       parts by John R. Jackson.  ok djm@

commit d9f88915a2f2e7fe738799122ac288b5b1a13547
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 20 21:01:48 2005 +1100

     - (dtucker) [LICENCE Makefile.in README.platform audit-bsm.c configure.ac
       defines.h] Bug #125: Add *EXPERIMENTAL* BSM audit support.  Configure
       --with-audit=bsm to enable.  Patch originally from Sun Microsystems,
       parts by John R. Jackson.  ok djm@

commit 3c774c52f31b54eccb5a936470d21d196968693b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 16 22:49:31 2005 +1100

     - (dtucker) [configure.ac openbsd-compat/port-aix.{c,h}] Silence some more
       compiler warnings on AIX.

commit c97b01af62fa73b31a5b0c86c21c3347cdd0874d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 16 16:47:37 2005 +1100

     - (dtucker) [session.c] Bug #918: store credentials from gssapi-with-mic
       authentication early enough to be available to PAM session modules when
       privsep=yes.  Patch from deengert at anl.gov, ok'ed in principle by Sam
       Hartman and similar to Debian's ssh-krb5 package.

commit ca6e7a7e8b6cc828f5df96b180d03e7ca1179fca
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 16 16:19:17 2005 +1100

     - (dtucker) [configure.ac] Bug #893: check for libresolv early on Reliant
       Unix; prevents problems relating to the location of -lresolv in the
       link order.

commit a91f5ee6185fa2e77a17d0e72f8ada94f57e3409
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 16 14:20:06 2005 +1100

     - (dtucker) [auth-shadow.c] Prevent compiler warnings if "DAY" is defined
       by the system headers.

commit 7a8619aebbef6f543212a01e65f0946cabf72adc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 16 13:32:30 2005 +1100

    Document the path to seed_rng better

commit 7b48d25527c372a6a5017897c7617a05d5f1e68e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 16 13:20:07 2005 +1100

     - (dtucker) [ssh-rand-helper.c] Provide seed_rng since it may be called
       via mkstemp in some configurations.  ok djm@

commit ed462d9a4557a400266c43d13fd6fa0ec8c7d9ea
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 16 13:02:45 2005 +1100

    write seed to temporary file and atomically rename into place; ok dtucker@

commit 66df70c97d189fb8bdf35a66b42f62bcc0a6e4da
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 16 13:01:28 2005 +1100

    knf: function names at start of line

commit e13eace5220ac5badc15220272d36edacc9f8cea
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 15 22:44:05 2005 +1100

    IPv6 works on AIX5.1ML7 too.

commit a39f83eeee3f7bb35e86d92f5a802fe84f1b6a9d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 15 22:19:28 2005 +1100

     - (dtucker) [loginrec.c] Add missing #include.

commit 691d5235ca9485877e8345269b1be4b2cf1be322
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 15 21:45:57 2005 +1100

     - (dtucker) [README.platform auth.c configure.ac loginrec.c
       openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Bug #835: enable IPv6
       on AIX where possible (see README.platform for details) and work around
       a misfeature of AIX's getnameinfo.  ok djm@

commit f04c3616756831fe987fe3e474c8c234c298e4cb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 15 21:26:32 2005 +1100

     - (dtucker) [config.sh.in] Collect oslevel -r too.

commit 15af68f767e31d07c474c37d6af7cadcbcdb82ce
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 11 18:32:13 2005 +1100

     - (dtucker) [openbsd-compat/fake-rfc2553.h] We now need EAI_SYSTEM too.

commit 1b6f2291e4adf4d3e7e81d35194b1ad7751270f2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 11 16:11:49 2005 +1100

     - (dtucker) [configure.ac] Tidy up configure --help output.

commit 2f9573df714b221acbf92f8b48645849475136fa
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 10 22:28:54 2005 +1100

     - (dtucker) [configure.ac] Bug #919: Provide visible feedback for the
       --disable-etc-default-login configure option.

commit 33370e0287649c135eef8e7a0e22aee754deeac5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 9 22:17:28 2005 +1100

     - (dtucker) [configure.ac session.c] Some platforms (eg some SCO) require
       the username to be passed to the passwd command when changing expired
       passwords.  ok djm@

commit c7e38d59e906dcb8028deccac6793463c5ca8f5c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 9 22:12:30 2005 +1100

     - (dtucker) [configure.ac] Bug #854: prepend pwd to relative --with-ssl-dir
       paths.  ok djm@

commit 92170a862634bf9ebe958cc75911658d18e30538
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 9 17:08:23 2005 +1100

     - (dtucker) [auth-passwd.c openbsd-compat/port-aix.c] Don't call
       disable_forwarding() from compat library. Prevent linker errrors trying
       to resolve it for binaries other than sshd.  ok djm@

commit 96d4710e3838af8c03a55ce37913568877dd0283
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 9 09:53:48 2005 +1100

       - dtucker@cvs.openbsd.org 2005/02/08 22:24:57
         [sshd.c]
         Provide reason in error message if getnameinfo fails; ok markus@

commit 5b53026f719bc0b2fc13a58ea0b6a0385e373bec
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 9 09:52:17 2005 +1100

       - dtucker@cvs.openbsd.org 2005/01/30 11:18:08
         [monitor.c]
         Make code match intent; ok djm@

commit 43d8e28763afaf066de803d63d832884c59e4160
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 9 09:51:08 2005 +1100

       - jmc@cvs.openbsd.org 2005/01/28 18:14:09
         [ssh_config.5]
         wording;
         ok markus@

commit 79a7acfebd56f0d804cfa9ea04c2959b104d27d9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 9 09:48:57 2005 +1100

       - jmc@cvs.openbsd.org 2005/01/28 15:05:43
         [ssh_config.5]
         grammar;

commit 3f166dfcb553eacf46b3a02e72c26651d79471ef
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 9 09:46:47 2005 +1100

       - dtucker@cvs.openbsd.org 2005/01/28 09:45:53
         [ssh_config]
         Make it clear that the example entries in ssh_config are only some of the
         commonly-used options and refer the user to ssh_config(5) for more
         details; ok djm@

commit 2e0cf0dca20e56eb5d95a80ba0004769c5bc4ba7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 8 21:52:47 2005 +1100

     - (dtucker) [audit.c audit.h auth.c auth1.c auth2.c loginrec.c monitor.c
       monitor_wrap.c monitor_wrap.h session.c sshd.c]: Prepend all of the audit
       defines and enums with SSH_ to prevent namespace collisions on some
       platforms (eg AIX).

commit b4d3012d2e9a0eb53c56565108c8278e45cefc77
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 8 21:06:55 2005 +1100

     - (dtucker) [openbsd-compat/port-aix.c] Silence compiler warnings.

commit feb6f7f24424105e649dbb2b3433352eb29b6764
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 8 20:17:17 2005 +1100

     - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the
       regress tests so newer versions of GNU head(1) behave themselves.  Patch
       by djm, so ok me.

commit 40d9a63788e66d3d330fbf76fbdfd9cc437cb334
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 4 15:19:44 2005 +1100

     - (dtucker) [auth.c] Fix parens in audit log check.

commit 598ba7b5e20e8b4cb023069ad86a97b4032aa3da
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 4 15:05:08 2005 +1100

     - (dtucker) [monitor.c] Permit INVALID_USER audit events from slave too.

commit 6dce99142b894d5ff62ede7a06f504e7c24d5d0a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 3 15:07:37 2005 +1100

    typo

commit b15931ae5b24c00888e1db6c4d456b1bb4e434da
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 3 00:37:14 2005 +1100

     - (dtucker) [added audit.c audit.h] Bug #125: (first stage) Add audit
       instrumentation to sshd, currently disabled by default.  with suggestions
       from and djm@

commit 269a1ea1c80a855d1eb74fccba6dd5c75947c5d2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Feb 3 00:20:53 2005 +1100

     - (dtucker) [Makefile.in auth.c auth.h auth1.c auth2.c loginrec.c monitor.c
       monitor.h monitor_wrap.c monitor_wrap.h session.c sshd.c] Bug #125:
       (first stage) Add audit instrumentation to sshd, currently disabled by
       default.  with suggestions from and djm@

commit 2fba993080eba14e339d6a6666ee79580ee20f97
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 2 23:30:24 2005 +1100

     - (dtucker) [auth.c canohost.c canohost.h configure.ac defines.h loginrec.c]
       Bug #974: Teach sshd to write failed login records to btmp for failed auth
       attempts (currently only for password, kbdint and C/R, only on Linux and
       HP-UX), based on code from login.c from util-linux. With ashok_kovai at
       hotmail.com, ok djm@

commit 9dc6c7dbec0716157e561036c480bca1bc3c7e47
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 2 18:30:33 2005 +1100

     - (dtucker) [session.c sshd.c] Bug #445: Propogate KRB5CCNAME if set to child
       the process.  Since we also unset KRB5CCNAME at startup, if it's set after
       authentication it must have been set by the platform's native auth system.
       This was already done for AIX; this enables it for the general case.

commit 42d9dc75ed2eefa6eeffc892f02eb164c1860603
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 2 17:10:11 2005 +1100

     - (dtucker) [auth.c loginrec.h openbsd-compat/{bsd-cray,port-aix}.{c,h}]
       Make record_failed_login() call provide hostname rather than having the
       implementations having to do lookups themselves.  Only affects AIX and
       UNICOS (the latter only uses the "user" parameter anyway).  ok djm@

commit ad7646a59ab05ed9d6c156ba952725f44c02de7d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 2 10:43:59 2005 +1100

     - (dtucker) [configure.ac openbsd-compat/realpath.c] Sync up with realpath
       rev 1.11 from OpenBSD and make it use fchdir if available.  ok djm@

commit 9dca099aec9ce1a5c67e2c0f737871c1e3126b90
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 1 19:16:45 2005 +1100

     - (dtucker) [sshd_config.5] Bug #701: remove warning about
       keyboard-interactive since this is no longer the case.

commit 9b5495d23ee28fa77dc58a31953d3f6f86d5baa1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 1 17:35:09 2005 +1100

     - (dtucker) [log.c] Bug #973: force log_init() to open syslog, since on some
       platforms syslog will revert to its default values.  This may result in
       messages from external libraries (eg libwrap) being sent to a different
       facility.

commit 218f178cb20c276027e972bff0208043fcf533a3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 24 22:50:47 2005 +1100

       - dtucker@cvs.openbsd.org 2005/01/24 11:47:13
         [auth-passwd.c]
         #if -> #ifdef so builds without HAVE_LOGIN_CAP work too; ok djm@ otto@

commit 1b7223c00552baefe032c3b4da9989738df5f0f9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 24 22:00:40 2005 +1100

       - dtucker@cvs.openbsd.org 2005/01/24 10:29:06
         [moduli]
         Import new moduli; requested by deraadt@ a week ago

commit ba66df81a38c42c9e7419d1a564be9ae17b62268
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 24 21:57:40 2005 +1100

       - dtucker@cvs.openbsd.org 2005/01/24 10:22:06
         [scp.c sftp.c]
         Have scp and sftp wait for the spawned ssh to exit before they exit
         themselves.  This prevents ssh from being unable to restore terminal
         modes (not normally a problem on OpenBSD but common with -Portable
         on POSIX platforms).  From peak at argo.troja.mff.cuni.cz (bz#950);
         ok djm@ markus@

commit 660db78af227f26c6e1ee4ca795400cd7b8ac056
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 24 21:57:11 2005 +1100

       - djm@cvs.openbsd.org 2005/01/23 10:18:12
         [cipher.c]
         config option "Ciphers" should be case-sensitive; ok dtucker@

commit 094cd0ba02a3a29f170227dc0219e08c006c9b86
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 24 21:56:48 2005 +1100

       - dtucker@cvs.openbsd.org 2005/01/22 08:17:59
         [auth.c]
         Log source of connections denied by AllowUsers, DenyUsers, AllowGroups and
         DenyGroups.  bz #909, ok djm@

commit 5c14c734295b9a30d71d110deb8307d5610d4c01
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 24 21:55:49 2005 +1100

       - otto@cvs.openbsd.org 2005/01/21 08:32:02
         [auth-passwd.c sshd.c]
         Warn in advance for password and account expiry; initialize loginmsg
         buffer earlier and clear it after privsep fork. ok and help dtucker@
         markus@

commit 3c66080aa26e5121805c80728a9c801b08a7870e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 20 22:20:50 2005 +1100

     - (dtucker) [auth-chall.c auth.h auth2-chall.c] Bug #936: Remove pam from
       the list of available kbdint devices if UsePAM=no.  ok djm@

commit 33bc334a8bb6f20ca659f7d4f4669a04d54bd2e8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 20 22:07:29 2005 +1100

     - (dtucker) [loginrec.h] Bug #952: Increase size of username field to 128
       bytes to prevent errors from login_init_entry() when the username is
       exactly 64 bytes(!) long.  From brhamon at cisco.com, ok djm@

commit d5bfa8f9d84b1abada09333994c8c889551a61fb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 20 13:29:51 2005 +1100

    Oops, did not intend to commit this yet

commit d231186fd0acb8fee480faf61c4e9e4cc6186faf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 20 13:27:56 2005 +1100

       - djm@cvs.openbsd.org 2004/12/22 02:13:19
         [cipher-ctr.c cipher.c]
         remove fallback AES support for old OpenSSL, as OpenBSD has had it for
         many years now; ok deraadt@
         (Id sync only: Portable will continue to support older OpenSSLs)

commit 36a3d60347f23528695e550317d5ba6d63e6b0f4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 20 12:43:38 2005 +1100

     - (dtucker) [auth-pam.c] Bug #971: Prevent leaking information about user
       existence via keyboard-interactive/pam, in conjunction with previous
       auth2-chall.c change; with Colin Watson and djm.

commit 611649ebf093bf030f2dde18103dde8c1af9226c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 20 11:05:34 2005 +1100

       - dtucker@cvs.openbsd.org 2005/01/19 13:11:47
         [auth-bsdauth.c auth2-chall.c]
         Have keyboard-interactive code call the drivers even for responses for
         invalid logins.  This allows the drivers themselves to decide how to
         handle them and prevent leaking information where possible.  Existing
         behaviour for bsdauth is maintained by checking authctxt->valid in the
         bsdauth driver.  Note that any third-party kbdint drivers will now need
         to be able to handle responses for invalid logins.  ok markus@

commit ea7c8127ce64879f81d6267897162a2fbf173124
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 20 11:03:08 2005 +1100

       - dtucker@cvs.openbsd.org 2005/01/17 22:48:39
         [sshd.c]
         Make debugging output continue after reexec; ok djm@

commit f0e792ec1c84322e5e31c2ad2c89459f053c3388
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 20 11:02:26 2005 +1100

       - dtucker@cvs.openbsd.org 2005/01/17 03:25:46
         [moduli.c]
         Correct spelling: SCHNOOR->SCHNORR; ok djm@

commit b3509014cec85818fb74d3b90073f3ca8745253e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 20 11:01:46 2005 +1100

       - jmc@cvs.openbsd.org 2005/01/08 00:41:19
         [sshd_config.5]
         `login'(n) -> `log in'(v);

commit b2161e37f5fb13ffaa3f70ad436ecec2ec13bfc4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 20 11:00:46 2005 +1100

       - markus@cvs.openbsd.org 2005/01/05 08:51:32
         [sshconnect.c]
         remove dead code, log connect() failures with level error, ok djm@

commit 0f3832322230ebc4b0fe5a2aca5cf9aaa8b0c3c1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 20 10:57:56 2005 +1100

       - djm@cvs.openbsd.org 2004/12/23 23:11:00
         [servconf.c servconf.h sshd.c sshd_config sshd_config.5]
         bz #898: support AddressFamily in sshd_config. from
         peak@argo.troja.mff.cuni.cz; ok deraadt@

commit 7cfeecf67008d5135718806fab6bda7f353e5f59
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 20 10:56:31 2005 +1100

       - markus@cvs.openbsd.org 2004/12/23 17:38:07
         [ssh-keygen.c]
         leak; from mpech

commit 172a5e8cb8028bd6dc8596ea5f08f118d0d61799
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 20 10:55:46 2005 +1100

       - markus@cvs.openbsd.org 2004/12/23 17:35:48
         [session.c]
         check for NULL; from mpech

commit 24c710e498a93c15c3071e833a3e357576ee6d2c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 18 12:45:42 2005 +1100

     - (dtucker) [survey.sh.in] Remove any blank lines from the output of
       ccver-v and ccver-V.

commit 72c025d9f0f494d6816f045819b9be05fc915730
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 18 12:05:18 2005 +1100

     - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement
       "make survey" and "make send-survey".  This will provide data on the
       configure parameters, platform and platform features to the development
       team, which will allow (among other things) better targetting of testing.
       It's entirely voluntary and is off be default. ok djm@

commit 5caa78b1b7f086329b2102821a1e09512740dd61
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 20 12:35:42 2004 +1100

     - (dtucker) [regress/rekey.sh] Touch datafile before filling with dd, since
       on some wacky platforms (eg old AIXes), dd will refuse to create an output
       file if it doesn't exist.

commit 8686ed75081958714f5d7768b5b0b8bcdd86b0ff
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 20 12:05:08 2004 +1100

     - (dtucker) [ssh-rand-helper.c] Fall back to command-based seeding if reading
       from prngd is enabled at compile time but fails at run time, eg because
       prngd is not running.  Note that if you have prngd running when OpenSSH is
       built, OpenSSL will consider itself internally seeded and rand-helper won't
       be built at all unless explicitly enabled via --with-rand-helper.  ok djm@

commit 442a383418dc3eb1809e66c966933071034d5325
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 13 18:08:32 2004 +1100

     - (dtucker) [contrib/findssh.sh] Clean up on interrupt; from
       amarendra.godbole at ge com.

commit f0f90989fa7c22ab86ae7957b3af539584be375c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Dec 11 13:39:50 2004 +1100

       - dtucker@cvs.openbsd.org 2004/12/11 01:48:56
         [auth-rsa.c auth2-pubkey.c authfile.c misc.c misc.h]
         Fix debug call in error path of authorized_keys processing and fix related
         warnings; ok djm@

commit 596dcfa21fba253b25020be8578efb6a1a1e30d2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Dec 11 13:37:22 2004 +1100

       - fgsch@cvs.openbsd.org 2004/12/10 03:10:42
         [sftp.c]
         - fix globbed ls for paths the same lenght as the globbed path when
           we have a unique matching.
         - fix globbed ls in case of a directory when we have a unique matching.
         - as a side effect, if the path does not exist error (used to silently
           ignore).
         - don't do extra do_lstat() if we only have one matching file.
         djm@ ok

commit 56c9598e5edacbb45d155eebafb3480c6efb7382
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Dec 11 13:34:56 2004 +1100

     - (dtucker) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2004/12/06 16:00:43
         [bufaux.c]
         use 0x00 not \0 since buf[] is a bignum

commit 0f83d2907cc227b46ebd3e9771534b2c50cbd139
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Dec 8 18:29:58 2004 -0800

    [configure.ac] Comment some non obvious platforms in the target-specific
    case statement. Suggested and OK by dtucker@

commit 641b34c72b8509283b04c7f78e1ef88f25b8cb9b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 7 11:26:15 2004 +1100

     - (dtucker) [regress/scp.sh] Use portable-friendly $DIFFOPTs in new test.

commit d028fea13a24c2728e00bba98e7ff73a0470792d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 23:16:29 2004 +1100

       - dtucker@cvs.openbsd.org 2004/12/06 10:49:56
         [test-exec.sh]
         Check if TEST_SSH_SSHD is a full path to sshd before searching; ok markus@

commit cc0603d4b6421fa3ce23c273bc254f5dd0a6f0f6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 23:13:50 2004 +1100

       - dtucker@cvs.openbsd.org 2004/11/25 09:39:27
         [test-exec.sh]
         Remove obsolete RhostsAuthentication from test config; ok markus@

commit 79ec66e980ff830b8503dc4bde9c022b23c7825c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 23:12:15 2004 +1100

       - djm@cvs.openbsd.org 2004/11/07 00:32:41
         [multiplex.sh]
         regression tests for new multiplex commands

commit 124f58ecba39525af88e0619105656d383e515ff
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 23:07:37 2004 +1100

       - djm@cvs.openbsd.org 2004/10/29 23:59:22
         [Makefile added brokenkeys.sh]
         regression test for handling of corrupt keys in authorized_keys file

commit 71b5643598d301a1a03c4845ff0eb159998a5fcf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 23:05:52 2004 +1100

       - djm@cvs.openbsd.org 2004/10/08 02:01:50
         [reexec.sh]
         shrink and tidy; ok dtucker@

commit 3206e57e935870eb9a00a8aef3f3f1e70295b88d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 23:04:57 2004 +1100

       - david@cvs.openbsd.org 2004/07/09 19:45:43
         [Makefile]
         add a missing CLEANFILES used in the re-exec test

commit ccf077918587d9f881dd31577e2129d301572b13
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 23:03:27 2004 +1100

       - dtucker@cvs.openbsd.org 2004/07/08 12:59:35
         [scp.sh]
         Regress test for bz #863 (scp double-error), requires $SUDO.  ok markus@

commit a372960fa9b7a6723910205bf8c05243076ff0ee
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 23:00:27 2004 +1100

       - djm@cvs.openbsd.org 2004/06/26 06:16:07
         [reexec.sh]
         don't change the name of the copied sshd for the reexec fallback test,
         makes life simpler for portable

commit c0dc1c9bfa127516b8758c1ee1ba3cbd29359ad2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 22:58:11 2004 +1100

    Resync Ids

commit 22cc741096c85ff211dfc4c910fd28ec4858ba83
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 22:47:41 2004 +1100

       - dtucker@cvs.openbsd.org 2004/12/06 11:41:03
         [auth-rsa.c auth2-pubkey.c authfile.c misc.c misc.h ssh.h sshd.8]
         Discard over-length authorized_keys entries rather than complaining when
         they don't decode.  bz #884, with & ok djm@

commit 16e254d17934437a811e0019107ad53cdea8eb76
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 22:46:45 2004 +1100

       - jaredy@cvs.openbsd.org 2004/12/05 23:55:07
         [sftp.1]
         - explain that patterns can be used as arguments in get/put/ls/etc
           commands (prodded by Michael Knudsen)
         - describe ls flags as a list
         - other minor improvements
         ok jmc, djm

commit e2f189a841c9beecae75a2df3784d73f9e6dd762
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 22:45:53 2004 +1100

       - djm@cvs.openbsd.org 2004/11/29 07:41:24
         [sftp-client.h sftp.c]
         Some small fixes from moritz@jodeit.org. ok deraadt@

commit 0133a727acc7db7bd5a733ca0bed8a06a112f389
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 22:44:32 2004 +1100

       - jmc@cvs.openbsd.org 2004/11/29 00:05:17
         [sftp.1]
         missing full stop;

commit cd516efea147ef64f0b3d0be3e3c94b450c11c24
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 22:43:43 2004 +1100

     - (dtucker) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2004/11/25 22:22:14
         [sftp-client.c sftp.c]
         leak; from mpech

commit ba2abb3699d5901898041dad45394e47de891cc9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Dec 6 22:40:10 2004 +1100

     - (dtucker) [TODO WARNING.RNG] Update to reflect current reality.  ok djm@

commit c13866719fc39d5feebfb80ca251a7b31583d803
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 3 14:33:47 2004 +1100

     - (dtucker) [auth1.c auth2.c] If the user successfully authenticates but is
       subsequently denied by the PAM auth stack, send the PAM message to the
       user via packet_disconnect (Protocol 1) or userauth_banner (Protocol 2).
       ok djm@

commit 9c6bf325c0cf03fc40e87e51d165189dce07c594
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 3 14:10:19 2004 +1100

       - jmc@cvs.openbsd.org 2004/11/07 17:57:30
         [ssh.c]
         usage():
         - add -O
         - sync -S w/ manpage
         - remove -h

commit e04644c162fba4f229ef5878bca74a7e37c0e79a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 3 14:08:45 2004 +1100

     - (dtucker) OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2004/11/07 17:42:36
         [ssh.1]
         options sort, and whitespace;

commit 16bcc1c92e6baa0a32efe105c58b6d6242331d10
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Nov 7 20:14:34 2004 +1100

     - (dtucker) [INSTALL Makefile.in configure.ac] Add --with-libedit configure
       option and supporting makefile bits and documentation.

commit 7ebfc10884da0e430966cb323f57de17397f64bc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Nov 7 20:06:19 2004 +1100

       - djm@cvs.openbsd.org 2004/11/07 00:01:46
         [clientloop.c clientloop.h ssh.1 ssh.c]
         add basic control of a running multiplex master connection; including the
         ability to check its status and request it to exit; ok markus@

commit 2d963d87210c6a0c5eadfa5f02c808f6d983b47e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Nov 7 20:04:10 2004 +1100

       - djm@cvs.openbsd.org 2004/11/05 12:19:56
         [sftp.c]
         command editing and history support via libedit; ok markus@
         thanks to hshoexer@ and many testers on tech@ too

commit 08d04faf2457e80b65b798f46bc71ac5a81b6d27
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:42:28 2004 +1100

       - djm@cvs.openbsd.org 2004/10/29 23:57:05
         [key.c]
         use new buffer API to avoid fatal errors on corrupt keys in authorized_keys
         files; ok markus@

commit 50dbe8314b1796d05e12c1a8a9b9c8b3242d8c5a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:41:24 2004 +1100

       - djm@cvs.openbsd.org 2004/10/29 23:56:17
         [bufaux.c bufaux.h buffer.c buffer.h]
         introduce a new buffer API that returns an error rather than fatal()ing
         when presented with bad data; ok markus@

commit ce327b62ac28cb6a605fd827a97d978ea31e2860
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:38:03 2004 +1100

       - djm@cvs.openbsd.org 2004/10/29 22:53:56
         [clientloop.c misc.h readpass.c ssh-agent.c]
         factor out common permission-asking code to separate function; ok markus@

commit 5d78de628376f55fd2fc5acad14733cf90867425
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:35:44 2004 +1100

       - djm@cvs.openbsd.org 2004/10/29 21:47:15
         [channels.c channels.h clientloop.c]
         fix some window size change bugs for multiplexed connections: windows sizes
         were not being updated if they had changed after ~^Z suspends and SIGWINCH
         was not being processed unless the first connection had requested a tty;
         ok markus

commit b2694f0e8a54112200f2638f01b622f603dd125f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:27:54 2004 +1100

       - markus@cvs.openbsd.org 2004/10/20 11:48:53
         [packet.c ssh1.h]
         disconnect for invalid (out of range) message types.

commit 1dee8683fb86b7840787ea29e40f5c18abca7eac
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:26:49 2004 +1100

       - djm@cvs.openbsd.org 2004/10/07 10:12:36
         [ssh-agent.c]
         don't unlink agent socket when bind() fails, spotted by rich AT
         rich-paul.net, ok markus@

commit 636ca9024742cde37769f87bf4d19b2405720222
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:22:00 2004 +1100

       - djm@cvs.openbsd.org 2004/10/07 10:10:24
         [scp.1 sftp.1 ssh.1 ssh_config.5]
         document KbdInteractiveDevices; ok markus@

commit 3269b13817f7da680a4da4a00b13948ccbb17a22
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:20:59 2004 +1100

       - djm@cvs.openbsd.org 2004/09/25 03:45:14
         [sshd.c]
         these printf args are no longer double; ok deraadt@ markus@

commit 39207a46b4b0d3d9c3ef8d03e9d3c6d5e11df9ec
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:19:51 2004 +1100

       - djm@cvs.openbsd.org 2004/09/23 13:00:04
         [ssh.c]
         correctly honour -n in multiplex client mode; spotted by sturm@ ok markus@

commit f30e1acc62f884f59779d0cdc5d74933934443c4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:10:02 2004 +1100

       - deraadt@cvs.openbsd.org 2004/09/15 18:46:04
         [scp.c]
         scratch that do { } while (0) wrapper in this case

commit 178fa66a6451d890083d2441a2de207bdb74a348
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:09:09 2004 +1100

       - mickey@cvs.openbsd.org 2004/09/15 18:42:27
         [sshd.c]
         use less doubles in daemons; markus@ ok

commit 7cc5c23817e35938a1004e6815936f8e7baa94a2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:06:59 2004 +1100

       - jaredy@cvs.openbsd.org 2004/09/15 03:25:41
         [sshd_config.5]
         mention PrintLastLog only prints last login time for interactive
         sessions, like PrintMotd mentions.
         From Michael Knudsen, with wording changed slightly to match the
         PrintMotd description.
         ok djm

commit e9bf98412e41a9f18beb9c3e842d02259ddd8c67
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:05:32 2004 +1100

       - deraadt@cvs.openbsd.org 2004/09/15 00:46:01
         [ssh.c]
         /* fallthrough */ is something a programmer understands.  But
         /* FALLTHROUGH */ is also understood by lint, so that is better.

commit 07336dae9491062f32ca93ec3ccd4b17774bdd00
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:02:16 2004 +1100

       - djm@cvs.openbsd.org 2004/09/07 23:41:30
         [clientloop.c ssh.c]
         cleanup multiplex control socket on SIGHUP too, spotted by sturm@
         ok markus@ deraadt@

commit 4e4fe0052c3d61db171c673f8d6c58cb44d9d123
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:01:03 2004 +1100

       - jmc@cvs.openbsd.org 2004/08/30 21:22:49
         [ssh-add.1 ssh.1]
         .Xsession -> .xsession;
         originally from a pr from f at obiit dot org, but missed by myself;
         ok markus@ matthieu@

commit c016134588322411b449dc7dcffc2a0a8522bc6e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Nov 5 20:00:03 2004 +1100

       - markus@cvs.openbsd.org 2004/08/30 09:18:08
         [LICENCE]
         s/keygen/keyscan/

commit a56f191ef1e9517c97426e9b944e4feb94294fe2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 2 20:30:54 2004 +1100

     - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX
       10.x by testing for conflicts in shadow.h and undef'ing _INCLUDE__STDC__
       only if a conflict is detected.

commit 35beaddc7e86a47d782d5b69b26e940d2a8b6f73
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 19 16:33:33 2004 +1000

     - (dtucker) [uidswap.c] Don't test dropping of gids for the root user or
       on Cygwin.  Cygwin parts from vinschen at redhat com; ok djm@

commit 0e035d816a1d08ae2cf1b49916c5bb6d4ac62a6d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 16 18:53:28 2004 +1000

    that was "ok dtucker@"

commit daffc6a1152ccebdd6eb70a029e28cc5949110d7
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 16 18:52:44 2004 +1000

     - (djm) [auth-pam.c] snprintf->strl*, fix server message length calculations

commit dbc2296e2c4af222f079cb400d75797b566caab6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 6 23:15:44 2004 +1000

     - (dtucker) [monitor_mm.c openbsd-compat/xmmap.c] Bug #940: cast constants
       to void * to appease picky compilers (eg Tru64's "cc -std1").

commit b7d55e3eb564246a853039fd7d2940b79eb0068d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 6 20:09:32 2004 +1000

     - (dtucker) [README.privsep] Bug #939: update info about HP-UX Trusted Mode
       and other PAM platforms.

commit 59f79c4014dbaa927ebf15d893fa58b15108ef61
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 30 21:17:08 2004 +1000

     - (dtucker) [configure.ac] Set AC_PACKAGE_NAME.  ok djm@

commit 4127f559ada4573e66c0e55dc920147d73e48974
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 23 21:35:09 2004 +1000

     - (dtucker) [openbsd-compat/bsd-snprintf.c] Previous change was off by one,
       which could have caused the justification to be wrong.  ok djm@

commit 5d596139d43743004524a23693851211d3327718
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 21 21:35:55 2004 +1000

     - (dtucker) [contrib/cygwin/ssh-host-config] Update to match current Cygwin
       install process.  Patch from vinschen at redhat.com.

commit 50fbb45dbd2f95f95c959dc03663b213b4aac2aa
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 21 21:32:12 2004 +1000

     - (dtucker) [openbsd-compat/bsd-snprintf.c] Check for max length too.
       ok djm@

commit 623d92f0b2ce0205d0762147cd6ecac4f922f3de
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 12 22:36:15 2004 +1000

     - (dtucker) [configure.ac] Fix incorrect quoting and tests for cross-compile.
       Partly by & ok djm@.

commit 2aa6d3cfce738f57c31ae676e11399382bd5660e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 12 16:53:04 2004 +1000

     - (djm) [ssh.c sshd.c version.h] Don't divulge portable version in protocol
       banner. Suggested by deraadt@, ok mouring@, dtucker@

commit b0aae333fdecf769da6e693e63d6905713bc0fe6
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 12 15:26:00 2004 +1000

     - (djm) [loginrec.c] xmalloc

commit 6b0279c084f93a1e36ad648fd428297cc728cd35
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 12 15:25:17 2004 +1000

     - (djm) [loginrec.c] __func__ifiy

commit 8899ed3b6258b6943e4bf2f942a0ad7ce52303f9
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 12 15:18:55 2004 +1000

     - (djm) [loginrec.c] Start KNF and tidy up of this long-neglected file.
       No change in resultant binary

commit 5614d8f8c48faf1526e472ef760b1cb116ae069d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 11 23:32:09 2004 +1000

     - (dtucker) [auth-krb5.c] Bug #922: Pass KRB5CCNAME to PAM.  From deengert
       at anl.gov, ok djm@

commit a0c2b394b4e6d881bb70ab25c77d25922e07fd40
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 11 23:26:37 2004 +1000

     - (dtucker) [configure.ac] Bug #321: Add cross-compile support to configure.
       Parts by chua at ayrnetworks.com, astrand at lysator.liu.se and me.  ok djm@

commit a2a3ed0010fc10a1c39404a3c3cddd3de27019b2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 11 23:09:53 2004 +1000

     - (dtucker) [session.c] Bug #927: make .hushlogin silent again.  ok djm@

commit 77fc29eeb382974ae063227c249ee3b98646e38a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 11 23:07:03 2004 +1000

     - (dtucker) [auth-pam.c auth.h auth2-none.c auth2.c monitor.c monitor_wrap.c]
       Bug #892: Send messages from failing PAM account modules to the client via
       SSH2_MSG_USERAUTH_BANNER messages.  Note that this will not happen with
       SSH2 kbdint authentication, which need to be dealt with separately.  ok djm@

commit 4765679649c51a83e5ceb3d0c1e51e33db251f27
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 11 22:42:09 2004 +1000

     - (djm) [auth2-kbdint.c auth2-none.c  auth2-passwd.c auth2-pubkey.c]
       Make cygwin code more consistent with that which surrounds it

commit 0a7e3c6c899b7e25efd36cfb9ffb0a8fb36ca67a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 11 22:28:01 2004 +1000

     - (dtucker) [auth-pam.c] Relocate sshpam_store_conv(), no code change.

commit 69687f4b65373e09269db8c18f18b4ac7225a382
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 11 22:17:26 2004 +1000

     - (dtucker) [auth-pam.c auth-pam.h session.c] Bug #890: Send output from
       failing PAM session modules to user then exit, similar to the way
       /etc/nologin is handled.  ok djm@

commit 928a19ad9e82d2098c9309553e7f6c97d7665322
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 11 15:18:05 2004 +1000

     - (djm) [ssh-agent.c] unifdef some cygwin code; ok dtucker@

commit 25a1234ef71c48e52e1aa43e8af37d1261aaf937
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 30 21:33:02 2004 +1000

     - (dtucker) [Makefile.in contrib/ssh-copy-id] Bug #894: Improve portability
       of shell constructs.  Patch from cjwatson at debian.org.

commit 476b7ecfe4947864b22fa23ed86edd0e62faf98d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 30 21:13:49 2004 +1000

     - (dtucker) [regress/Makefile] Clean scp-ssh-wrapper.scp too.  Patch from
       vinschen at redhat.com.

commit 14c372d49d49a21107c72b7c238cf9e5a01b80ab
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 30 20:42:08 2004 +1000

     - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.{c,h}] Bug #915: only
       copy required environment variables on Cygwin.  Patch from vinschen at
       redhat.com, ok djm@

commit 5a88d003499744a374ec39279f4c6ec3971b5dab
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 21:43:33 2004 +1000

     - (dtucker) [openbsd-compat/port-aix.c] Bug #712: Explicitly check for
       accounts with authentication configs that sshd can't support (ie
       SYSTEM=NONE and AUTH1=something).

commit cf59d31761cdc1fdd78f6563d0f9eadc8b4c2f71
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 21:18:09 2004 +1000

     - (dtucker) [configure.ac] Replace non-portable echo \n with extra echo.

commit b17035fb7ffefc984e76a92e6cbbc051fc8fbe97
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 20:33:07 2004 +1000

     - (dtucker) [regress/agent-ptrace.sh] Skip ptrace test on OSF1/DUnix/Tru64
       too; patch from cmadams at hiwaay.net.

commit 2a502ff31031622d983db9846d15682c368f8801
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 19:52:32 2004 +1000

     - (dtucker) [Makefile.in] Get regress/Makefile symlink right for out-of-tree
       builds too, from vinschen at redhat.com.

commit 0521dcb22eb6c5478c4b652cfc6bb777499aeba7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 19:39:09 2004 +1000

     - (dtucker) [regress/scp.sh] Make this work on Cygwin too, which doesn't like
       files ending in .exe that aren't binaries; patch from vinschen at redhat.com.

commit 07d30e4579b183af97b7ccc880f256d4334930bd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 17:14:31 2004 +1000

     - (dtucker) [regress/dynamic-forward.sh] Allow time for connections to be torn
       down, needed on some platforms, should be harmless on others.  Patch from
       jason at devrandom.org.

commit 2a81adc35c51668374b40661e1a0eaac8e53ef74
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 17:09:34 2004 +1000

     - (dtucker) [regress/multiplex.sh] Skip test on platforms that do not
       support FD passing since multiplex requires it.  Noted by tim@

commit 48d99d36bb427f6c43cfe8d8e7d8a457897dfd53
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 17:04:50 2004 +1000

     - (dtucker) [configure.ac] Include sys/stream.h in sys/ptms.h header check,
       fixes configure warning on Solaris reported by wknox at mitre.org.

commit 0f56ed16b8e463e16c3a8f78544943a9e6f8ea1f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 16:38:41 2004 +1000

       - djm@cvs.openbsd.org 2004/08/28 01:01:48
         [sshd.c]
         don't erroneously close stdin for !reexec case, from Dave Johnson;
         ok markus@

commit db693908178e1e2390d2bbfc34fe709eb23ea039
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 16:37:24 2004 +1000

       - markus@cvs.openbsd.org 2004/08/26 16:00:55
         [ssh.1 sshd.8]
         get rid of references to rhosts authentication; with jmc@

commit 34620d6f710f97bddc6f7730cee5c6404c4153ba
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 16:32:59 2004 +1000

       - dtucker@cvs.openbsd.org 2004/08/23 14:29:23
         [ssh-keysign.c]
         Remove duplicate getuid(), suggested by & ok markus@

commit 27a8f6b05636648367ea373d77d129327eb515a9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 16:31:28 2004 +1000

       - dtucker@cvs.openbsd.org 2004/08/23 14:26:38
         [ssh-keysign.c ssh.c]
         Use permanently_set_uid() in ssh and ssh-keysign for consistency, matches
         change in Portable; ok markus@ (CVS ID sync only)

commit e6ed83976b0620778462f44a267d0ab2e9de3d09
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 16:29:44 2004 +1000

       - djm@cvs.openbsd.org 2004/08/23 11:48:47
         [channels.c]
         typo, spotted by Martin.Kraemer AT Fujitsu-Siemens.com; ok markus

commit f4b43712c135dc190e9e0ff145239c9e841cd55d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 16:28:39 2004 +1000

       - djm@cvs.openbsd.org 2004/08/23 11:48:09
         [authfile.c]
         fix error path, spotted by Martin.Kraemer AT Fujitsu-Siemens.com; ok markus

commit f00e51d1f2ea01c33d5548b79a86c44036b90aae
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 29 16:12:29 2004 +1000

     - (dtucker) [openbsd-compat/getrrsetbyname.c] Prevent getrrsetbyname from
       failing with NOMEMORY if no sigs are returned and malloc(0) returns NULL.
       From Martin.Kraemer at Fujitsu-Siemens.com; ok djm@

commit 11bdc01cfe998294ba828a3a0461e1a49c5288a9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 28 16:17:35 2004 +1000

    Add filename to ChangeLog entry

commit f0c2aeaf3d5d7279fc0630db2f809cd58a5395b4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 28 15:46:57 2004 +1000

     - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from
       vinschen at redhat.com.

commit b0419f26d0d75cf1d9b56c26142c5eb7956fef63
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 23 21:53:28 2004 +1000

     - (djm) [loginrec.c] Typo and bad args in error messages; Spotted by
       Martin.Kraemer AT Fujitsu-Siemens.com

commit 7daf044aa2055885da74dc15d56b17c17291c322
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 23 21:52:08 2004 +1000

     - (djm) [ssh-rand-helper.c] Typo. Found by
       Martin.Kraemer AT Fujitsu-Siemens.com

commit e17cc75fe35f62ba52928b5889b5e7aadb62bedb
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 17 22:50:40 2004 +1000

     - (djm) Release 3.9p1

commit d545285ec146e3076ba91e5a51e849af1e163577
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 17 22:49:12 2004 +1000

     - (djm) Crank RPM spec version numbers

commit 87c9cca3919f73a8dcc08924a1a21f462034fc88
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 17 22:47:41 2004 +1000

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2004/08/16 08:17:01
         [version.h]
         3.9

commit bad5f2d329a7d8784e12134f3f2c531bbc635900
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 17 22:31:32 2004 +1000

     - (dtucker) [regress/README.regress] Note compatibility issues with GNU head.

commit 21dd0897d53b5850c3fe1dff43494db3024e3d97
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 16 23:12:05 2004 +1000

     - (dtucker) [acconfig.h auth-pam.c configure.ac] Set real uid to non-root
       to convince Solaris PAM to honour password complexity rules.  ok djm@

commit 0cbc3c65094079b5908b3357d69e6cf7b1d94a80
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 15 21:01:37 2004 +1000

     - (dtucker) [Makefile.in] Fix typo.

commit 8140959de036cad2a236784f368bbeeec8b10809
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Aug 15 19:12:52 2004 +1000

     - (djm) [loginrec.c] Check that seek succeeded here too; ok dtucker

commit 36f496502072d82dbb202b41a199eb6032557710
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Aug 15 18:40:59 2004 +1000

     - (djm) [acconfig.h configure.ac openbsd-compat/Makefile.in
       openbsd-compat/bsd-closefrom.c openbsd-compat/bsd-misc.c
       openbsd-compat/bsd-misc.h openbsd-compat/openbsd-compat.h] Use smarter
       closefrom() replacement from sudo; ok dtucker@

commit 25f60a7ee780c2cd4a01e05698149d274821012f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 15 17:23:34 2004 +1000

     - (dtucker) [Makefile.in ssh-keysign.c ssh.c] Use permanently_set_uid() since
       it does the right thing on all platforms.  ok djm@

commit 397a2f2612901785d8290a90ae9aa59efb422c92
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 15 00:09:11 2004 +1000

     - (dtucker) [loginrec.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h]
       Plug AIX login recording into login_write so logins will be recorded for
       all auth types.

commit 3d50c9bda6b7eb63325e577c243e1a59a130c3ad
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 15 00:01:48 2004 +1000

     - (dtucker) [includes.h] Undef _INCLUDE__STDC__ on HP-UX, otherwise
       prot.h and shadow.h provide conflicting declarations of getspnam.  ok djm@

commit 066969339dcd0352965de0ab1b5f693cf2a7fee8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 14 23:55:37 2004 +1000

     - (dtucker) [auth-krb5.c gss-serv-krb5.c openbsd-compat/xmmap.c]
       Explicitly set umask for mkstemp; ok djm@

commit a763105c0f6e4d58f2e477597d1cf5ca5317b1a1
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Aug 14 10:26:30 2004 +1000

    remove antique crypto restrictions text

commit 137e9c97e05fafbd278c67d5d11ced3f4abb1ef0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 13 21:30:24 2004 +1000

       - dtucker@cvs.openbsd.org 2004/08/13 11:09:24
         [servconf.c]
         Fix line numbers off-by-one in error messages, from tortay at cc.in2p3.fr
         ok markus@, djm@

commit 1ef0bc0b0a6104af6b37b525e52b7a20abb532a9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 13 21:29:02 2004 +1000

       - djm@cvs.openbsd.org 2004/08/13 02:51:48
         [monitor_fdpass.c]
         extra check for no message case; ok markus, deraadt, hshoexer, henning

commit 6e37037fea62948a5481e83750c9fbbd05f41831
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 13 21:23:25 2004 +1000

       - jmc@cvs.openbsd.org 2004/08/13 00:01:43
         [ssh-keygen.1]
         kill whitespace at eol;

commit 0b42e6d95b915309187281e968049cb61b750c69
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 13 21:22:40 2004 +1000

       - jakob@cvs.openbsd.org 2004/08/12 21:41:13
         [ssh-keygen.1 ssh.1]
         improve SSHFP documentation; ok deraadt@

commit bcf279783add401b9c8384b68fc4c30fa1391a22
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 13 21:21:47 2004 +1000

       - djm@cvs.openbsd.org 2004/08/12 09:18:24
         [sshlogin.c]
         typo in error message, spotted by moritz AT jodeit.org (Id sync only)

commit fe6649da0cd211efc069aa9987b00838d030ef1d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 13 21:19:37 2004 +1000

       - avsm@cvs.openbsd.org 2004/08/11 21:44:32
         [authfd.c scp.c ssh-keyscan.c]
         use atomicio instead of homegrown equivalents or read/write.
         markus@ ok

commit c7a6fc41bfdcd73469b153437a8e75e0b1057894
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 13 21:18:00 2004 +1000

       - avsm@cvs.openbsd.org 2004/08/11 21:43:05
         [channels.c channels.h clientloop.c misc.c misc.h serverloop.c ssh-agent.c]
         some signed/unsigned int comparison cleanups; markus@ ok

commit 03669a363eb8c76f460a75adc11d0eb933e4af49
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 13 18:37:21 2004 +1000

     - (dtucker) [openbsd-compat/bsd-misc.c] Typo in #ifdef; from vinschen at
       redhat.com

commit eb57862e7c4be89ccb0428298e9737ff7e2398f9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 12 23:08:14 2004 +1000

     - (dtucker) [sshd.c] Clear loginmsg in postauth monitor, prevents doubling
        messages generated before the postauth privsep split.

commit 133b757357fe78893327494afb8db113a6ad53a8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 12 22:50:03 2004 +1000

       - djm@cvs.openbsd.org 2004/08/11 12:01:16
         [sshlogin.c]
         make store_lastlog_message() static to appease -Wall; ok markus

commit 9c5049a40ff1069fe40f5714dd7ba8fdc733d8a3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 12 22:49:00 2004 +1000

       - djm@cvs.openbsd.org 2004/08/11 11:59:22
         [sshlogin.c]
         check that lseek went were we told it to; ok markus@
         (Id sync only, but similar changes are needed in loginrec.c)

commit d8835934c4cf129b842b0f391783754cdaa0190c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 12 22:42:29 2004 +1000

       - dtucker@cvs.openbsd.org 2004/08/11 11:50:09
         [sshd.c]
         Don't try to close startup_pipe if it's not open; ok djm@

commit 9fbac719055b66ef2bcd9b4cc98163cd97d829bc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 12 22:41:44 2004 +1000

       - dtucker@cvs.openbsd.org 2004/08/11 11:09:54
         [servconf.c]
         Fix minor leak; "looks right" deraadt@

commit 9a2bd1116bf3fdb236d8b10af1acb2e7e8fe6e60
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 12 22:40:59 2004 +1000

       - djm@cvs.openbsd.org 2004/08/04 10:37:52
         [dh.c]
         return group14 when no primes found - fixes hang on empty /etc/moduli;
         ok markus@

commit 5cb30ad2ec4fe129e6d2e440eb2eba1c01f71661
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 12 22:40:24 2004 +1000

       - markus@cvs.openbsd.org 2004/07/28 09:40:29
         [auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c
         sshconnect1.c]
         more s/illegal/invalid/

commit 6832b83744b807437488d7e122128f9b363dac43
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 12 22:36:51 2004 +1000

       - markus@cvs.openbsd.org 2004/07/28 08:56:22
         [sshd.c]
         call setsid() _before_ re-exec

commit 8ae66a50327751f881156aaf0997d03791d5b08a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 12 22:16:55 2004 +1000

     - (dtucker) [sshd.c] Remove duplicate variable imported during sync.

commit 0670c7396fc2435a51064f7bf456822baaaf910e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 21 21:53:34 2004 +1000

       - djm@cvs.openbsd.org 2004/07/21 11:51:29
         [canohost.c]
         bz#902: cache remote port so we don't fatal() in auth_log when remote
         connection goes away quickly. from peak AT argo.troja.mff.cuni.cz;
         ok markus@

commit 2d2ed3d63379668c80878b4008de51c00e1d9b86
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 21 20:54:47 2004 +1000

     - (djm) [auth-pam.c] Portable parts of bz#899: Don't display invalid
       usernames in setproctitle from peak AT argo.troja.mff.cuni.cz;

commit 10a445b9e509086dc4c97e39d5a3d1342c2228fd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 21 20:49:39 2004 +1000

       - djm@cvs.openbsd.org 2004/07/21 10:36:23
         [gss-serv-krb5.c]
         fix function declaration

commit 30d1f84911f7c8ed86913e3900d75693d133adee
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 21 20:48:53 2004 +1000

       - djm@cvs.openbsd.org 2004/07/21 10:33:31
         [auth1.c auth2.c]
         bz#899: Don't display invalid usernames in setproctitle

commit a22f2d761b79b37969ac56cfa794af5a0b83f06b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 21 20:48:24 2004 +1000

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2004/07/21 08:56:12
         [auth.c]
         s/Illegal user/Invalid user/; many requests; ok djm, millert, niklas,
         miod, ...

commit b5a21440a88fb8366d5032e8ce895cf7a52cb1ea
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 21 20:44:05 2004 +1000

     - (djm) [regress/README.regress] Remove caveat regarding TCP wrappers, now
       that sshd is fixed to behave better; suggested by tim

commit 8fe0105be4b748fc7e93c1b0f781cbcc3795ca6b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 21 11:01:41 2004 +1000

     - (djm) [contrib/redhat/sshd.pam] bz #903: Remove redundant entries; from
       peak AT argo.troja.mff.cuni.cz

commit 23a7027e48c1b8d7f54c04319a6e0433d1c19e23
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 21 10:52:13 2004 +1000

     - (djm) [log.c] bz #111: Escape more control characters when sending data
       to syslog; from peak AT argo.troja.mff.cuni.cz

commit 816bd0d0870c8c4dae5243734fab80568bce15f5
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Jul 19 10:19:26 2004 -0700

     - (tim) [configure.ac] updwtmpx() on OpenServer seems to add duplicate entry.
       Report by rac AT tenzing.org

commit a6fb77fd6c7c1624fa624b1ee8c8c61fe3c7454a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 19 09:39:11 2004 +1000

     - (djm) [auth-pam.c] Avoid use of xstrdup and friends in conversation function,
       instead return PAM_CONV_ERR, avoiding another path to fatal(); ok dtucker@

commit 65df1745743a2f0f5b6647a223f781bb153e6449
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jul 19 09:30:38 2004 +1000

     - (djm) [openbsd-compat/bsd-arc4random.c] Discard early keystream, like OpenBSD
       ok dtucker@

commit 0999174755bbc5b50d65bfa95e0b322ffd12337c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 17 17:05:14 2004 +1000

       - dtucker@cvs.openbsd.org 2004/07/17 05:31:41
         [monitor.c monitor_wrap.c session.c session.h sshd.c sshlogin.c]
         Move "Last logged in at.." message generation to the monitor, right
         before recording the new login.  Fixes missing lastlog message when
         /var/log/lastlog is not world-readable and incorrect datestamp when
         multiple sessions are used (bz #463);  much assistance & ok markus@

commit 3ca45082017f0fcaf01b0bf781ae33cf1cc57e27
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 17 16:13:15 2004 +1000

       - brad@cvs.openbsd.org 2004/07/12 23:34:25
         [ssh-keyscan.1]
         Fix incorrect macro, .I -> .Em
         From: Eric S. Raymond <esr at thyrsus dot com>
         ok jmc@

commit fc9597034b819b295966f61d8dc797b53fda45c7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 17 16:12:08 2004 +1000

       - deraadt@cvs.openbsd.org 2004/07/11 17:48:47
         [channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c
         readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c
         session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h
         sshd.c ttymodes.h]
         spaces

commit ba6de952a00558e6d93b8c9edd81806a99716411
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 17 14:07:42 2004 +1000

     - (dtucker) [logintest.c scp.c sftp-server.c sftp.c ssh-add.c ssh-agent.c
       ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c
       openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c.  Reduces
       diff vs OpenBSD; ok mouring@, tested by tim@ too.

commit 5d423f4eceb09c6e26946d4b190a765a3d96c34f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jul 11 16:54:08 2004 +1000

     - (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows
       the monitor to properly clean up the PAM thread (Debian bug #252676).

commit 3b376f08fbc2d1c89ba0dc2091fd2e3de768cd59
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Jul 9 10:45:26 2004 -0700

     - (tim) [contrib/cygwin/README] add minires-devel requirement. Patch from
       vinschen AT redhat.com

commit e1f17055ed51dcf53f385f4db334c9a7471659ab
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 8 23:11:44 2004 +1000

       - dtucker@cvs.openbsd.org 2004/07/08 12:47:21
         [scp.c]
         Prevent scp from skipping the file following a double-error.
         bz #863, ok markus@

commit 042e2e8cbb19c4c32db58510f4a177a2bd676914
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 8 23:09:42 2004 +1000

       - dtucker@cvs.openbsd.org 2004/07/03 11:02:25
         [monitor_wrap.c]
         Put s/key functions inside #ifdef SKEY same as monitor.c,
         from des@freebsd via bz #330, ok markus@

commit cd99fa0648431be61c0fe0f770fe9179141e26dc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 8 23:08:26 2004 +1000

       - dtucker@cvs.openbsd.org 2004/07/03 05:11:33
         [sshlogin.c] (RCSID sync only, the corresponding code is not in Portable)
         Use '\0' not 0 for string; ok djm@, deraadt@

commit d062da53c7326fef580b30548faca156b8e336ad
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jul 2 18:43:09 2004 +1000

     - (dtucker) [mdoc2man.awk] Teach it to ignore .Bk -words, reported by
       strube at physik3.gwdg.de a long time ago.

commit a5757f0f28c95c6eee8ce570e58a1321d74fe4ad
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jul 1 20:41:15 2004 -0700

     - (tim) [buildpkg.sh.in] Add $REV to bump the package revision within
       the same version. Handle the case where someone uses --with-privsep-user=
       and the user name does not match the group name. ok dtucker@

commit 1f7e40864faa5632696718ea6950ebdb4df41ce5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 1 14:00:14 2004 +1000

     - (dtucker) [auth-pam.c] Bug #559 (last piece): Pass DISALLOW_NULL_AUTHTOK
       to pam_authenticate for challenge-response auth too.  Originally from
       fcusack at fcusack.com, ok djm@

commit e2ba9c2e83101eaae3c4e703d4978ff9c0f560c3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 1 12:38:14 2004 +1000

     - (dtucker) [auth-pam.c] Bug #705: Make arguments match PAM specs, fixes
       warnings on compliant platforms.  From paul.a.bolton at bt.com.  ok djm@

commit 0a44d1ecf36455f7288a6f4349e676d922a46718
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 1 09:48:29 2004 +1000

     - (dtucker) [session.c] Call display_loginmsg again after do_pam_session.
       Ensures messages from PAM modules are displayed when privsep=no.
    
    Note: I did not want to just move display_loginmsg since that would change
    existing behaviour (order of expiry warnings, "Last Login", motd) to less
    like the native tools.

commit a6b1d169e601a5fe0dcd0e49c038671446932026
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 30 22:41:07 2004 +1000

       - djm@cvs.openbsd.org 2004/06/30 08:36:59
         [session.c]
         unbreak TTY break, diagnosed by darren AT dazwin.com; ok markus@

commit 386c6a2c707b0c2a7b3370ba669881e72670ed14
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 30 22:40:20 2004 +1000

       - avsm@cvs.openbsd.org 2004/06/26 20:07:16
         [sshd.c]
         initialise some fd variables to -1, djm@ ok

commit 26213e556b517bd01d4a1912afb7ef1f48f136f6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 30 22:39:34 2004 +1000

       - jmc@cvs.openbsd.org 2004/06/26 09:14:40
         [sshd_config.5]
         new sentence, new line;

commit 2234bac999018887c7751335f34f52c3c3d5e21d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 30 22:38:52 2004 +1000

       - jmc@cvs.openbsd.org 2004/06/26 09:11:14
         [ssh_config.5]
         punctuation and grammar fixes. also, keep the options in order.

commit 5d1ecebcb5c3e7d59bc9a77941556e6ebc0153d8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 30 22:37:57 2004 +1000

     - OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2004/06/26 09:03:21
         [ssh.1]
         - remove double word
         - rearrange .Bk to keep SYNOPSIS nice
         - -M before -m in options description

commit 59e06026d721661c477ff5eccc36918665a9ef01
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 30 20:34:31 2004 +1000

     - (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL
       appdata_ptr to the conversation function.  ok djm@
    
    By rights we should free the messages too, but if this happens then one
    of the modules has already proven itself to be buggy so can we trust
    the messages?

commit 5288cb242aeea747dba400997c376035578a8445
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 28 18:11:19 2004 +1000

     - (dtucker) [openbsd-compat/port-aix.c] Missing __func__.

commit e59b50879819db3bbb189ba7e069950a8991ea05
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 28 16:01:19 2004 +1000

     - (dtucker) [acconfig.h configure.ac sftp-server.c] Bug #823: add sftp
       rename handling for Linux which returns EPERM for link() on (at least some)
       filesystems that do not support hard links.  sftp-server will fall back to
       stat+rename() in such cases.

commit f9eb2b013510ef35372560e673d0bf80b1b4dd2c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 28 15:52:50 2004 +1000

     - (dtucker) [regress/README.regress] Document new variables.

commit 58cef1f0bbbe3975f2b063c6ca9ed1dd56f8f9cd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jun 28 15:45:08 2004 +1000

     - (dtucker) [mdoc2man.awk] Bug #883: correctly recognise .Pa and .Ev macros.

commit 528790264363a910ab3e01a81f2c4bc84ea2eda5
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jun 27 20:50:35 2004 -0700

    Minor updates to some README files.

commit 96d6d7d9a0c6f5ebef1b3d9692ccd0b5c5bb5e4b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 09:21:06 2004 +1000

       - djm@cvs.openbsd.org 2004/06/25 23:21:38
         [sftp.c]
         bz #875: fix bad escape char error message; reported by f_mohr AT yahoo.de

commit 035a5b47cc29f9d343153d4d7c09c20ebd0eff52
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 26 08:16:31 2004 +1000

     - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2004/06/25 18:43:36
         [sshd.c]
         fix broken fd handling in the re-exec fallback path, particularly when
         /dev/crypto is in use; ok deraadt@ markus@

commit aedc1d6a3ed351d11514b9bdf52456ff27dc16bc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 25 17:06:02 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/25 05:38:48
         [sftp-server.c]
         Fall back to stat+rename if filesystem doesn't doesn't support hard
         links.  bz#823, ok djm@

commit 17c5d03ad3bcb782b5b3768b3e70a050d86d5fa1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 25 14:22:23 2004 +1000

     - (dtucker) [sshd.c] add line missing from reexec sync.

commit 60bd4098f64fd0fbbd9b6b4de2562623318141a0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 25 14:03:34 2004 +1000

     - (dtucker) [configure.ac openbsd-compat/misc.c [openbsd-compat/misc.h]
       Add closefrom() for platforms that don't have it.
    
    (might need some tuning later, but I want to be able to test reexec).

commit ef3b47a73adf98a510200daea9ebfceebed5bed6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 25 13:46:08 2004 +1000

       - djm@cvs.openbsd.org 2004/06/25 01:25:12
         [regress/test-exec.sh]
         clean reexec-specific junk out of text-exec.sh and simplify; idea markus@

commit 977a9d21c885d9da6f6ac3c8d16f70765b0934ce
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 25 13:45:18 2004 +1000

       - djm@cvs.openbsd.org 2004/06/24 19:32:00
         [regress/Makefile regress/test-exec.sh, added regress/reexec.sh]
         regress test for re-exec corner cases

commit 586b0b98bf9fe8a1d551a9706aed60851ff0e014
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 25 13:34:31 2004 +1000

       - djm@cvs.openbsd.org 2004/06/25 01:16:09
         [sshd.c]
         only perform tcp wrappers checks when the incoming connection is on a
         socket.  silences useless warnings from regress tests that use
         proxycommand="sshd -i".  prompted by david@ ok markus@

commit 645ab757bd58dc0c8e42b9886863ec95bf058c3e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 25 13:33:20 2004 +1000

       - djm@cvs.openbsd.org 2004/06/24 19:30:54
         [servconf.c servconf.h sshd.c]
         re-exec sshd on accept(); initial work, final debugging and ok markus@

commit b5bc1a6393ab0dce132a35711e779644c36a3ffa
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 24 00:34:53 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/23 14:31:01
         [ssh.c]
         Fix counting in master/slave when passing environment variables; ok djm@

commit ede07fb0a07dfcfa15560ff4b7a5764687c35ad5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 24 00:33:48 2004 +1000

       - mouring@cvs.openbsd.org 2004/06/23 00:39:38
         [rijndael.c]
         -Wshadow fix up s/encrypt/do_encrypt/.  OK djm@, markus@

commit ca37219d75a49053b909933c9444a32529f4264f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 23 04:04:45 2004 +0000

     - (bal) [contrib/README] Removed "mdoc2man.pl" reference and added
       reference to "findssl.sh"
    
    Also corrected my ChangeLog entries since I placed them in the wrong place.

commit af4ab6cbf57f8d43e62c7d1e74f922e54b1844b4
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jun 22 20:53:02 2004 -0700

     - (tim) [regress/try-ciphers.sh] "if ! some_command" is not portable.

commit 0a9d43d7264ff0a74c4f9493be238e35ef04c952
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 23 13:45:24 2004 +1000

     - (dtucker) [auth.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h]
       Move loginrestrictions test to port-aix.c, replace with a generic hook.

commit ef8f8af86c3df4d769892baeca5d18a7a8599908
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 23 03:21:54 2004 +0000

     - (bal) [Makefile.in] Remove opensshd.init on 'make distclean'

commit e5a604fdd4410e18bbb148e39c00551f6b4c3d73
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 23 12:28:31 2004 +1000

     - (dtucker) [cipher.c] encrypt->do_encrypt inside SSH_OLD_EVP to match
       -Wshadow change.

commit 3b9c0adaab5736a1b9f5d69a3bf471ff46b8b88f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 23 09:28:20 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/22 22:55:56
         [regress/dynamic-forward.sh regress/test-exec.sh]
         Allow setting of port for regress from TEST_SSH_PORT variable; ok markus@

commit 6223eea5962535f2efe9789a9bc19ecca1539713
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 23 09:25:02 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/22 22:45:52
         [regress/test-exec.sh]
         Add TEST_SSH_SSHD_CONFOPTS and TEST_SSH_SSH_CONFOPTS to allow adding
         arbitary options to sshd_config and ssh_config during tests.  ok markus@

commit 6eabe6430418fa9051500bed9ca4b1ffb377e3ec
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 23 09:23:58 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/22 22:42:02
         [regress/envpass.sh]
         Add quoting for test -z; ok markus@

commit a8c73d3b8c471aaeca90e8d82e28014608bf2707
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 23 09:17:54 2004 +1000

     - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1
       connections with empty passwords.  Patch from davidwu at nbttech.com,
       ok djm@

commit b09b677166eb973948f189184e6ae4f60dafb2b9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 15:06:46 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/22 05:05:45
         [monitor.c monitor_wrap.c]
         Change login->username, will prevent -Wshadow errors in Portable;
         ok markus@

commit 430c6a1552e25a1163e6fa1bade9a276791679a6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 13:38:56 2004 +1000

       - markus@cvs.openbsd.org 2004/06/22 03:12:13
         [regress/envpass.sh regress/multiplex.sh]
         more portable env passing tests

commit e35bf12eebca0c3ca248dca4c04bff83b9c475a1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 22 03:37:11 2004 +0000

     - (bal) [auth-passwd.c auth1.c] Clean up unused variables.

commit 59bf4a9bd44ce2c719437c74bd1e8e73b57d3c4a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 13:27:16 2004 +1000

     - (dtucker) [defines.h] Define __dead if not already defined.

commit 5e4e272e8d4717ea71cd383e9922996e578cfcc8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 13:26:00 2004 +1000

    Missing ChangeLog entry for previous

commit 7eda592ef040f71589a1940f8736243bf2bf51ab
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 13:22:50 2004 +1000

     - (dtucker) [monitor.c] Fix Portable-specific -Wshadow warnings on "socket".

commit 9a526455669748a5ba87bc39ac9572f89dcfb29e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 13:09:55 2004 +1000

       - djm@cvs.openbsd.org 2004/06/22 01:16:39
         [sftp.c]
         don't show .files by default in ls, add -a option to turn them back on;
         ok markus

commit 15ca6e88426b1b0919151e23268163d93c81e8a0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 13:08:21 2004 +1000

       - djm@cvs.openbsd.org 2004/06/21 22:41:31
         [sftp.1]
         document sort options

commit a4e9ffa6533de9b60c4a0395822a7e3aca4eec68
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 13:07:58 2004 +1000

       - djm@cvs.openbsd.org 2004/06/21 22:30:45
         [sftp.c]
         prefix ls option flags with LS_

commit b9123453d015dd3e4590a4fc9970e973a0499a28
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 13:06:45 2004 +1000

       - djm@cvs.openbsd.org 2004/06/21 22:04:50
         [sftp.c]
         introduce sorting for ls, same options as /bin/ls; ok markus@

commit efa62f98a140e238256c2f75f4cd8a282fe802a3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 12:57:44 2004 +1000

       - djm@cvs.openbsd.org 2004/06/21 22:02:58
         [log.h]
         mark fatal and cleanup exit as __dead; ok markus@

commit 723e945b55b29ecd7ce908cf81a67fd998764aff
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 12:57:08 2004 +1000

       - djm@cvs.openbsd.org 2004/06/21 17:53:03
         [session.c]
         fix fd leak for multiple subsystem connections; with markus@

commit 3f9fdc71219d498a996c4e4ca8330df7f598fb5d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 12:56:01 2004 +1000

       - avsm@cvs.openbsd.org 2004/06/21 17:36:31
         [auth-rsa.c auth2-gss.c auth2-pubkey.c authfile.c canohost.c channels.c
         cipher.c dns.c kex.c monitor.c monitor_fdpass.c monitor_wrap.c
         monitor_wrap.h nchan.c packet.c progressmeter.c scp.c sftp-server.c sftp.c
         ssh-gss.h ssh-keygen.c ssh.c sshconnect.c sshconnect1.c sshlogin.c
         sshpty.c]
         make ssh -Wshadow clean, no functional changes
         markus@ ok
    
    There are also some portable-specific -Wshadow warnings to be fixed in
    monitor.c and montior_wrap.c.

commit b357afc0a03a4238a01acf5d9641ebda9f71d500
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 12:31:23 2004 +1000

       - djm@cvs.openbsd.org 2004/06/20 19:28:12
         [sftp.1]
         mention new -n flag

commit b215c5d8fec624a18751f03cfb416a340b07fa15
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 12:30:53 2004 +1000

       - djm@cvs.openbsd.org 2004/06/20 18:53:39
         [sftp.c]
         make "ls -l" listings print user/group names, add "ls -n" to show uid/gid
         (like /bin/ls); idea & ok markus@

commit 365433f883b8cc3f7f16572278340849413e6d49
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 22 12:29:23 2004 +1000

       - djm@cvs.openbsd.org 2004/06/20 17:36:59
         [ssh.c]
         filter passed env vars at slave in connection sharing case; ok markus@

commit f7ba8f67b7e53150ff3f6f33879dd483f61ab5fc
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jun 20 10:37:32 2004 -0700

    (tim) [configure.ac Makefile.in] Only change TEST_SHELL on broken platforms.
    OK dtucker@

commit 5af9db9e0c7dce664d4bea2fc776fc9f4631aeaa
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Jun 19 19:31:06 2004 -0700

     - (tim) [configure.ac buildpkg.sh.in contrib/solaris/README] move opensshd
       init script to top level directory.

commit 17db1c47cf1e06dc6e48425cbb41c38a62d54ad2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 19 12:54:38 2004 +1000

     - (dtucker) [auth-pam.c] Don't use PAM namespace for
        pam_password_change_required either.

commit 3bbd878c2ec2b337b9e5b9455e0a2bd1902a0824
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 18 22:23:22 2004 +1000

       - djm@cvs.openbsd.org 2004/06/18 11:11:54
         [channels.c clientloop.c]
         Don't explode in clientloop when we receive a bogus channel id, but
         also don't generate them to begin with; ok markus@

commit b8ea24868f0347ea6d5116cbd93197c1ab0e942b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 18 22:21:55 2004 +1000

       - markus@cvs.openbsd.org 2004/06/18 10:55:43
         [ssh.1 ssh.c]
         trim synopsis for -S, allow -S and -oControlMaster, -MM means 'ask'; ok djm

commit 0809e233a42d1818f3494581024e4ad1486e39be
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 18 22:20:57 2004 +1000

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2004/06/18 10:40:19
         [ssh.c]
         delay signal handler setup until we have finished talking to the master.
         allow interrupting of setup (e.g. if master is stuck); ok markus@

commit 6288dc14fcce8f88216506ac3226849c3e43cfa7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 18 16:25:35 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/18 06:15:51
         [multiplex.sh]
         Use -S for scp/sftp to force the use of the ssh being tested.
         ok djm@,markus@

commit bd12f1741e9ea6432d5ca7006c4cf2553aebbdbf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 18 16:23:43 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/18 06:13:25
         [sftp.c]
         Use execvp instead of execv so sftp -S ssh works.  "makes sense" markus@

commit ba5c592126c70587b6fb6887494f1e29a8a05e09
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 18 16:22:39 2004 +1000

       - djm@cvs.openbsd.org 2004/06/17 23:56:57
         [ssh.1 ssh.c]
         sync usage() and SYNPOSIS with connection sharing changes

commit 13fbe57722748399a165791b6e37b6dccbe73c12
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 18 14:14:43 2004 +1000

     - (dtucker) [regress/README.regress] Add detail on how to run a single
       test from the top-level Makefile.

commit e826a8c9d9ea8de6696ca95825d69cf02e1954d6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 18 01:23:03 2004 +1000

       - djm@cvs.openbsd.org 2004/06/17 14:53:27
         [regress/multiplex.sh]
         shared connection env passing regress test

commit 23f0770a1bf8b0a1aa7c8d4bd78699fa0e9358d0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 18 01:19:03 2004 +1000

       - djm@cvs.openbsd.org 2004/06/17 15:10:14
         [clientloop.c misc.h readconf.c readpass.c ssh.c ssh_config.5]
         Add option for confirmation (ControlMaster=ask) via ssh-askpass before
         opening shared connections; ok markus@

commit 3756dcee244f47c20a6590129d99e625169836c6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 18 01:17:29 2004 +1000

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2004/06/17 14:52:48
         [clientloop.c clientloop.h ssh.c]
         support environment passing over shared connections; ok markus@

commit a9972e19e941f9f711103b50dd57f6bc0c1aad53
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 17 17:01:21 2004 +1000

     - (dtucker) [regress/multiplex.sh] Increase sleep time to 120 sec (60 is not
       enough for slow systems, especially if they don't have a kernel RNG).

commit 10e7f1929b54dcdd91fea2fe03e9450abdd8b31c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 17 16:36:27 2004 +1000

     - (dtucker) [regress/multiplex.sh] add EXEEXT for those platforms that need
       it.

commit 3e86fc4e992cec58461d6170816d03b36ad8f783
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 17 16:34:02 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/17 06:19:06
         [regress/multiplex.sh]
         Add small description of failing test to failure message; ok djm@

commit ffaa6a5f01483d5b43c9165176713d730ec8a2c7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 17 16:32:45 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/17 06:00:05
         [regress/multiplex.sh]
         Use DATA and COPY for test data rather than hard-coded paths; ok djm@

commit ddea13d74ddaba7951c61d50a798f1c345d677c2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 17 16:27:43 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/17 05:51:59
         [regress/multiplex.sh]
         Remove datafile between and after tests, kill sshd rather than wait;
         ok djm@

commit 8a2f1b353760922bc7336f7c4030e192e13dc018
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 17 15:18:32 2004 +1000

     - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some
       platforms), so test if diff understands it.  Pointed out by tim@, ok djm@

commit af16154b00b7f4cd935000f7b4f673e4c7795fb6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 16 23:24:19 2004 +1000

    Add missing regress.

commit 5711dca4a6c631b1a5a4d77688c3567a520cdac0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 16 23:23:50 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/16 13:16:40
         [multiplex.sh]
         Silence multiplex sftp and scp tests.  ok markus@

commit 6f0e35b5664b34423f64da2c8dfd876a61888d6d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 16 23:22:37 2004 +1000

      - dtucker@cvs.openbsd.org 2004/06/16 13:15:09
        [regress/scp.sh]
        Make scp -r tests use diff -rN not cmp (which won't do dirs.  ok markus@

commit 7a06f62b6a211f1257d9284995ac72f3adfa743c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 16 21:08:32 2004 +1000

     - (dtucker) [regress/README.regress]
       Add $TEST_SHELL to readme.

commit 0e6868e2c40763ccd2734895fd5a1b5cafff7b3c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 16 20:36:16 2004 +1000

     - (dtucker) [regress/test-exec.sh]
       Move Portable-only StrictModes to top of list to make syncs easier.

commit 9fe95da3ea9f8f0a53f4c2144348e8258900472b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 16 20:33:55 2004 +1000

    Add missing regress/envpass.sh

commit a40395663c675c3946dfa5ffe7bec84a1b38ab2a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 16 20:31:18 2004 +1000

       - djm@cvs.openbsd.org 2004/06/13 15:16:54
         [regress/test-exec.sh]
         remove duplicate setting of $SCP; spotted by markus@

commit e7d0583f36d060d199c44cbd16b367b0b9907333
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 16 20:22:22 2004 +1000

       - djm@cvs.openbsd.org 2004/06/13 15:04:08
         [regress/Makefile regress/test-exec.sh, added regress/multiplex.sh]
         regress test for client multiplexing; ok markus@

commit 50433a924344b295cd34ecdbba0c6b8f6add9231
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 16 20:15:59 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/13 13:51:02
         [regress/Makefile regress/test-exec.sh, added regress/scp-ssh-wrapper.sh
         regress/scp.sh]
         Add scp regression test; with & ok markus@

commit 4c37ef08abc56fe883e75333f04cf2a7382fce07
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 16 20:08:56 2004 +1000

       - djm@cvs.openbsd.org 2004/04/27 09:47:30
         [regress/Makefile regress/test-exec.sh, added regress/envpass.sh]
         regress test for environment passing, SendEnv & AcceptEnv options;
         ok markus@

commit a7ea546f1bec59b045a747f900be1ac67089329b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 16 12:01:15 2004 +1000

     - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
       code changes.

commit 03e66f650c63cac36adf26ba49500320d9d24b86
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 15 15:47:51 2004 +1000

       - djm@cvs.openbsd.org 2004/06/15 05:45:04
         [clientloop.c]
         missed one unset_nonblock; spotted by Tim Rice

commit 51cee0892f464e13fb88672a5555e29ef65452bc
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Jun 14 21:25:33 2004 -0700

    fix typo

commit 07b6ff12c4fe59b46fba870c223ffffbb3501eec
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 15 11:14:45 2004 +1000

     - (djm) [ssh.c] Use separate var for address length

commit 5e6f4db085d1278e0d5264e4ab000863a3d46d6e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 15 10:44:40 2004 +1000

     - (djm) Fix Makefile.in for connection sharing changes

commit 232711f6dbc107711b3957bfa2fd798aec702241
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 15 10:35:30 2004 +1000

       - djm@cvs.openbsd.org 2004/06/14 01:44:39
         [channels.c clientloop.c misc.c misc.h packet.c ssh-agent.c ssh-keyscan.c]
         [sshd.c]
         set_nonblock() instead of fnctl(...,O_NONBLOCK); "looks sane" deraadt@

commit 0e220dbfbcc9fe252e8f1f4890dbfa415aad35db
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 15 10:34:08 2004 +1000

       - djm@cvs.openbsd.org 2004/06/13 15:03:02
         [channels.c channels.h clientloop.c clientloop.h includes.h readconf.c]
         [readconf.h scp.1 sftp.1 ssh.1 ssh.c ssh_config.5]
         implement session multiplexing in the client (the server has supported
         this since 2.0); ok markus@

commit 05202ffe214115afa24bf6e7a6d8c8457e6759bb
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 15 10:30:39 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/13 14:01:42
         [ssh.1 ssh_config.5 sshd_config.5]
         List supported ciphers in man pages, tidy up ssh -c;
         "looks fine" jmc@, ok markus@

commit f675fc4948b2ec2c9ff86bcdd58e00947f0e319b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 15 10:30:09 2004 +1000

       - djm@cvs.openbsd.org 2004/06/13 12:53:24
         [dh.c dh.h kex.c kex.h kexdhc.c kexdhs.c monitor.c myproposal.h]
         [ssh-keyscan.c sshconnect2.c sshd.c]
         implement diffie-hellman-group14-sha1 kex method (trivial extension to
         existing diffie-hellman-group1-sha1); ok markus@

commit 7cf17eb78c71ba16ec39bb1a6a8640885071a307
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 15 10:28:56 2004 +1000

       - pedro@cvs.openbsd.org 2004/06/03 12:22:20
         [sftp-client.c sftp.c]
         initialize pointers, ok markus@

commit 16ea6494b6fe06b608f3b1d5fd629c8abd58efb6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 15 10:28:24 2004 +1000

       - dtucker@cvs.openbsd.org 2004/06/01 14:20:45
         [auth2-chall.c]
         Remove redundant #include; ok markus@

commit 3379385060dee8ad5eb766f8d88ab119fc2d19f6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 15 10:27:55 2004 +1000

       - dtucker@cvs.openbsd.org 2004/05/27 00:50:13
         [readconf.c]
         Kill dead code after fatal(); ok djm@

commit 3e4dffb140d3eb6eafddf2318baa8e4c33d4531e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 15 10:27:15 2004 +1000

       - markus@cvs.openbsd.org 2004/05/26 23:02:39
         [channels.c]
         missing freeaddrinfo; Andrey Matveev

commit 350327c0428572f16b1c4080ef61473942217a27
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 15 10:24:13 2004 +1000

       - djm@cvs.openbsd.org 2004/05/26 08:59:57
         [sftp.c]
         exit -> _exit in forked child on error; from andrushock AT korovino.net

commit 94befab9dd03fdcde634a8142ad1004930031a11
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 3 14:53:12 2004 +1000

     - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions.
       ok djm@

commit 26314f6354de5f160f2b3c0ea6b286ca44ded260
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 1 11:28:20 2004 +1000

     - (djm) [auth-pam.c] Add copyright for local changes

commit 2d2b9f706fda68a0b251f2bca42332a99fba12e1
Author: Tim Rice <tim@multitalents.net>
Date:   Sun May 30 21:48:40 2004 -0700

    [buildpkg.sh.in] Last minute fix didn't make it in the .in file.  :-(

commit 6f1f758cca33555f4f81691d10d3f8996bc6ab45
Author: Tim Rice <tim@multitalents.net>
Date:   Sun May 30 21:38:51 2004 -0700

     - (tim) [configure.ac Makefile.in] Add support for "make package" ok djm@
     - (tim) [buildpkg.sh.in] New file. A more flexible version of
       contrib/solaris/buildpkg.sh used for "make package".

commit e061b1598a99c7c978f2e05f6d7aa86b6dba9d73
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 30 22:04:56 2004 +1000

     - (dtucker) [auth-pam.c] Use an invalid password for root if
       PermitRootLogin != yes or the login is invalid, to prevent leaking
       information.  Based on Openwall's owl-always-auth patch.  ok djm@

commit 450a158d7ef01e44723802e28a65348375718a2c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 30 20:43:59 2004 +1000

     - (dtucker) [auth-pam.c auth-pam.h auth-passwd.c]: Bug #874: Re-add PAM
       support for PasswordAuthentication=yes.  ok djm@

commit 0ffe638bbbea203848e141e624960f0c40c1d51b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 27 09:59:31 2004 +1000

     - (dtucker) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec
       contrib/README CREDITS INSTALL] Bug #873: Correct URLs for x11-ssh-askpass
       and Jim Knoble's email address , from Jim himself.

commit 12984968fb4efab7974e245e2d8a263149d6ace7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 24 13:37:13 2004 +1000

     - (dtucker) [sshd.c] Fix typo in comment.

commit b53355eca5dc476aaaf53c49ef145c397c5c2275
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 24 11:55:36 2004 +1000

     - (dtucker) [auth-pam.c] Bug #839: Ensure that pam authentication "thread"
       is terminated if the privsep slave exits during keyboard-interactive
       authentication.  ok djm@

commit 89413dbafa5a5f237ba1040b74e6437b8b1ff1e0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 24 10:36:23 2004 +1000

       - dtucker@cvs.openbsd.org 2004/05/23 23:59:53
         [auth.c auth.h auth1.c auth2.c servconf.c servconf.h sshd_config sshd_config.5]
         Add MaxAuthTries sshd config option; ok markus@

commit e534e1212703c04906d3ab00ba768f3a45bd2370
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 24 10:35:14 2004 +1000

       - jmc@cvs.openbsd.org 2004/05/22 16:01:05
         [ssh.1]
         kill whitespace at eol;

commit 1973c8889875042977ded9774b4363509f4aa79a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 24 10:34:36 2004 +1000

       - djm@cvs.openbsd.org 2004/05/22 06:32:12
         [clientloop.c ssh.1]
         use '-h' for help in ~C commandline instead of '-?'; inspired by jmc@

commit e7066dfde3d4ac36038050b6027a742356f7b1f1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 24 10:18:05 2004 +1000

       - djm@cvs.openbsd.org 2004/05/21 11:33:11
         [channels.c channels.h clientloop.c serverloop.c ssh.1]
         bz #756: add support for the cancel-tcpip-forward request for the server and
         the client (through the ~C commandline). reported by z3p AT twistedmatrix.com;
         ok markus@

commit e4ab1157db90ff9602940669ccfda679aa4094a0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 24 10:14:24 2004 +1000

       - markus@cvs.openbsd.org 2004/05/21 08:43:03
         [kex.h moduli.c tildexpand.c]
         add prototypes for -Wall; ok djm

commit e16758294783f418cee7713dac031d5aeaf1e76c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 24 10:13:07 2004 +1000

       - dtucker@cvs.openbsd.org 2004/05/20 10:58:05
         [clientloop.c]
         Trivial type fix 0 -> '\0'; ok markus@

commit cdf547afe4f7b6ad9b3143bb79163fa7a00f6721
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 24 10:12:19 2004 +1000

       - djm@cvs.openbsd.org 2004/05/19 12:17:33
         [sftp-client.c sftp.c]
         gracefully abort transfers on receipt of SIGINT, also ignore SIGINT while
         waiting for a command; ok markus@

commit efec7c23b1d646578ddc47685496bdb9f1e9187f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun May 23 06:22:27 2004 +0000

     - (bal) [openbsd-compat/sys-queue.h] Reintroduce machinary to handle
       old/broken/incomplete <sys/queue.h>.

commit b409718797da73ac4ee2de422d894297b2c2d8f7
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 23 14:09:40 2004 +1000

     - (djm) [configure.ac] Warn if the system has no known way of figuring out
       which user is on the other end of a Unix domain socket; ok dtucker@

commit 701d0514ee3ffc5e8fde36bb0559709490407053
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 23 11:47:58 2004 +1000

     - (djm) Explain consequences of UsePAM=yes a little better in sshd_config;
       ok dtucker@

commit 991d95f4125ca1ce40bb7d469b69b1e174b78967
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 20:24:10 2004 +1000

     - (dtucker) [openbsd-compat/getrrsetbyname.c] Fix typo too: HAVE_DECL_H_ERROR
       -> HAVE_DECL_H_ERRNO.

commit cc2685577b71e6b4722410e85305cf1d8e317166
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 20:10:38 2004 +1000

     - (dtucker) [openbsd-compat/getrrsetbyname.c] Check that HAVE_DECL_H_ERROR
       is defined before using.

commit b6db172a79bed9014d152c3df4003f689b6ccf39
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 17:29:35 2004 +1000

     - (dtucker) [auth-pam.c scard-opensc.c] Tinderbox says auth-pam.c uses
       readpass.h, grep says scard-opensc.c does too.  Replace with misc.h.

commit 1dcff9a3a8891db8d7fce77e43e675ce60e0fe44
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 16:51:40 2004 +1000

     - (dtucker) [sshd.8] Bug #843: Add warning about PasswordAuthentication to
       UsePAM section.  Parts from djm@ and jmc@.

commit a86b453bb3282bac162693dc7366286c7334a91f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 16:45:46 2004 +1000

       - dtucker@cvs.openbsd.org 2004/05/13 02:47:50
         [ssh-agent.1]
         Add examples to ssh-agent.1, bz#481 from Ralf Hauser; ok deraadt@

commit 1f8311c836a20ce4923e2142d206f8d8073d0ca4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 16:39:33 2004 +1000

       - deraadt@cvs.openbsd.org 2004/05/11 19:01:43
         [auth.c auth2-none.c authfile.c channels.c monitor.c monitor_mm.c
         packet.c packet.h progressmeter.c session.c openbsd-compat/xmmap.c]
         improve some code lint did not like; djm millert ok

commit b42714e28bcb22c5b52b0266813165cf5e7e9ccb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 16:31:48 2004 +1000

       - djm@cvs.openbsd.org 2004/05/09 01:26:48
         [kex.c]
         don't overwrite what we are trying to compute

commit e14e005f41cf541017ab4e285f0b2ec23a21b7ff
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 16:30:44 2004 +1000

       - djm@cvs.openbsd.org 2004/05/09 01:19:28
         [OVERVIEW auth-rsa.c auth1.c kex.c monitor.c session.c sshconnect1.c
         sshd.c] removed: mpaux.c mpaux.h
         kill some more tiny files; ok deraadt@

commit 770fc01078ffd4952ceb91f617063b390730499c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 16:24:32 2004 +1000

       - djm@cvs.openbsd.org 2004/05/09 00:06:47
         [moduli.c ssh-keygen.c] removed: moduli.h
         zap another tiny header; ok deraadt@

commit e608ca2965a4afe58477faf1d36ce574416b66a7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 16:15:47 2004 +1000

       - djm@cvs.openbsd.org 2004/05/08 00:21:31
         [clientloop.c misc.h readpass.c scard.c ssh-add.c ssh-agent.c ssh-keygen.c
         sshconnect.c sshconnect1.c sshconnect2.c] removed: readpass.h
         kill a tiny header; ok deraadt@

commit 06f2bd8bde688390c34eeedfb3aa7b8e4133542d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 16:06:46 2004 +1000

       - deraadt@cvs.openbsd.org 2004/05/08 00:01:37
         [auth.c clientloop.c misc.h servconf.c ssh.c sshpty.h sshtty.c
         tildexpand.c], removed: sshtty.h tildexpand.h
         make two tiny header files go away; djm ok

commit dcf6ec48f617af4dc27c8cd42960fa65240f5488
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 13:03:56 2004 +1000

       - jmc@cvs.openbsd.org 2004/05/06 11:24:23
         [ssh_config.5]
         typo from John Cosimano (PR 3770);

commit 2e578f6292934382e7d1e8a9a60bd4fb7de20163
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 13:03:04 2004 +1000

       - jmc@cvs.openbsd.org 2004/05/04 18:36:07
         [scp.1]
         SendEnv here too;

commit 8e968a596ae7263de3fbe858a61abb37bfc01f50
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 13 11:56:16 2004 +1000

     - (dtucker) [configure.ac] Bug #867: Additional tests for res_query in
       libresolv, fixes problems detecting it on some platforms
       (eg Linux/x86-64).  From Kurt Roeckx via Debian, ok mouring@

commit c0796d76767bd747d5387a9a0ae6d66fd21471fc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 3 09:19:03 2004 +1000

       - dtucker@cvs.openbsd.org 2004/05/02 23:17:51
         [scp.1]
         ConnectionTimeout -> ConnectTimeout for scp.1 too.

commit 3d5cbb77617483ba53694085630635c8ac26dd0a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon May 3 09:13:15 2004 +1000

       - dtucker@cvs.openbsd.org 2004/05/02 23:02:17
         [sftp.1]
         ConnectionTimeout -> ConnectTimeout here too, pointed out by jmc@

commit edae0ec12a11c872b4fb5571c243be272e6065d6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 2 22:15:52 2004 +1000

       - dtucker@cvs.openbsd.org 2004/05/02 11:57:52
         [ssh.1]
         ConnectionTimeout -> ConnectTimeout, from m.a.ellis at ncl.ac.uk via
         Debian.  ok djm@

commit 097e1e9a977fbcc810daef08f35eb24b15575890
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 2 22:15:08 2004 +1000

       - dtucker@cvs.openbsd.org 2004/05/02 11:54:31
         [sshd.8]
         Man page grammar fix (bz #858), from damerell at chiark.greenend.org.uk
         via Debian; ok djm@

commit 7a6c06620e0a39f22fdff277bcbbb9ebe9861dd8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 2 22:14:03 2004 +1000

       - jmc@cvs.openbsd.org 2004/04/28 07:13:42
         [sftp.1 ssh.1]
         add SendEnv to -o list;

commit b2a601cc99f26f26f6854f542d87915537a60a35
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 2 22:13:20 2004 +1000

       - jmc@cvs.openbsd.org 2004/04/28 07:02:56
         [sshd_config.5]
         remove unnecessary .Pp;

commit 1e0c9bf9fb22054f8815c6e6f6e6bc9aec94758b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 2 22:12:48 2004 +1000

       - djm@cvs.openbsd.org 2004/04/28 05:17:10
         [ssh_config.5 sshd_config.5]
         manpage fixes in envpass stuff from Brian Poole (raj AT cerias.purdue.edu)

commit 46bc075474211c711b102f6278783bb68d7530a8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 2 22:11:30 2004 +1000

       - djm@cvs.openbsd.org 2004/04/27 09:46:37
         [readconf.c readconf.h servconf.c servconf.h session.c session.h ssh.c
         ssh_config.5 sshd_config.5]
         bz #815: implement ability to pass specified environment variables from
         the client to the server; ok markus@

commit 47abce45b20ba52c0eb7f19240851f45bc1babc2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 2 22:09:00 2004 +1000

       - djm@cvs.openbsd.org 2004/04/22 11:56:57
         [moduli.c]
         Bugzilla #850: Sophie Germain is the correct name of the French
         mathematician, "Sophie Germaine" isn't; from Luc.Maisonobe@c-s.fr

commit 7749c5163bd58f8208368ddbf3a2638bdb69b93f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 23 18:57:13 2004 +1000

     - (dtucker) [README.platform] List prereqs for building on Cygwin.

commit 5bb140019c1fc16ddd66cf8408f2489fd5db03cb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 23 18:53:10 2004 +1000

     - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno
       as extern int if not already declared.  Fixes compile errors on old SCO
       platforms.  ok tim@

commit 752e4e603fdf09ce6323ad665ebce9a3f4093b9c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 21 12:29:13 2004 +1000

     - (djm) Update config.guess and config.sub to autoconf-2.59 versions; ok tim@

commit 5561e0b73dcaf0d6cf56afcff2a09d87ae14f34e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 20 20:28:55 2004 +1000

     - (djm) [configure.ac] Check whether libroken is required when building
       with Heimdal

commit 50bec89baf0d70f4833ed24fc93300d7f04471f9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 20 20:20:40 2004 +1000

    rewrap

commit 914420fe747a447748efd1aa94d03ba5942fa4be
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 20 20:14:07 2004 +1000

       - djm@cvs.openbsd.org 2004/04/19 21:51:49
         [ssh.c]
         fix idiot typo that i introduced in my last commit;
         spotted by cschneid AT cschneid.com

commit 1a81258f4ee82e1f9d9d48a2ed93b93d6ce0485d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 20 20:13:32 2004 +1000

       - jmc@cvs.openbsd.org 2004/04/19 16:12:14
         [ssh_config.5]
         kill whitespace at eol;

commit c970cb9052f85a7570f8003f598cc95fccf70601
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 20 20:12:53 2004 +1000

       - djm@cvs.openbsd.org 2004/04/19 13:02:40
         [ssh.1 ssh_config.5]
         document strict permission checks on ~/.ssh/config; prompted by,
         with & ok jmc@

commit 57a4476a69e1d64d051b766b0ac9c9c3ef496864
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 20 20:11:57 2004 +1000

       - djm@cvs.openbsd.org 2004/04/18 23:10:26
         [readconf.c readconf.h ssh-keysign.c ssh.c]
         perform strict ownership and modes checks for ~/.ssh/config files,
         as these can be used to execute arbitrary programs; ok markus@
         NB. ssh will now exit when it detects a config with poor permissions

commit 1824c071abc61b6a70cd0a077b957bd6e0c80cde
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 20 20:10:46 2004 +1000

     - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for above change

commit 0b51a52a103d346ea6eaf6e76aa0d9fa3b643d04
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 20 20:07:19 2004 +1000

     - (djm) OpenBSD CVS Sync
       - henning@cvs.openbsd.org 2004/04/08 16:08:21
         [sshconnect2.c]
         swap the last two parameters to TAILQ_FOREACH_REVERSE. matches what FreeBSD     and NetBSD do.
         ok millert@ mcbride@ markus@ ho@, checked to not affect ports by naddy@

commit bddc2b0179ea35da7269d025c8f690593bff54b6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Apr 19 23:50:16 2004 +1000

       - markus@cvs.openbsd.org 2004/04/01 12:19:57
         [scp.c]
         limit trust between local and remote rcp/scp process,
         noticed by lcamtuf; ok deraadt@, djm@

commit d04121f0ab2fcefb4b77523c38f8babadbebe38d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Apr 19 22:16:53 2004 +1000

       - djm@cvs.openbsd.org 2004/03/31 21:58:47
         [canohost.c]
         don't skip ip options check when UseDNS=no; ok markus@ (ID sync only)

commit dca6a4dd883ffe85bf3f67e6052e03217683d612
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Apr 19 22:10:52 2004 +1000

       - djm@cvs.openbsd.org 2004/03/30 12:41:56
         [sftp-client.c]
         sync comment with reality

commit 0a74ae7c1447a86a56d75b2093b322ed1fb4d552
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Apr 19 22:04:21 2004 +1000

       - dtucker@cvs.openbsd.org 2004/03/08 10:17:12
         [regress/login-timeout.sh]
         Missing OBJ, from tim@.  ok markus@ (Already fixed, ID sync only)

commit 9929d1f6666f49ed3ea60769913e40b2bb6e3f1a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Apr 19 22:01:37 2004 +1000

       - dtucker@cvs.openbsd.org 2004/02/29 22:04:45
         [regress/login-timeout.sh]
         Use sudo when restarting daemon during test.  ok markus@

commit 17421e774a35ff97a95d7a1f502b8d3e41fb30c3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Apr 18 21:56:23 2004 +1000

    Add people with several and/or large contributions

commit 2eb4236d86c657dadd2dc782efd5c0857a673c4f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 18 21:15:43 2004 +1000

     - (djm) [openbsd-compat/bsd-cygwin_util.c] Recent versions of Cygwin allow
       change of user context without a password, so relax auth method
       restrictions; from vinschen AT redhat.com; ok dtucker@

commit 7f64afdc092e7c4a69772be968618cf29cf5de3f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 18 20:32:56 2004 +1000

    update relnotes URL for release

commit 2a9bf4b3d3fd0dfef74eed568152b71348fbbda6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Apr 18 11:00:26 2004 +1000

     - (dtucker) [auth-pam.c] Log username and source host for failed PAM
       authentication attempts.  With & ok djm@

commit fe6d5aa54b8c832b6c0f06c94a21a2b48c34cc06
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Apr 16 20:03:07 2004 -0700

     - (tim) [configure.ac] Set SETEUID_BREAKS_SETUID, BROKEN_SETREUID and
       BROKEN_SETREGID for SCO OpenServer 3

commit 9c870f966a747fc04c69f5203261ee8b936fabd5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 16 22:47:55 2004 +1000

     - (djm) [auth-krb5.c auth.h session.c] Explicitly refer to Kerberos ccache
       file using FILE: method, fixes problems on Mac OSX.
       Patch from simon@sxw.org.uk; ok dtucker@

commit c99a19b44539df51837f125f0607dda9f2876094
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 16 17:58:28 2004 +1000

     - (dtucker) [regress/sftp-cmds.sh] Skip quoting test on Cygwin, since
       FAT/NTFS does not permit quotes in filenames.  From vinschen at redhat.com

commit 855ffbfc5a08d084ea994515c458f3272ad6d819
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Apr 16 09:22:40 2004 +1000

    Typo fix in comment

commit 0ac4500f377a522671aaae03c38a2eb88c38542f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 14 20:14:26 2004 +1000

     - (djm) [configure.ac] Fix detection of libwrap on OpenBSD; ok dtucker@

commit 06a8cfe796bc9afb8bdd9127f348139ec68809fd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Apr 14 17:24:30 2004 +1000

     - (dtucker) [auth-skey.c defines.h monitor.c] Make skeychallenge explicitly
       4-arg, with compatibility for 3-arg versions.  From djm@, ok me.

commit 3b908f65b4b668d20ef0d20c695cb053829bdaef
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Apr 14 15:26:39 2004 +1000

     - (dtucker) [acconfig.h configure.ac defines.h] Bug #673: check for 4-arg
       skeychallenge(), eg on NetBSD.  ok mouring@

commit 96cc26b614cc6da9439b514a13cecfd6c7aed0bd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Apr 14 13:04:35 2004 +1000

     - (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning
       from bug #701 (text from jfh at cise.ufl.edu).

commit 036768e48c6039b0f784453cbc388078f72c8d53
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 8 16:12:30 2004 +0000

     - (bal) [monitor.c monitor_wrap.c] Ok.. Last time.  Promise.  Tim suggested
       limiting scope and dtucker@ agreed.

commit 11f18294abc3316ed2d8e38c92bd7bd1bbb134e4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Apr 8 16:16:06 2004 +1000

     - (dtucker) [defines.h loginrec.c] Define UT_LINESIZE if not defined and
       simplify loginrec.c.  ok tim@

commit 1b9f2a6b44d09b21304c06e36c3cb4577937c0f9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 8 05:11:03 2004 +0000

     - (bal) [monitor.c monitor_wrap.c] Second try.  Put the zlib.h headers
       back and #undef TARGET_OS_MAC instead.  (Bug report pending with Apple)

commit 4d2f361f966db93e473eb455856f28f4340bed68
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Apr 8 10:57:05 2004 +1000

     - (dtucker) [loginrec.c] Use UT_LINESIZE if available, prevents truncating
       pty name on Linux 2.6.x systems.  Patch from jpe at eisenmenger.org.

commit a8104b5c92a44774208e6d8b979d583975ba67d4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 7 04:16:11 2004 +0000

     - (bal) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Check to see
       if Krb5 library exports krb5_init_etc() since some OSes (like MacOS/X)
       are starting to restrict it as internal since it is not needed by
        developers any more. (Patch based on Apple tree)
    - (bal) [monitor.c monitor_wrap.c] monitor_wrap.c] moved zlib.h higher since
        krb5 on MacOS/X conflicts.  There may be a better solution, but this will
        work for now.

commit ac7c998a2d7f89d36c5896c0845b54c595af4cb8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Apr 7 08:04:09 2004 +1000

     - (dtucker) [session.c] Flush stdout after displaying loginmsg.  From
       f_mohr at yahoo.de.

commit 3c7c83a554993cdd377b518b0ad404778aab68d7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Apr 6 21:41:51 2004 +1000

    Oops, leftover from testing

commit 4398cf59279b0216e1b7b958d678b8cf00e6cd5c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Apr 6 21:39:02 2004 +1000

     - (dtucker) [configure.ac] Bug #816, #748 (again): Attempt to detect
       broken getaddrinfo and friends on HP-UX.  ok djm@

commit 8db9a0ffd86d387e5362c5ecf7fdb225bd6f71bf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Apr 6 21:31:12 2004 +1000

     - (dtucker) [acconfig.h configure.ac defines.h] Bug #820: don't use
       updwtmpx() on IRIX since it seems to clobber utmp.  ok djm@

commit ccea02057448dc475cd404a67c13e08a1ec8e660
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 31 15:17:54 2004 +1000

     - (djm) Bug #825: Fix ip_options_check() for mapped IPv4/IPv6 connection;
       with & ok dtucker@

commit 17addf04639a3fa1bbe7c0b8d7acfbf1893e8e18
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 30 20:57:57 2004 +1000

     - (dtucker) [auth-pam.c] rename the_authctxt to sshpam_authctxt in auth-pam.c
       to reduce potential confusion with the one in sshd.c.  ok djm@

commit 809031f6c45c11fc0f6fd132502160171427674e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Mar 30 14:03:45 2004 +1000

     - (dtucker) [configure.ac] Bug #811: Use "!" for LOCKED_PASSWD_PREFIX on
       Linuxes, since that's what many use.  ok djm@

commit b385059346a6011fab3bc293a82636e391bb03cc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Mar 27 16:44:21 2004 +1100

     - (dtucker) [session.c] Bug #817: Clear loginmsg after fork to prevent
       duplicate login messages for mutli-session logins.  ok djm@

commit 154e8b82ef2f28438c7978a9c2d3f9a1fe0cfd65
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 09:40:01 2004 +1100

     - (djm) Crank RPM spec versions

commit aed7cee49ad086f438e69203b3a9ddf0a5985ed4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 09:39:09 2004 +1100

       - markus@cvs.openbsd.org 2004/03/20 10:40:59
         [version.h]
         3.8.1

commit 0c889cd9e9b3e6f628e650e160a6ba8443fa3604
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 09:36:00 2004 +1100

       - markus@cvs.openbsd.org 2004/03/11 10:21:17
         [ssh.c sshd.c]
         ssh, sshd: sync version output, ok djm

commit b408786db92c76bcff026c22e256d8b3485309ad
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 09:35:21 2004 +1100

       - markus@cvs.openbsd.org 2004/03/11 08:36:26
         [sshd.c]
         trim usage; ok deraadt

commit 5095510e5f7516bc92b26f88a08042f86ef97f61
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 09:34:58 2004 +1100

       - markus@cvs.openbsd.org 2004/03/10 09:45:06
         [ssh.c]
         trim usage to match ssh(1) and look more like unix. ok djm@

commit 3df755e441bbc5b0084389fbb5e4c90509ac609b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 09:34:26 2004 +1100

       - markus@cvs.openbsd.org 2004/03/09 22:11:05
         [ssh.c]
         increase x11 cookie lifetime to 20 minutes; ok djm

commit bfba3542614fb900384f957c908a34d125e81d78
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 22 09:29:57 2004 +1100

    - (djm) [sshd.c] Drop supplemental groups if started as root

commit 4fefe24c0181ebce9ff4b83b3d25f1a3b1c5d2f8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 11 14:20:10 2004 +1100

     - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker

commit 7c991ab1e1ea69125de51fc650369ff14c1d6fd7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Mar 10 21:06:32 2004 +1100

     - (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #812: #undef getaddrinfo
       before redefining it, silences warnings on Tru64.

commit aa5383243d7347302a82f29809a788b43b3ff837
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Mar 8 12:12:18 2004 -0800

     - (tim) [regress/README.regress] Document ssh-rand-helper issue. ok bal

commit 8448e66770d5d4f1b8e46f529c98cb237aa27540
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 8 23:13:15 2004 +1100

       - dtucker@cvs.openbsd.org 2004/03/08 10:18:57
         [sshd_config.5]
         Document KerberosGetAFSToken;  ok markus@

commit 3b51301a4b30fbb421397f2cb3bcf11b593b2532
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 8 23:13:00 2004 +1100

       - djm@cvs.openbsd.org 2004/03/08 09:38:05
         [ssh-keyscan.c]
         explicitly initialise remote_major and remote_minor.
         from cjwatson AT debian.org; ok markus@

commit bd394c329b2356cc29fe76cc02ff1c63d3e8cd3c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 8 23:12:36 2004 +1100

       - markus@cvs.openbsd.org 2004/03/05 10:53:58
         [readconf.c readconf.h scp.1 sftp.1 ssh.1 ssh_config.5 sshconnect2.c]
         add IdentitiesOnly; ok djm@, pb@

commit c0f27d8782ecb76c7b83ba1fb047b9ca696b2071
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 8 23:12:19 2004 +1100

       - djm@cvs.openbsd.org 2004/03/03 09:31:20
         [sftp.c]
         Fix initialisation of progress meter; ok markus@

commit 9ba3069a8b346efc7c1b1ea5908e6c5c8b01fec2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 8 23:12:02 2004 +1100

       - djm@cvs.openbsd.org 2004/03/03 09:30:42
         [sftp-client.c]
         Don't print duplicate messages when progressmeter is off
         Spotted by job317 AT mailvault.com; ok markus@

commit 57aae982bec2e5e8e9db487626c24f7c35aedfb2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 8 23:11:25 2004 +1100

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2004/03/03 06:47:52
         [sshd.c]
         change proctiltle after accept(2); ok henning, deraadt, djm

commit dbf7a74ee569a9544276db42eb7aee1141072a24
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 8 23:04:06 2004 +1100

     - (dtucker) [auth-pam.c auth-pam.h auth1.c auth2.c monitor.c monitor_wrap.c
       monitor_wrap.h] Bug #808: Ensure force_pwchange is correctly initialized
       even if keyboard-interactive is not used by the client.  Prevents segfaults
       in some cases where the user's password is expired (note this is not
       considered a security exposure).  ok djm@

commit 86c093d2895989d1258459b797ce3630eaa47d1a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 8 22:59:03 2004 +1100

     - (dtucker) [configure.ac sshd.c openbsd-compat/bsd-misc.h
       openbsd-compat/setenv.c] Unset KRB5CCNAME on AIX to prevent it from being
       inherited by the child.  ok djm@

commit 112aaac0ce350fb3365bfb6e2d69faef81422783
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Mar 8 22:13:12 2004 +1100

     - (dtucker) [sshd.c] Back out rev 1.270 as it caused problems on some
       platforms (eg SCO, HP-UX) with logging in the wrong TZ.

commit f45eff21dcd2bc3b1f29587f8ace2f2985e18ade
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Mar 7 10:40:01 2004 -0800

     - (tim) [regress/login-timeout.sh] fix building outside of source tree.

commit 91bf45c5977d090adb03b8cabb4293203341f34c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 4 22:59:36 2004 +1100

     - (dtucker) [auth-passwd.c auth-sia.c auth-sia.h defines.h
       openbsd-compat/xcrypt.c] Bug #802: Fix build error on Tru64 when
       configured --with-osfsia.  ok djm@

commit b9b6021667953fcb578215c97e523d6cea281ea9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 4 20:03:54 2004 +1100

     - (dtucker) [auth-pam.c] Reset signal status when starting pam auth thread,
       prevent hanging during PAM keyboard-interactive authentications.  ok djm@

commit 4b385d4bc0ac6e27b5ba5ce941d1603417963603
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 4 19:54:10 2004 +1100

     - (dtucker) [auth-pam.c] Don't try to export PAM when compiled with
       -DUSE_POSIX_THREADS.  From antoine.verheijen at ualbert ca.  ok djm@

commit 6e26bf15ee35f39d58b2195f81061ccef4a9d287
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Mar 4 19:47:29 2004 +1100

    wrong year

commit 6c4914afccb0c188a2c412d12dfb1b73e362e07e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 3 11:08:59 2004 +1100

     - (djm) [configure.ac ssh-agent.c] Use prctl to prevent ptrace on ssh-agent
       ok dtucker

commit ad4a188e46485656bbb650fd389203b6da438a24
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Feb 29 15:53:37 2004 -0800

     - (tim) [configure.ac] Put back bits mistakenly removed from Rev 1.188

commit b099d855d3288f60d397144314f7cb3cd57cf790
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 29 21:30:05 2004 +1100

     - (dtucker) [regress/try-ciphers.sh] Skip acss if not compiled in (eg if we
       built with openssl < 0.9.7)

commit 9468ba33a1d1a5fd6258658dee1058500e1082f0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 29 20:38:26 2004 +1100

       - dtucker@cvs.openbsd.org 2004/02/28 13:44:45
         [regress/try-ciphers.sh]
         Test acss too; ok markus@

commit 68b184c75d771f6a878e09e1fafc66e293e8ba27
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 29 20:37:06 2004 +1100

       - dtucker@cvs.openbsd.org 2004/02/28 12:16:57
         [regress/dynamic-forward.sh]
         Make dynamic-forward understand nc's new output.  ok markus@

commit 437a5f035b2e5c8fb4d15add5a90721f7e5918b4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 29 20:33:51 2004 +1100

       - markus@cvs.openbsd.org 2004/02/24 17:06:52
         [regress/ssh-com-client.sh regress/ssh-com-keygen.sh
         regress/ssh-com-sftp.sh regress/ssh-com.sh]
         test against recent ssh.com releases

commit 03c907a22b0ef594745699927d784c4ae9ec68b1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 29 20:31:08 2004 +1100

       - markus@cvs.openbsd.org 2004/02/24 16:56:30
         [regress/test-exec.sh]
         allow arguments in ${TEST_SSH_XXX}

commit 017fd61a9266049f8bed8ef742992a75cd6ca33f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 29 20:30:17 2004 +1100

       - dtucker@cvs.openbsd.org 2004/02/17 08:23:20
         [regress/Makefile regress/login-timeout.sh]
         Add regression test for LoginGraceTime; ok markus@

commit effc84ce5b304a0cef62b13e72172847b6f03ceb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 29 20:15:08 2004 +1100

       - dtucker@cvs.openbsd.org 2004/02/27 22:49:27
         [dh.c]
         Reset bit counter at the right time, fixes debug output in the case where
         the DH group is rejected.  ok markus@

commit c56c7ef592e9dded048faa1443049679aacc0421
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 29 20:13:34 2004 +1100

       - dtucker@cvs.openbsd.org 2004/02/27 22:44:56
         [dh.c]
         Make /etc/moduli line buffer big enough for 8kbit primes, in case anyone
         ever uses one.  ok markus@

commit fc113c97a3935896869e8bccf7a70cb7c7ed95d3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 29 20:12:33 2004 +1100

       - dtucker@cvs.openbsd.org 2004/02/27 22:42:47
         [dh.c]
         Prevent sshd from sending DH groups with a primitive generator of zero or
         one, even if they are listed in /etc/moduli.  ok markus@

commit d592048c36ee15cef19d6177aeb015b69bfa8833
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 29 20:11:30 2004 +1100

       - djm@cvs.openbsd.org 2004/02/25 00:22:45
         [sshd.c]
         typo in comment

commit 78ffe2650176a7529d1ffa5798c92cdc5f45d6e2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 27 03:01:19 2004 +0000

     - (bal) KNF our sshlogin.c even if the code looks nothing like upstream
       code due to diversity issues.

commit 124055dd3bc38d280763972f50ade3b0d3ee46d3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 25 10:57:45 2004 +1100

     - (djm) Don't specify path to PAM modules in Redhat sshd.pam; from Fedora

commit d891395a09d07fac9af1de43a34b84e020fe00f9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 25 10:56:31 2004 +1100

     - (djm) Trim ChangeLog

commit 3342470472b45f000576e9f79f55bb30c7d517b8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 24 17:13:28 2004 +1100

     - (djm) Release 3.8p1

commit e8c898a54fcced28a11047d5633dfc947800a3b5
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Feb 23 21:47:04 2004 -0800

    [configure.ac] SCO3 needs -lcrypt_i for -lprot

commit 149543e56d3c07de83bb13b5afea4ceb89bf7af1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 16:14:41 2004 +1100

     - (dtucker) {README.platform] Add platform-specific notes.

commit 5ce131f2b6f714bba1fa3214cc15a0b2b90d68e8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 16:13:24 2004 +1100

     - (dtucker) [README] Add pointer to release notes.  ok djm@

commit 9fc475f0c37e2bd171a710907fe60b15c5d869e3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 24 16:00:02 2004 +1100

     - (djm) Crank RPM spec versions

commit 18959006c0a6bf399a2ed5342cce827cf1cee2cf
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Feb 23 20:51:06 2004 -0800

    [openbsd-compat/getrrsetbyname.c] Make gcc 2.7.2.3 happy.  ok djm@

commit 2359aa985d5d853fb06cf1499bc6e1b0fe0173d4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 13:17:30 2004 +1100

     - (dtucker) [uidswap.c] Minor KNF.  ok djm@

commit a811d9a9a167ffb018f18be84dc810826e73c8f2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 24 13:05:11 2004 +1100

     - (djm) [groupaccess.c uidswap.c] Bug #787: Size group arrays at runtime
       using sysconf() if available Based on patches from
       holger AT van-lengerich.de and openssh_bugzilla AT hockin.org

commit 8a4e4f8779ca39e97a8580263c94dc91cfb745ca
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 10:58:10 2004 +1100

    Add missing ok

commit 0d27ed1c19d6de6bd50ab1f5096aee1c1ee97f69
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 10:37:33 2004 +1100

     - (dtucker) [configure.ac gss-serv-krb5.c ssh-gss.h] Define GSSAPI when found
       with krb5-config, hunt down gssapi.h and friends.  Based partially on patch
       from deengert at anl.gov.
    
    For the MIT Kerberos bug against krb5-config related to this see:
    http://krbdev.mit.edu/rt/Ticket/Display.html?id=2240

commit a6ea420c38160bf06f97bd6169597594dabee982
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 09:24:01 2004 +1100

       - markus@cvs.openbsd.org 2004/02/23 15:16:46
         [version.h]
         enter 3.8

commit 0acc92a93cf66305042bfe27a19d9767b39599b2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 09:21:41 2004 +1100

       - markus@cvs.openbsd.org 2004/02/23 15:12:46
         [bufaux.c]
         encode 0 correctly in buffer_put_bignum2; noted by Mikulas Patocka
         and drop support for negative BNs; ok otto@

commit efa3706f053895ffa6fca255585c20e55b11f769
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 09:20:29 2004 +1100

       - markus@cvs.openbsd.org 2004/02/23 12:02:33
         [sshd.c]
         backout revision 1.279; set listen socket to non-block; ok henning.

commit 37bd3663bf47ea977e503ce8ba75dde675a7e4b9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 09:19:15 2004 +1100

       - markus@cvs.openbsd.org 2004/02/19 21:15:04
         [sftp-server.c]
         switch to new license.template

commit 1825f26d21af352f3a5e2a804636c92cee700282
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 24 00:01:27 2004 +1100

     - (dtucker) [session.c] Bug #789: Only make setcred call for !privsep in the
       non-interactive path.  ok djm@

commit e828d0c75b5a6e8a1736b25802739516a0212d6d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 22 11:55:07 2004 +1100

    Add missed ChangeLog entries for previous commits...

commit 31e0e8b997d4f2ccff3cd0e80867306dc9c21302
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 22 11:37:48 2004 +1100

     - (dtucker) [configure.ac] Apply krb5-config --libs fix to non-gssapi path
       too.

commit b4dc6c23a58a5e12c292c5cb3613bd5d924ff5ea
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 22 10:23:35 2004 +1100

     - (dtucker) [auth-passwd.c] Only check password expiry once.  Prevents
       multiple warnings if a wrong password is entered.

commit aa0aecad99c4714336117d22a7c68982684cef4b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 22 10:22:05 2004 +1100

     - (dtucker) [auth-shadow.c auth.h] Provide warnings of impending account or
       password expiry.  ok djm@

commit 15ee748f2835f301499f8c31b6b4e56f5deca7de
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Feb 22 09:43:15 2004 +1100

     - (dtucker) [auth-shadow.c auth.c auth.h] Move shadow account expiry test
       to auth-shadow.c, no functional change.  ok djm@

commit 2e45cb0fb4a1250792e27ce14c556661719e5861
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 20 20:37:44 2004 +1100

     - (djm) [openbsd-compat/setproctitle.c] fix comments; from grange@

commit 051b0acbbce7218dcfa1521ad22f860aa20b3008
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 18 22:59:43 2004 +1100

     - (djm) [log.c] Tighten openlog_r tests

commit 82c78b3b9dc5000af2294ce2010cf137dc8fa9ec
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 18 15:42:31 2004 +1100

     - (djm) [log.c] Correct use of HAVE_OPENLOG_R

commit 05a75b6e5b67390fd858eecc6046a39ae9933556
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 18 14:31:23 2004 +1100

       - jmc@cvs.openbsd.org 2004/02/17 19:35:21
         [sshd_config.5]
         remove cruft left over from RhostsAuthentication removal;
         ok markus@

commit 20e1fabace87376a9868b9bd83bd57db13f5763d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 18 14:30:55 2004 +1100

       - djm@cvs.openbsd.org 2004/02/17 11:03:08
         [sftp.c]
         sftp.c and sftp-int.c, together at last; ok markus@

commit 9a47d86661129552df18074cef60d00f682a5d17
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 18 14:20:29 2004 +1100

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2004/02/17 07:17:29
         [sftp-glob.c sftp.c]
         Remove useless headers; ok deraadt@

commit d7d46bb6068927cf14c6b083eb50984d3111e05c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 18 14:11:13 2004 +1100

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2004/02/17 07:17:29
         [sftp-glob.c sftp.c]
         Remove useless headers; ok deraadt@

commit a22897df0689d19e3fcd0d791fb63b49aa95c1cb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 18 11:21:12 2004 +1100

     - (dtucker) [configure.ac] Handle case where krb5-config --libs returns a
       path with a "-" in it.  From Sergio.Gelato at astro.su.se.

commit 5cf8ef735c5d7d76c1c69e491419b1311ec1575b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 17 23:20:07 2004 +1100

     - (dtucker) [auth-pam.c] Store output from pam_session and pam_setcred for
       display after login.  Should fix problems like pam_motd not displaying
       anything, noticed by cjwatson at debian.org.  ok djm@

commit ba53b839d30de74c994b8c6a20360967cb844ade
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 17 20:46:59 2004 +1100

     - (dtucker) [auth-pam.c] Tidy up PAM debugging.  ok djm@

commit 34255b9f4c0546a455a71277ad05734ba6878198
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 17 20:33:52 2004 +1100

     - (djm) Bug #698: Specify FILE: for KRB5CCNAME; patch from
       stadal@suse.cz and simon@sxw.org.uk

commit 4e60ed74a670146364719bcd0f1fb6515a26edd4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 17 17:07:59 2004 +1100

       - djm@cvs.openbsd.org 2004/02/17 05:39:51
         [sftp-client.c sftp-client.h sftp-glob.c sftp-glob.h sftp-int.c]
         [sftp-int.h sftp.c]
         switch to license.template for code written by me (belated, I know...)

commit 98225c2950f30aaab75eb649dbe5c667ea2fda04
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 17 16:49:41 2004 +1100

     - (djm) Simplify the license on code I have written. No code changes.

commit 3d5352e1561174adca1df4336358d1847190d107
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Feb 12 09:27:21 2004 -0800

    [configure.ac] Make sure -lcrypto is before -lsocket for sco3.  ok mouring@

commit 9ad7e0e805157ad7374fe91dc20e6d0b2cc9ebf1
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Feb 12 07:17:10 2004 -0800

    [Makefile.in regress/sftp-badcmds.sh regress/test-exec.sh]
    Portablity fixes. Data sftp transfers needs to be world readable. Some
    older shells hang on while loops when  doing sh -n some_script. OK dtucker@

commit 43fa557ce2b908373356cdf4b9dbd2da68350ba4
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Feb 11 14:46:40 2004 -0800

    [configure.ac] Fix comment to match code changes in ver 1.117

commit 812e77614209115d88785f672b13a4728612bb9d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 11 20:44:13 2004 +1100

    Remove password expiry from TODO

commit cee6d4cf5ac447aaba72972cc8ce835ca2378417
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Feb 11 18:48:52 2004 +1100

     - (dtucker) [auth-passwd.c auth-shadow.c] Only enable shadow expiry check
       if HAS_SHADOW_EXPIRY is set.

commit 13a707b60da56258d91170010d9fa1f75ef18eb0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 10 17:15:05 2004 +1100

     - (dtucker) [configure.ac] Bug #345: Do not disable utmp on HP-UX 10.x.
        ok djm@

commit c28b88a3144f39a9cf244fbf7bb32d8532846fa1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 10 16:49:35 2004 +1100

     - (dtucker) [configure.ac loginrec.c] Bug #464: Use updwtmpx on platforms
       that support it.  from & ok mouring@

commit cfea2063e5e1f5d1415fd520f48730268e68d69e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 10 15:27:34 2004 +1100

     - (dtucker) [openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Move
       include from port-aix.h to port-aix.c and remove unnecessary function
       definition.  Fixes build errors on AIX.
    
    #include'ing auth.h in port-aix.h causes conflicting definitions of Authctxt
    in sshconnect2.c.  Sigh.

commit 0d86829fca3eaa01392a34547935f73463422c4e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 10 13:51:34 2004 +1100

    Remove auth-shadow.h reference

commit 1921ed9f966b6d8262a906d01e515b2737962e2b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 10 13:23:28 2004 +1100

     - (dtucker) [auth-pam.c auth-pam.h session.c] Bug #14: Use do_pwchange to
       change expired PAM passwords for SSHv1 connections without privsep.
       pam_chauthtok is still used when privsep is disabled.  ok djm@

commit ffae5320769fab707a8f0c533e5900d5e03f5820
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 10 13:05:40 2004 +1100

     - (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #563: Prepend ssh_ to compat
       functions to avoid conflicts with Heimdal's libroken.  ok djm@

commit 9df3defdbb122c406072760e07859a3b4ebf567e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 10 13:01:14 2004 +1100

     - (dtucker) [LICENCE Makefile.in auth-passwd.c auth-shadow.c auth.c auth.h
       defines.h] Bug #14: Use do_pwchange to support password expiry and force
       change for platforms using /etc/shadow.  ok djm@

commit e3dba82dd44c165716ce2a81157b6c2f269fc0af
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Feb 10 12:50:19 2004 +1100

     - (dtucker) [auth-passwd.c auth.h openbsd-compat/port-aix.c
        openbsd-compat/port-aix.h] Bug #14: Use do_pwchange to support AIX's
        native password expiry.

commit 693f8a8aae5b79360f13f478c09235061aa59647
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Feb 7 12:29:39 2004 +1100

    - (dtucker) [cipher.c] enable AES counter modes with OpenSSL 0.9.5.
       ok djm@, markus@

commit fc57f71fb1106a5b1b6d37cb595a21d36a049e7e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Feb 7 10:41:48 2004 +1100

       - dtucker@cvs.openbsd.org 2004/02/06 23:41:13
         [cipher-ctr.c]
         Use EVP_CIPHER_CTX_key_length for key length.  ok markus@
         (This will fix builds with OpenSSL 0.9.5)

commit 074593538a18780c24ac055210f55abd8adfbf2b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 6 21:29:41 2004 +1100

     - (dtucker) [configure.ac includes.h] Include <sys/stream.h> if present,
       required on Solaris 2.5.1 for queue_t, which is used by <sys/ptms.h>.

commit 7f73a4955d289236119fb332f73c493d9ed85035
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 6 16:41:37 2004 +1100

       - markus@cvs.openbsd.org 2004/02/05 15:33:33
         [progressmeter.c]
         fix ETA for > 4GB; bugzilla #791; ok henning@ deraadt@

commit a8be9e23d236f0e9c27214418280b752b68dbd54
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 6 16:40:27 2004 +1100

       - dtucker@cvs.openbsd.org 2004/02/05 05:37:17
         [monitor.c sshd.c]
         Pass SIGALRM through to privsep child if LoginGraceTime expires. ok markus@

commit c52a29913d3850b4333000b3309cede03f8bf824
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 6 16:38:16 2004 +1100

    Sync  Ids missed in password expiry sync

commit 23bc8d0bff3ee9976be32a287079f7571b5bd50d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 6 16:24:31 2004 +1100

       - markus@cvs.openbsd.org 2004/01/30 09:48:57
         [auth-passwd.c auth.h pathnames.h session.c]
         support for password change; ok dtucker@
         (set password-dead=1w in login.conf to use this).
         In -Portable, this is currently only platforms using bsdauth.

commit 819d4526ca01cdb1e226df8b00c606c537e3e1f7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 6 16:18:47 2004 +1100

    Add bug no.

commit e45674ae8026b9399fc0778a7e964efbcd093689
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 6 16:17:51 2004 +1100

     - (dtucker) [openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Restore
       previous authdb setting after auth calls.  Fixes problems with setpcred
       failing on accounts that use AFS or NIS password registries.

commit ecc9d46dc53cddb5a220f89e6160b3ca6178bb9c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 6 16:04:08 2004 +1100

     - (dtucker) [sshd.c] Bug #757: Clear child's environment to prevent
       accidentally inheriting from root's environment.  ok djm@

commit f58fb7e727895b8f66ed9914ca0a04913f2b56c1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 6 15:59:06 2004 +1100

     - (dtucker) [configure.ac] Bug #748: Always define BROKEN_GETADDRINFO
       for HP-UX 11.11.  If there are known-good configs where this is not
       required, please report them.  ok djm@

commit ef3a4a208c4bd711f7c4131e3bb293313652450d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 6 15:30:50 2004 +1100

     - (dtucker) [session.c] Bug #789: Do not call do_pam_setcred as a non-root
       user, since some modules might fail due to lack of privilege.  ok djm@

commit 6977fe742b363b84822afd45c9b2ef36f16e0ae3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 6 15:26:10 2004 +1100

     - (dtucker) [cipher-acss.c cipher.c] Enable acss only if building with
       OpenSSL >= 0.9.7.  ok djm@

commit 9976246dfd175829f2a1bed0beeb5229a82d9492
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Feb 6 15:22:43 2004 +1100

     - (dtucker) [acss.c acss.h] Fix $Id tags.

commit 6f737f422cb7b4e64024a129dc37c4a57150279b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 30 15:00:50 2004 +1100

    Minor wording change

commit 2df334380b54922097745bdb6f98f20342b10fbd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 30 14:34:21 2004 +1100

     - (dtucker) [configure.ac openbsd-compat/bsd-cray.c openbsd-compat/bsd-cray.h]
       Bug #775: Cray fixes from wendy at cray.com

commit dcc736b7de2206c391e46289f096f60426f7d418
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 30 14:20:59 2004 +1100

     - (dtucker) [configure.ac] Add --without-zlib-version-check.  Feedback from
       tim@, ok several

commit 46662bfc21dad33f8d7c05206bae15f79abe5b5f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 30 13:02:55 2004 +1100

       - djm@cvs.openbsd.org 2004/01/13 09:49:06
         [sftp-batch.sh]
         don't delete thyself when running without obj/ ; ok markus@

commit 633f3e0dd06a466188f0d9ada921b02d94e6a338
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 30 13:00:29 2004 +1100

       - jmc@cvs.openbsd.org 2003/11/07 10:16:44
         [ssh-com.sh]
         adress -> address, and a few more; all from Jonathon Gray;

commit 22991ba2e2da92eda0cd2580022323fef8bea2c2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 30 12:58:51 2004 +1100

       - dtucker@cvs.openbsd.org 2003/10/11 11:49:49
         [Makefile banner.sh]
         Test missing banner file, suppression of banner with ssh -q, check return
         code from ssh.  ok markus@

commit 77970695deb9f7b05552b03b1f5264f821256438
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 28 15:44:04 2004 +1100

     - (dtucker) [moduli] Import new moduli file from OpenBSD.

commit 4f9f6794c599c67c6ae6647ab5820cd1e36fca0d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 28 12:26:14 2004 +1100

     - (dtucker) [regress/README.regress] Add tcpwrappers issue, noted by tim@

commit ec69203e45b8f567153a6e55396b048a67276d9b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 27 21:22:00 2004 +1100

       - djm@cvs.openbsd.org 2004/01/27 10:08:10
         [sftp.c]
         reorder parsing so user:skey@host:file works (bugzilla #777)
         patch from admorten AT umich.edu; ok markus@

commit f6723f08e0b54e00f988f58ff0f1d4d8575ee7bd
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 27 21:21:27 2004 +1100

       - djm@cvs.openbsd.org 2004/01/25 03:49:09
         [sshconnect.c]
         reset nonblocking flag after ConnectTimeout > 0 connect; (bugzilla #785)
         from jclonguet AT free.fr; ok millert@

commit b2d1c2b3b82fbbd78ed3dce8e26a3e70fb1b9165
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 27 21:20:59 2004 +1100

       - hshoexer@cvs.openbsd.org 2004/01/23 19:26:33
         [cipher.c]
         rename acss@opebsd.org to acss@openssh.org
         ok deraadt@

commit b21be844711ff285ba24cf70bfb2c7238f60c1cc
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 27 21:20:11 2004 +1100

       - mouring@cvs.openbsd.org 2004/01/23 17:57:48
         [sftp-int.c]
         Fix issue pointed out with ls not handling large directories
         with embeded paths correctly.  OK damien@

commit 4f0fe684daa4f35e1c91224e144c91b4869946fa
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 27 21:19:21 2004 +1100

     - (djm) OpenBSD CVS Sync
       - hshoexer@cvs.openbsd.org 2004/01/23 17:06:03
         [cipher.c]
         enable acss for ssh
         ok deraadt@ markus@
     - (djm) [acss.c acss.h cipher-acss.c] Portable support for ACSS
       if libcrypto lacks it

commit 01326ebada378a58c1797fb5a75f631a70a020e0
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Jan 26 21:40:35 2004 -0800

    [defines.h openbsd-compat/getrrsetbyname.h] Move defines for HFIXEDSZ
    and T_SIG to getrrsetbyname.h

commit 2597bfd1fbc2ba9aca603c489cdf90d7b9ac5834
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Jan 26 19:03:39 2004 -0800

    [configure.ac includes.h] add <sys/ptms.h> for grantpt() and friends.

commit ba1c2b82c47c6ebf6b79c639bc71e1d6f7dd5d26
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Jan 26 16:02:17 2004 -0800

    [defines.h] Add defines for HFIXEDSZ and T_SIG

commit eafd8e9c5596a46d657ebb6aaaba8902ffbc8b8f
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Jan 26 14:10:10 2004 -0800

    20040126
    [regress/test-exec.sh] RhostsAuthentication is deprecated.

commit 3084a6198cf03fed572624d5b3b76ad218e45ad2
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Jan 26 09:37:09 2004 -0800

    Typo in regress/README.regress

commit 6814411b3edb2b8076042200b8e1c93b686f77cf
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 24 13:50:39 2004 +1100

     - (djm) Typo in openbsd-compat/bsd-openpty.c; from wendyp AT cray.com

commit fcb6220da091b94c310a063b7ee939c5d5cd69e2
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Jan 23 18:35:16 2004 -0800

    [configure.ac] Remove hard coded -L/usr/local/lib and
    -I/usr/local/include. Users can do LDFLAGS="-L/usr/local/lib" \
    CPPFLAGS="-I/usr/local/include" ./configure if needed.

commit 3c78c5ed2fd12785842bbb9e3bd030fab19a9221
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 23 22:03:10 2004 +1100

     - (dtucker) [acconfig.h configure.ac includes.h servconf.c session.c]
       Change AFS symbol to USE_AFS to prevent namespace collisions, do not
       include kafs.h unless necessary.  From deengert at anl.gov.
    
    For consistency, all of the libkafs bits are now inside "#if defined(KRB5)
    && defined(USE_AFS)".

commit 6369958301f0184c95988f8c87a5494bab0bb0c6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 23 21:35:44 2004 +1100

     - (dtucker) [contrib/cygwin/README] Document new ssh-host-config options.
       Patch from vinschen at redhat.com.

commit 2dcd2393f4cddec66019608d71243d987a471277
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 23 17:13:33 2004 +1100

     - (dtucker) [configure.ac] Bug #788: Test for zlib.h presence and for
       zlib >= 1.1.4.  Partly from jbasney at ncsa.uiuc.edu.  ok djm@

commit 84938141d4efb3b00496f1e819192ee3377dad70
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 23 16:30:03 2004 +1100

     - (djm) Bug #776: Update contrib/redhat/openssh.spec to dynamically detect
       Kerberos location (and thus work with Fedora Core 1);
       from jason AT devrandom.org

commit d352636553bf85e21c697eca2e6873e78862576e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 23 14:16:26 2004 +1100

     - (djm) Do pam_session processing for systems with HAVE_LOGIN_CAP; from
       ralf.hack AT pipex.net; ok dtucker@

commit c900128e55134291e2d5dd0ec7ad18d97625cee3
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jan 22 16:10:03 2004 -0800

    [contrib/solaris/buildpkg.sh] Allow for the possibility of
    /usr/local being a symbolic link. Fixes problem reported by Henry Grebler.

commit 7fe8b72771ec847d824ce845f851338f1be9e6b2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 22 12:48:26 2004 +1100

     - (dtucker) [session.c] Enable AFS support in conjunction with KRB5 not
       just HEIMDAL.
    
    Currently this will make no difference, as only Heimdal (which defines KRB5
    anyway) has libkafs, however a libkafs that works with MIT may become
    available.  In that case it will be used too.

commit 1d3ca58705157ffd764515021434343aba1e8037
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 22 12:05:34 2004 +1100

     - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/
       GSSAPI detection, libs and includes.  ok djm@

commit f4da3bb6cadcb26fd6edd19887b5187c13724255
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 21 17:07:16 2004 +1100

       - deraadt@cvs.openbsd.org 2004/01/11 21:55:06
         [sshpty.c]
         for pty opening, only use the openpty() path.  the other stuff only needs
         to be in openssh-p; markus ok
     - (djm) [openbsd-compat/bsd-openpty.c] Rework old sshpty.c code into an
       openpty() replacement

commit e4f5a82d6e4748a99fef33a08986392742cc27c8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 21 14:11:05 2004 +1100

       - djm@cvs.openbsd.org 2004/01/21 03:07:59
         [sftp.c]
         initialise infile in main, rather than statically - from portable

commit fb1310eded0788f106dc7e1f113cc75e1206cb60
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 21 11:02:50 2004 +1100

       - markus@cvs.openbsd.org 2004/01/19 21:25:15
         [auth2-hostbased.c auth2-pubkey.c serverloop.c ssh-keysign.c sshconnect2.c]
         fix mem leaks; some fixes from Pete Flugstad; tested dtucker@

commit a04ad496f65ba1c0b6c71c13943ede2711464bc3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 21 11:02:09 2004 +1100

       - markus@cvs.openbsd.org 2004/01/19 09:24:21
         [channels.c]
         fake consumption for half closed channels since the peer is waiting for
         window adjust messages; bugzilla #790 Matthew Dillon; test + ok dtucker@
         reproduce with sh -c 'ulimit -f 10; ssh host -n od /bsd | cat > foo'

commit f84fed6f71fae6627f21c578dd1192e3014dac96
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 21 11:01:23 2004 +1100

       - markus@cvs.openbsd.org 2004/01/13 19:45:15
         [compress.c]
         cast for portability; millert@

commit 8f341f8b8b9e3fba2919b04cab2e3ce9df0f4139
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 21 11:00:46 2004 +1100

       - markus@cvs.openbsd.org 2004/01/13 19:23:15
         [compress.c session.c]
         -Wall; ok henning

commit 86a396857d4021a5f17c018654e2b7759c84dd04
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 21 11:00:04 2004 +1100

       - jmc@cvs.openbsd.org 2004/01/13 12:17:33
         [sftp.1]
         remove unnecessary Ic's;
         kill whitespace at EOL;
    
         ok djm@

commit 44f75c14f6f1eacfe6e1c98eae742019de24ad6a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 21 10:58:47 2004 +1100

       - djm@cvs.openbsd.org 2004/01/13 09:25:05
         [sftp-int.c sftp.1 sftp.c]
         Tidy sftp batchmode handling, eliminate junk to stderr (bugzilla #754) and
         enable use of "-b -" to accept batchfile from stdin; ok markus@

commit a8df9248cea285d1a6d6d1ec8d33a24f208fdc42
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 15 00:15:07 2004 +1100

     - (dtucker) [auth-pam.c] Add minor debugging.

commit 7ae09627982e4a7cdf072f8900b212c9b590c23c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 14 23:07:56 2004 +1100

     - (dtucker) [auth-pam.c] Reset signal handler in pthread_cancel too, add
       test for case where cleanup has already run.

commit 749bc95bd81aca8c69829551f9f1ae8c7d0bdefa
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jan 14 22:14:04 2004 +1100

     - (dtucker) [auth-pam.c] Have monitor die if PAM authentication thread exits
       unexpectedly.  with & ok djm@

commit 1b27c8fbcb8f59559bc3bcf4d9d6f739305b4ee8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jan 13 22:35:58 2004 +1100

     - (dtucker) [auth-pam.c] Relocate struct pam_ctxt and prototypes.  No
       functional changes.
    
    This is in preparation for a change to catch the authentication thread
    exitting unexpectedly, to split functional and cosmetic changes.

commit fd0894adae297f5ce1695d78b5738e21414d480c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jan 9 00:19:25 2004 +1100

     - (dtucker) [configure.ac] Remove extra (typo) comma.

commit 0234e8607fc8643c0bf151d735c5771caf61f9f8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jan 8 23:32:04 2004 +1100

     - (dtucker) [auth-pam.c defines.h] Bug #783: move __unused to defines.h and
       only define if not already.  From des at freebsd.org.

commit 409cb328c15fb5ffed00009c3290894bc888e736
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 5 22:36:51 2004 +1100

     - (dtucker) [acconfig.h configure.ac includes.h servconf.c session.c]
       Only enable KerberosGetAFSToken if Heimdal's libkafs is found.  with jakob@

commit e918318f2b1b7429ebd5d1fecf13d0692d4f0280
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jan 5 08:16:34 2004 +1100

     - (dtucker) [contrib/ssh-copy-id] Bug #781: exit if ssh fails.  Patch from
       cjwatson at debian.org.

commit 3c80d4a7b7492cca812f1963c29686bbb99a19b7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 2 18:02:44 2004 +1100

     - (djm) OSX/Darwin needs BIND_8_COMPAT to build getrrsetbyname. Report from
       jakob@

commit 0f47c53742a31b9682c05660dd8de1e860fb1fc5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 2 18:01:30 2004 +1100

     - (djm) OSX/Darwin put the PAM headers in a different place, detect this.
       Report from jakob@

commit c8ec16651ea05e160f5dd51dc70f0db946ee2761
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 2 17:53:04 2004 +1100

     - (djm) Remove useless DNS support configure summary message. from jakob@

commit 7a2ea78cc416956be619fc82f59b4eb20b3c2225
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 2 17:52:10 2004 +1100

     - (djm) OSX/Darwin needs BIND_8_COMPAT to build getrrsetbyname. Report from
       jakob@

commit 2a6b029f9969491319600b4623d56a85e57b9833
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Dec 31 14:59:17 2003 +1100

     - (dtucker) [configure.ac] Only test setresuid and setresgid if they exist.

commit ea2870619d295b0ff6398b3115c4a4e0ac543edb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Dec 31 11:43:24 2003 +1100

       - dtucker@cvs.openbsd.org 2003/12/31 00:24:50
         [auth2-passwd.c]
         Ignore password change request during password auth (which we currently
         don't support) and discard proposed new password.  corrections/ok markus@

commit 0b3b97512fc3bae1aad38ddff2222bcca5f80f0e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Dec 31 11:38:32 2003 +1100

       - millert@cvs.openbsd.org 2003/12/29 16:39:50
         [sshd_config]
         KeepAlive has been obsoleted, use TCPKeepAlive instead; markus@ OK

commit 22ef5087543839dd14e1591923e669518b5c13e8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Dec 31 11:37:34 2003 +1100

       - jakob@cvs.openbsd.org 2003/12/23 16:12:10
         [servconf.c servconf.h session.c sshd_config]
         implement KerberosGetAFSToken server option. ok markus@, beck@

commit a32e19c637cec7b6c4ce779c6b6586c3880de6b2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Dec 31 11:36:00 2003 +1100

       - markus@cvs.openbsd.org 2003/12/22 20:29:55
         [cipher-3des1.c]
         EVP_CIPHER_CTX_cleanup() for the des contexts; pruiksma@freesurf.fr

commit 06930c70ad47744dd96955a6a1b75df7c5eebc3b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Dec 31 11:34:51 2003 +1100

       - djm@cvs.openbsd.org 2003/12/22 09:16:58
         [moduli.c ssh-keygen.1 ssh-keygen.c]
         tidy up moduli generation debugging, add -v (verbose/debug) option to
         ssh-keygen; ok markus@

commit 3715be3cd3aab2bcf14a223c614f62c367730f67
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Dec 19 10:58:43 2003 +1100

     - (dtucker) [defines.h] Bug #458: Define SIZE_T_MAX as UINT_MAX if we
       typedef size_t ourselves.

commit c376c8647edb08fa1659882c4a96babedec94d18
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Dec 18 16:08:59 2003 +1100

    Enable commented-out "if (compat20)" test.  (Should not have been committed.)

commit 07705c788e9bcd8d35dfbb59d2b12c61b8601c9a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Dec 18 15:34:31 2003 +1100

     - (dtucker) [auth-pam.c] Do PAM chauthtok during SSH2 keyboard-interactive
       authentication.  Partially fixes bug #423.  Feedback & ok djm@
    
    Some background on why this is the way it is:
    * Solaris 8's pam_chauthtok ignores the CHANGE_EXPIRED_AUTHTOK flag, so
      we must call do_pam_account() to figure out if the password is expired.
    * AIX 5.2 does not like having pam_acct_mgmt() called twice, once from the
      authentication thread and once from the main shell child, so we cache the
      result, which must be passed from the authentication thread back to the
      monitor.

commit 454da0b3dcf8b62b57ff5cf1edfa606b90f553d2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Dec 18 12:52:19 2003 +1100

     - (dtucker) [configure.ac] Don't use setre[ug]id on DG-UX, from Tom Orban.

commit 563eb99711026601974115e7d2084ad9b676a188
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 18 00:34:06 2003 +0000

     - (bal) [openbsd-compat/bsd-misc.c] unset 'signal' defined if we are
       using a real 'signal()' (Noticed by a NeXT Compile)

commit e937be36c309fff54978e56159503bcfee76d4c0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Dec 17 18:53:26 2003 +1100

     - (dtucker) [acconfig.h configure.ac uidswap.c] Bug #645: Check for
       setres[ug]id() present but not implemented (eg some Linux/glibc
       combinations).

commit 8975ddf11b17bf58191c653a0173d91e50e942c7
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 17 16:33:53 2003 +1100

       - markus@cvs.openbsd.org 2003/12/16 15:51:54
         [dh.c]
         use <= instead of < in dh_estimate; ok provos/hshoexer;
         do not return < DH_GRP_MIN

commit 509b0107f0e67cb4af663c147179d35fa6425614
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 17 16:33:10 2003 +1100

       - markus@cvs.openbsd.org 2003/12/16 15:49:51
         [clientloop.c clientloop.h readconf.c readconf.h scp.1 sftp.1 ssh.1]
         [ssh.c ssh_config.5]
         application layer keep alive (ServerAliveInterval ServerAliveCountMax)
         for ssh(1), similar to the sshd(8) option; ok beck@; with help from
         jmc and dtucker@

commit baafb981a46d79e576b340dab436c17415f0033a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 17 16:32:23 2003 +1100

       - markus@cvs.openbsd.org 2003/12/14 12:37:21
         [ssh_config.5]
         we don't support GSS KEX; from Simon Wilkinson

commit d696551443ff947cb6e3e690adcecd17877f16ea
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 17 16:31:53 2003 +1100

       - dtucker@cvs.openbsd.org 2003/12/09 23:45:32
         [clientloop.c]
         Clear exit code when ssh -N is terminated with a SIGTERM.  ok markus@

commit 12c150e7e0711e29ea5dc78d3c9ed46221319dc5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 17 16:31:10 2003 +1100

       - markus@cvs.openbsd.org 2003/12/09 21:53:37
         [readconf.c readconf.h scp.1 servconf.c servconf.h sftp.1 ssh.1]
         [ssh_config.5 sshconnect.c sshd.c sshd_config.5]
         rename keepalive to tcpkeepalive; the old name causes too much
         confusion; ok djm, dtucker; with help from jmc@

commit 9836cf8d717455f1bba2dfbf2e41f074fc6bac48
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 17 16:30:06 2003 +1100

       - markus@cvs.openbsd.org 2003/12/09 17:30:05
         [ssh.c]
         don't modify argv for ssh -o; similar to sshd.c 1.283

commit b9997192a71ae603500e80d52f3e4e24913b87da
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 17 16:29:22 2003 +1100

       - markus@cvs.openbsd.org 2003/12/09 17:29:04
         [sshd.c]
         fix -o and HUP; ok henning@

commit b5820f40bf6c088b02106ef900c6608357834448
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 17 16:27:32 2003 +1100

    20031217
     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2003/12/09 15:28:43
         [serverloop.c]
         make ClientKeepAlive work for ssh -N, too (no login shell requested).
         1) send a bogus channel request if we find a channel
         2) send a bogus global request if we don't have a channel
         ok + test beck@

commit 5cd9d443ef70e5c8bf8cc21bc6cc81298e18e863
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Dec 10 00:54:38 2003 +1100

       - dtucker@cvs.openbsd.org 2003/12/09 13:52:55
         [moduli.c]
         Prevent ssh-keygen -T from outputting moduli with a generator of 0, since
         they can't be used for Diffie-Hellman.  Assistance and ok djm@

commit a615314d3b784fbafff3ea72aaf7dc18cd23dbeb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Dec 10 00:52:37 2003 +1100

     - (dtucker) [ssh-keyscan.c] Sync RCSIDs, missed in SSH_SSFDMAX change below.

commit 1cbc44493527d9ad0d80d119d5f1fd047e575d4a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 9 19:19:38 2003 +1100

       - djm@cvs.openbsd.org 2003/12/07 06:34:18
         [moduli.c]
         remove unused debugging #define templates

commit 564f19e2370d71129a85c3aa1130ab812c3ae3c8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 9 19:18:07 2003 +1100

       - markus@cvs.openbsd.org 2003/12/08 11:00:47
         [kexgexc.c]
         print requested group size in debug; ok djm

commit 3175eb9a5a426f6e494d523fe6e96fcc426995c1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 9 19:15:11 2003 +1100

       - markus@cvs.openbsd.org 2003/12/02 17:01:15
         [channels.c session.c ssh-agent.c ssh.h sshd.c]
         use SSH_LISTEN_BACKLOG (=128) in listen(2).

commit 1fb0425359f7753d0163c5dce6a3335359da8c5a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 9 19:07:13 2003 +1100

       - markus@cvs.openbsd.org 2003/12/02 12:15:10
         [progressmeter.c]
         improvments from andreas@:
         * saner speed estimate for transfers that takes less than a second by
           rounding the time to 1 second.
         * when the transfer is finished calculate the actual total speed
           rather than the current speed which is given during the transfer

commit 37afa9d9a463a45b0d8ac62c577deac95bc79c2b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 9 19:05:42 2003 +1100

       - djm@cvs.openbsd.org 2003/11/26 21:44:29
         [cipher-aes.c]
         fix #ifdef before #define; ok markus@
         (RCS ID sync only, Portable already had this)

commit 4c56843e44a7dfa10bce91a2440eaac0d918124e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Dec 9 19:01:51 2003 +1100

       - matthieu@cvs.openbsd.org 2003/11/25 23:10:08
         [ssh-add.1]
         ssh-add doesn't need to be a descendant of ssh-agent. Ok markus@, jmc@.

commit 88368a3034f3fff742c3a4c79b873e2cb6a4c1bb
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Dec 8 12:35:59 2003 -0800

    [configure.ac] Bug 770. Fix --without-rpath.

commit 3db2e4daf7333ac0b3ae90f23aa9668c7723ddfb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 24 13:33:34 2003 +1100

     - (djm) Annotate OpenBSD-derived files in openbsd-compat/ with original
       source file path (in OpenBSD tree).

commit e0113ccc08725142ca263dd61734bc93e1a3d39b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 24 13:10:09 2003 +1100

       - dtucker@cvs.openbsd.org 2003/11/24 00:16:35
         [ssh.1 ssh.c]
         Make ssh -k mean GSSAPIDelegateCredentials=no. Suggestion & ok markus@

commit a4b33dfb6dff6bebb8f08f72eabaa796aa8bb7d4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 24 13:09:27 2003 +1100

       - djm@cvs.openbsd.org 2003/11/23 23:18:45
         [ssh-keygen.c]
         consistency PATH_MAX -> MAXPATHLEN; ok markus@
         (RCS ID sync only)
       - djm@cvs.openbsd.org 2003/11/23 23:21:21
         [scp.c]
         from portable: rename clashing variable limit-> limit_rate; ok markus@
         (RCS ID sync only)

commit e00074a7267a2a73a75003dadf43459b7191349b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 24 13:07:45 2003 +1100

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2003/11/23 23:17:34
         [ssh-keyscan.c]
         from portable - use sysconf to detect fd limit; ok markus@
         (tidy diff by adding SSH_SSFDMAX macro to defines.h)

commit 927f52783ea99ac9bfad4f65bc5b79ba6255cc8c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 24 12:57:25 2003 +1100

     - (djm) [canohost.c] Move IPv4inV6 mapped address normalisation to its own
       function and call it unconditionally

commit 5924ceb22d8eb5e03bad93b7c0b9c6e30ed0814b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 22 15:02:42 2003 +1100

     - (djm) [packet.c] Shuffle #ifdef to reduce conditionally compiled code

commit 841b9f1aadbc18ad1e70d592c64e88782426bb53
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 22 14:48:49 2003 +1100

     - (djm) [sftp-int.c] Remove duplicated code from bogus sync

commit ce34674a9fe98fd8d9df6f54de8dd3fc707826a8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 22 14:41:58 2003 +1100

    sync whitespace - no code change

commit 4da295c051d9d02a73a46432ac116c31b6839274
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 22 14:39:04 2003 +1100

     - (djm) [scp.c] Rename limitbw -> limit_rate to match upstreamed patch

commit 28e7dfdb06fad2d6a146122251383dbee5f0a60d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 22 14:36:35 2003 +1100

    Minor sync w/OpenBSD

commit 4e06a1d75d0f692c84f21347d4e1c4242dc1a96e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 22 14:25:15 2003 +1100

     - (dtucker) [auth-sia.c configure.ac] Tru64 update from cmadams at hiwaay.net.
       Use permanently_set_uid for SIA, only define DISABLE_FD_PASSING when SIA
       is enabled, rely on SIA to check for locked accounts if enabled.  ok djm@

commit d76341616dfebd4addc9c9594767ab1832ccb100
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 22 14:16:56 2003 +1100

     - (dtucker) [auth-passwd.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h]
       Move AIX specific password authentication code to port-aix.c, call
       authenticate() until reenter flag is clear.

commit 0eae4422350c4903a23d20b8a5153f939d721428
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 22 14:15:30 2003 +1100

    knf in portable-code (no code change)

commit 240fdfa90998439df519393d4aa475c14557dc36
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 22 14:10:02 2003 +1100

     - (dtucker) [channels.c] Make AIX write limit code clearer.  Suggested by djm@

commit ec217adf70d3d49676c8a6d8fb4630904bd5e975
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 22 12:11:06 2003 +1100

    Whitespace sync

commit 787b2ec18c013a5076765f93882550918658ea89
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 21 23:56:47 2003 +1100

    more whitespace (tabs this time)

commit a8e06cef35c205e1aa562513c6d034a10c8c9a6d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 21 23:48:55 2003 +1100

       - djm@cvs.openbsd.org 2003/11/21 11:57:03
         [everything]
         unexpand and delete whitespace at EOL; ok markus@
         (done locally and RCS IDs synced)

commit 8c5e91c03fdd2693f0635f8b2a9904bffc94ce16
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 21 23:09:10 2003 +1100

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2003/11/20 11:39:28
         [progressmeter.c]
         fix rounding errors; from andreas@

commit f96d18362d4d1702e804473465601c2d316f5e52
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 18 22:01:48 2003 +1100

       - djm@cvs.openbsd.org 2003/11/18 10:53:07
         [monitor.c]
         unbreak fake authloop for non-existent users (my screwup). Spotted and
         tested by dtucker@; ok markus@

commit 4bb1dd3166c2a04394e9ec55fdff6bf6ad667e39
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 18 22:01:25 2003 +1100

     - (djm) OpenBSD CVS Sync
       - dtucker@cvs.openbsd.org 2003/11/18 00:40:05
         [serverloop.c]
         Correct check for authctxt->valid.  ok djm@

commit 8a1624c42df87c0dc0cad75f45bbb9eb34fcd59a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 18 12:45:35 2003 +1100

     - (dtucker) [auth-pam.c] Only use pam_putenv if our platform has it. ok djm@

commit 18df00cc77b39fe7858cf987eb9a4f7c314af018
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Nov 18 12:42:07 2003 +1100

     - (dtucker) [auth-pam.c] Convert chauthtok_conv into a generic tty_conv,
       and use it for do_pam_session.  Fixes problems like pam_motd not displaying
       anything.  ok djm@

commit 6aef38f5ac65ad599454159c82530b62d740b9b9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 18 10:45:20 2003 +1100

     - (djm) Fix early exit for root auth success when UsePAM=yes and
       PermitRootLogin=no

commit 0425d40194f36c57423c014b0730a9d344dbe019
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 22:18:21 2003 +1100

       - markus@cvs.openbsd.org 2003/11/17 11:06:07
         [auth2-gss.c gss-genr.c gss-serv.c monitor.c monitor.h monitor_wrap.c]
         [monitor_wrap.h sshconnect2.c ssh-gss.h]
         replace "gssapi" with "gssapi-with-mic"; from Simon Wilkinson;
         test + ok jakob.

commit c756e9b56e5b4649f120c417eb9bc99cf23db10f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:41:42 2003 +1100

     - (djm) Export environment variables from authentication subprocess to
       parent. Part of Bug #717

commit 9bdba70350919fced9ecdf5ca8a3709d22d69797
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:27:55 2003 +1100

     - (djm) Bug #632: Don't call pam_end indirectly from within kbd-int
       conversation function

commit 51bf11fcc9be7b101d0aee71da80a739f87e0608
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:20:47 2003 +1100

       - djm@cvs.openbsd.org 2003/11/17 09:45:39
         [msg.c msg.h sshconnect2.c ssh-keysign.c]
         return error on msg send/receive failure (rather than fatal); ok markus@

commit 91c6aa4468a1a8b8e76fbf1c64719055c6acdffa
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:20:18 2003 +1100

       - markus@cvs.openbsd.org 2003/11/14 13:19:09
         [sshconnect2.c]
         cleanup and minor fixes for the client code; from Simon Wilkinson

commit fe44847cb82d984618176722376f0a491f7b2b29
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:19:49 2003 +1100

       - jmc@cvs.openbsd.org 2003/11/12 20:14:51
         [ssh_config.5]
         make verb agree with subject, and kill some whitespace;

commit 150b55745b5a0790cfc8d5e6560ab5e7f2f94340
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:19:29 2003 +1100

       - jakob@cvs.openbsd.org 2003/11/12 16:39:58
         [dns.c dns.h readconf.c ssh_config.5 sshconnect.c]
         update SSHFP validation. ok markus@

commit c1f2792bd056dcefef5de55c5cbfdb1f790fd339
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:19:05 2003 +1100

       - dtucker@cvs.openbsd.org 2003/11/12 10:12:15
         [scp.c]
         When called with -q, pass -q to ssh; suppresses SSH2 banner.  ok markus@

commit f58b58ced10c2e9ae899f63d4e915ec9723cf5a1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:18:23 2003 +1100

       - jakob@cvs.openbsd.org 2003/11/10 16:23:41
         [bufaux.c bufaux.h cipher.c cipher.h hostfile.c hostfile.h key.c]
         [key.h sftp-common.c sftp-common.h sftp-server.c sshconnect.c sshd.c]
         [ssh-dss.c ssh-rsa.c uuencode.c uuencode.h]
         constify. ok markus@ & djm@

commit 939cd38122a2fadf9e82c15239ac86ec4cd1baec
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:17:24 2003 +1100

       - jmc@cvs.openbsd.org 2003/11/08 19:17:29
         [sftp-int.c]
         typos from Jonathon Gray;

commit a9fcd3ada222a731b8e6cce02b1693e31ca15695
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:16:55 2003 +1100

       - jakob@cvs.openbsd.org 2003/11/08 16:02:40
         [auth1.c]
         remove unused variable (pw). ok djm@
         (id sync only - still used in portable)

commit 3e3b5145e59c78cbde0f31f59a9267867b8eea2f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:13:40 2003 +1100

       - djm@cvs.openbsd.org 2003/11/04 08:54:09
         [auth1.c auth2.c auth2-pubkey.c auth.h auth-krb5.c auth-passwd.c]
         [auth-rhosts.c auth-rh-rsa.c auth-rsa.c monitor.c serverloop.c]
         [session.c]
         standardise arguments to auth methods - they should all take authctxt.
         check authctxt->valid rather then pw != NULL; ok markus@

commit 8f746ec9703a0072c7a07a25e4c059f7533bf94b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:11:15 2003 +1100

       - jakob@cvs.openbsd.org 2003/11/03 09:37:32
         [sshconnect.c]
         do not free static type pointer in warn_changed_key()

commit 5a38897dbb417d2dacaaeae5bd5ce0718a7f3fb1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:10:47 2003 +1100

       - jakob@cvs.openbsd.org 2003/11/03 09:09:41
         [sshconnect.c]
         move changed key warning into warn_changed_key(). ok markus@

commit 3e8f41e6ac9b4c39c667067e4bad8160095743f9
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 17 21:09:50 2003 +1100

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2003/11/03 09:03:37
         [auth-chall.c]
         make this a little more idiot-proof; ok markus@
         (includes portable-specific changes)

commit 203c40b513853503417f030cd6557c6991431a97
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Nov 15 12:13:16 2003 +1100

     - (dtucker) [regress/agent-ptrace.sh] Test for GDB output from Solaris and
       HP-UX, skip test on AIX.

commit ae52b7ca596adf4f2b9a5c6a19062f42a2543b02
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 13 19:52:31 2003 +1100

     - (dtucker) [auth-pam.c] Add newline to accumulated PAM_TEXT_INFO and
       PAM_ERROR_MSG messages.

commit 798ca84d606abba35ea790ba0a8abb25ca2b67cb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 13 11:28:49 2003 +1100

     - (dtucker) [README ssh-host-config ssh-user-config Makefile] (All
       contrib/cygwin).  Major update from vinschen at redhat.com.
       - Makefile provides a `cygwin-postinstall' target to run right after
         `make install'.
       - Better support for Windows 2003 Server.
       - Try to get permissions as correct as possible.
       - New command line options to allow full automated host configuration.
       - Create configs from skeletons in /etc/defaults/etc.
       - Use /bin/bash, allows reading user input with readline support.
       - Remove really old configs from /usr/local.

commit 0947ddff72097b45021facdae40d0beac0fe1e10
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Nov 13 11:21:31 2003 +1100

     - (dtucker) [auth-pam.c] Append newlines to lines output by the
       pam_chauthtok_conv().

commit 418a386f2bb62ff03cee5dfc2c8d561aba08d8c1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 6 20:27:51 2003 +1100

     - (djm) Clarify UsePAM consequences a little more

commit be8a771af144c1ef09ccc8db0cbfaa57b159a517
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 3 22:52:52 2003 +1100

     - (dtucker) [regress/agent-ptrace.sh] Use numeric uid and gid.

commit 655a5e0987b4bfab58994c3c5044c00b38f4a640
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 3 20:09:03 2003 +1100

       - markus@cvs.openbsd.org 2003/11/02 11:01:03
         [auth2-gss.c compat.c compat.h sshconnect2.c]
         remove support for SSH_BUG_GSSAPI_BER; simon@sxw.org.uk

commit 6db8f936aed10e9aca2cf37126264c12e2021cb0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 3 20:07:14 2003 +1100

       - markus@cvs.openbsd.org 2003/10/28 09:08:06
         [misc.c]
         error->debug for getsockopt+TCP_NODELAY; several requests

commit 56afe145e0c77f3447cf2098a4601289bd1c7ef1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 3 20:06:14 2003 +1100

       - avsm@cvs.openbsd.org 2003/10/26 16:57:43
         [sshconnect2.c]
         rename 'supported' static var in userauth_gssapi() to 'gss_supported'
         to avoid shadowing the global version.  markus@ ok

commit 8cc39788cbe1d9caaf78ebb4c0a29ad6a61a9876
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 3 20:05:03 2003 +1100

       - markus@cvs.openbsd.org 2003/10/21 09:50:06
         [auth2-gss.c]
         make sure the doid is larger than 2

commit a47c9bcda632c6dc85dd3f15a454f154fba8a6a6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 3 20:03:25 2003 +1100

       - markus@cvs.openbsd.org 2003/10/15 09:48:45
         [monitor_wrap.c]
         check pmonitor != NULL

commit 7c582db74b46f841f8efba7f5353ca16bf357ec2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Nov 3 18:59:29 2003 +1100

     - (dtucker) [contrib/cygwin/ssh-host-config] Ensure entries in /etc/services
       are created correctly with CRLF line terminations.  Patch from vinschen at
       redhat.com.

commit 2bdacad70cb754f47fced50301c0ea535d98aa71
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 21 23:12:37 2003 +1000

    Remove OBJ, shouldn't be there

commit ea4c670eb80721dab1237850011576eee15135f5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 21 22:27:08 2003 +1000

     - (dtucker) [regress/agent-ptrace.sh] Skip agent-test unless SUDO is set,
       make agent setgid during test.

commit 0d37b5ca7bbb3db7cbdba913a61f846d404b9415
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 21 12:41:14 2003 +1000

     - (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords
       directly.  Noted by Darren.Moffat at sun.com.

commit 9568ad96addfa861a7cf58fcd2e45015571ed40f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 17 16:32:11 2003 +1000

     - (dtucker) [INSTALL] Note that --with-md5 is now required on platforms with
       MD5 passwords even if PAM support is enabled.  From steev at detritus.net.

commit 6b1f8a3cf50a1a384e223f060d7159a012893a10
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Oct 15 09:22:39 2003 -0700

    [regress/banner.sh] portability fix.

commit c6020651bae65dc5f8e1533c56871aed2c5883f3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 15 17:48:20 2003 +1000

     - (dtucker) [auth.c] Check for disabled password expiry on HP-UX Trusted Mode.

commit b8b4d0bbbe29467a47a4014f37882a52066af1e1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 15 17:22:37 2003 +1000

    Fix comments to reflect recent change.

commit 5f88d3440efc4364b8d3f4c5efec0dccb3c2e21c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 15 16:57:57 2003 +1000

     - (dtucker) [acconfig.h configure.ac dns.c openbsd-compat/getrrsetbyname.c
       openbsd-compat/getrrsetbyname.h] DNS fingerprint support is now always
       compiled in but disabled in config.

commit 072a7b178c5fc52fd249d12519804c60c26da253
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 15 16:10:25 2003 +1000

       - markus@cvs.openbsd.org 2003/10/14 19:54:39
         [session.c ssh-agent.c]
         10X for mkdtemp; djm@

commit 64b77bcb4b40c97eb1da058ee5648da1a34c3b63
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 15 16:07:53 2003 +1000

       - jakob@cvs.openbsd.org 2003/10/14 19:43:23
         [README.dns]
         update
    
    Resynced with OpenBSD too: DNSFP support is now always compiled in
    so the configure support (and documentation thereof) can go away.

commit dda19d63ffeed569c57f4b9359bc358abe690d23
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 15 16:00:47 2003 +1000

       - jakob@cvs.openbsd.org 2003/10/14 19:42:10
         [dns.c dns.h readconf.c ssh-keygen.c sshconnect.c]
         include SSHFP lookup code (not enabled by default). ok markus@

commit b370ca9313b02581a5afff20d7555a34cf1f662d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 15 15:59:26 2003 +1000

       - markus@cvs.openbsd.org 2003/10/13 08:22:25
         [scp.1 sftp.1]
         don't refer to options related to forwarding; ok jmc@

commit f132c67e8e6d6025e1b23a4c55123f062c11f03d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 15 15:58:18 2003 +1000

       - jmc@cvs.openbsd.org 2003/10/12 13:12:13
         [ssh_config.5]
         note that EnableSSHKeySign should be in the non-hostspecific section;
         remove unnecessary .Pp;
         ok markus@

commit 7eb3de0dfbec68b1ae187c7896f6539679231092
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 15 15:56:58 2003 +1000

       - markus@cvs.openbsd.org 2003/10/11 11:36:23
         [monitor_wrap.c]
         return NULL for missing banner; ok djm@

commit d05b60189552bb2746a069d0d320b0ee64df06e1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 15 15:55:59 2003 +1000

       - markus@cvs.openbsd.org 2003/10/11 08:26:43
         [sshconnect2.c]
         search keys in reverse order; fixes #684

commit 0a118da00eff14f018a055b3c187f27aa7d78ecd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 15 15:54:32 2003 +1000

       - markus@cvs.openbsd.org 2003/10/11 08:24:08
         [readconf.c readconf.h ssh.1 ssh.c ssh_config.5]
         remote x11 clients are now untrusted by default, uses xauth(8) to generate
         untrusted cookies; ForwardX11Trusted=yes restores old behaviour.
         ok deraadt; feedback and ok djm/fries

commit a044f47679c27ca77b3ec19a6e0e148deb50a427
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 15 15:52:03 2003 +1000

       - markus@cvs.openbsd.org 2003/10/08 15:21:24
         [readconf.c ssh_config.5]
         default GSS API to no in client, too; ok jakob, deraadt@

commit 1f20394e92afa417c1201506f9ae8683170ac496
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 15 15:50:42 2003 +1000

       - jmc@cvs.openbsd.org 2003/10/08 08:27:36
         [scp.1 scp.c sftp-server.8 sftp.1 sftp.c ssh.1 sshd.8]
         scp and sftp: add options list and sort options. options list requested
         by deraadt@
         sshd: use same format as ssh
         ssh: remove wrong option from list
         sftp-server: Subsystem is documented in ssh_config(5), not sshd(8)
         ok deraadt@ markus@

commit 439ce0daf95fef595ba2592d16b17401a8bee135
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 9 14:20:15 2003 +1000

    Add FALLTHROUGH comment

commit 6c0c0705e30d9bb2b5951d37c681ee943eb17c43
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 9 14:13:53 2003 +1000

     - (dtucker) [sshd_config.5] UsePAM defaults to "no".  ok djm@

commit 0240ff786e08bf72a5b549e848cc4248ce93b636
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 8 17:52:10 2003 +1000

       - djm@cvs.openbsd.org 2003/10/07 07:04:52
         [regress/sftp-cmds.sh]
         more sftp quoting regress tests; ok markus

commit dc001a5ee3352b69d96a8970ec269df9df130fa3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 8 17:47:19 2003 +1000

       - dtucker@cvs.openbsd.org 2003/10/07 01:52:13
         [regress/Makefile regress/banner.sh]
         Test SSH2 banner.  ok markus@

commit 796448276c37fdd76dd0770c88a6d73d1f65c18e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 8 17:37:58 2003 +1000

       - deraadt@cvs.openbsd.org 2003/10/07 21:58:28
         [sshconnect2.c]
         set ptr to NULL after free

commit 64dbccc2a517fb77f648e4a9aed5ae78719309bb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 8 17:34:38 2003 +1000

       - djm@cvs.openbsd.org 2003/10/07 07:04:16
         [sftp-int.c]
         sftp quoting fix from admorten AT umich.edu; ok markus@

commit 046dff2a07d63d41967d2e8b97c3d460336932a2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Oct 8 17:32:02 2003 +1000

       - dtucker@cvs.openbsd.org 2003/10/07 01:47:27
         [sshconnect2.c]
         Don't use logit for banner, since it truncates to MSGBUFSIZ; bz #668 & #707.
         ok markus@

commit 89df7a3ecab70910fd745ddee01508f716255fb0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 7 20:35:57 2003 +1000

     - (dtucker) [configure.ac] Bug #710: Check for dlsym() in libdl on
       Reliant Unix.  Based on patch from Robert.Dahlem at siemens.com.

commit 3b2a06c0d7e4f044fc8dbf445d6e1a176c0e4cd9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 7 18:37:11 2003 +1000

     - (dtucker) [configure.ac] Bug #715: Set BROKEN_SETREUID and BROKEN_SETREGID
       on Reliant Unix.  Patch from Robert.Dahlem at siemens.com.

commit 2e8c0cc75244b2354fea2cba5f11277fe47deed4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 7 17:49:56 2003 +1000

     - (dtucker) [configure.ac openbsd-compat/Makefile.in openbsd-compat/strtoul.c]
       Bug #670: add strtoul() to openbsd-compat for platforms lacking it.  ok djm@

commit dfe6d914b7d2ad845a7fe2e92bdc4ff7c6f44539
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 7 17:40:56 2003 +1000

     - (dtucker) [contrib/redhat/openssh.spec] Bug #714: Now that UsePAM is a
       run-time switch, always build --with-md5-passwords.

commit f4bf5d086a63a1c30f174405b9d64b9bfe024890
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 7 11:31:22 2003 +1000

    So people know who to blame...

commit 8846a076392fee28963ad6fbdc93ed980fbb08a1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Oct 7 11:30:15 2003 +1000

     - (dtucker) [auth-pam.c auth-pam.h session.c] Make PAM use the new static
       cleanup functions.  With & ok djm@

commit 6f1f611a529bebfa04bd0dbf5196375f5db5fe23
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 7 10:18:22 2003 +1000

     - (djm) Delete autom4te.cache after autoreconf

commit 30aa44cf0a850fe4f3757edbe8c3e6553c14b3cc
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Oct 3 22:30:23 2003 -0700

    [contrib/caldera/openssh.spec] Remove obsolete --with-ipv4-default option.

commit e3ca82e06caeaeb106e27eabfd5d0fce04bb4cd3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 3 18:02:30 2003 +1000

       - markus@cvs.openbsd.org 2003/10/02 08:26:53
         [ssh-gss.h]
         missing $OpenBSD:; dtucker

commit 4a2505445f813d0637163f1e9c95f0b2fa993767
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Oct 3 17:57:24 2003 +1000

       - markus@cvs.openbsd.org 2003/10/02 10:41:59
         [sshd.c]
         print openssl version, too, several requests; ok henning/djm.

commit f391ba673043ceb9b385f8e2f068c18d88a9c987
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 2 20:07:09 2003 +1000

     - (dtucker) [session.c] Fix bus errors on some 64-bit Solaris configurations.
       Based on patches by Matthias Koeppe and Thomas Baden.  ok djm@

commit 7596d6866f0c29607e3997e644ef7cb113054084
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 2 17:32:30 2003 +1000

     - (dtucker) [ssh-gss.h] Prototype change missed in sync.

commit 0ccb59b85ccb393d7ac3c4e483b060644bed2e64
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 2 16:26:34 2003 +1000

     - (dtucker) [configure.ac] Don't set DISABLE_SHADOW when configuring
       --with-pam.  ok djm@

commit a49d36e7b9727edf472750a249dd7655ae1594fd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 2 16:20:54 2003 +1000

       - markus@cvs.openbsd.org 2003/09/29 20:19:57
         [servconf.c sshd_config]
         GSSAPICleanupCreds -> GSSAPICleanupCredentials

commit 6177695c0b4e5cc3fbcbcbf6d041781465bc4680
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 2 16:19:47 2003 +1000

       - jmc@cvs.openbsd.org 2003/09/29 11:40:51
         [ssh.1]
         - add list of options to -o and .Xr ssh_config(5)
         - some other cleanup
         requested by deraadt@;
         ok deraadt@ markus@

commit 8fca6b57b488cb2f8cd71186e0f8e17c431f7980
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 2 16:18:22 2003 +1000

       - markus@cvs.openbsd.org 2003/09/26 08:19:29
         [sshd.c]
         no need to set the listen sockets to non-block; ok deraadt@

commit 5dcdd219fb22f74d50c1a18997b72d89b7bf1fe9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 2 16:17:00 2003 +1000

       - markus@cvs.openbsd.org 2003/09/23 20:41:11
         [channels.c channels.h clientloop.c]
         move client only agent code to clientloop.c

commit 6cc310bd5fd4d15ad8194096e88741f7c17a3cbd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 2 16:15:15 2003 +1000

       - markus@cvs.openbsd.org 2003/09/23 20:18:52
         [progressmeter.c]
         don't print trailing \0; bug #709; Robert.Dahlem@siemens.com
         ok millert/deraadt@

commit 3e33cecf71860f73656a73b754cc7b7b9ec0b0ce
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Oct 2 16:12:36 2003 +1000

       - markus@cvs.openbsd.org 2003/09/23 20:17:11
         [Makefile.in auth1.c auth2.c auth.c auth.h auth-krb5.c canohost.c
         cleanup.c clientloop.c fatal.c gss-serv.c log.c log.h monitor.c monitor.h
         monitor_wrap.c monitor_wrap.h packet.c serverloop.c session.c session.h
         ssh-agent.c sshd.c]
         replace fatal_cleanup() and linked list of fatal callbacks with static
         cleanup_exit() function.  re-refine cleanup_exit() where appropriate,
         allocate sshd's authctxt eary to allow simpler cleanup in sshd.
         tested by many, ok deraadt@

commit b210aa2cfa546d8c31f8c725d1de3050c747bd6e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Sep 30 23:49:06 2003 +0000

     - (bal) Fix issues in openbsd-compat/realpath.c

commit d4d1815cae3ad1d9536e456a2772a97e7f666446
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Sep 25 19:04:34 2003 -0700

    [sshd_config] UsePAM defaults to no.

commit b88fcc755d675a54140a264bffec49c8803bf475
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 25 20:18:33 2003 +1000

     - (dtucker) [configure.ac openbsd-compat/xcrypt.c] Bug #633: Remove
       DISABLE_SHADOW for HP-UX, use getspnam instead of getprpwnam.  Patch from
       michael_steffens at hp.com, ok djm@

commit beaf6790e1ee4133ff12b22f9f61f8045f071cdc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Sep 24 20:03:48 2003 +1000

     - (dtucker) [configure.ac] IRIX5 needs the same setre[ug]id defines as IRIX6.

commit dbb104791bc460b05441e5f48929a568de011fae
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 24 08:30:18 2003 +1000

     - (djm) Update version.h and spec files for HEAD

commit 5c3a55846a87a40d10aaf08123e4101388d22b87
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 23 22:12:38 2003 +1000

     - (djm) Sync with V_3_7 branch:
       - (djm) Fix SSH1 challenge kludge
       - (djm) Bug #671: Fix builds on OpenBSD
       - (djm) Bug #676: Fix PAM stack corruption
       - (djm) Fix bad free() in PAM code
       - (djm) Don't call pam_end before pam_init
       - (djm) Enable build with old OpenSSL again
       - (djm) Trim deprecated options from INSTALL. Mention UsePAM
       - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu

commit 7ff4e6dbe588aab63f1547e917734730f388aaa4
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Sep 22 19:50:14 2003 -0700

    [configure.ac] add --disable-etc-default-login option. ok djm

commit da4d9cf4bfc34052f60e7161abbe7b88517ab43a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Sep 22 15:36:15 2003 +0000

     - (bal) "extration" -> "extraction" in ssh-rand-helper.c; repoted by john
            on #unixhelp@efnet

commit 9a2c4cddadf209e0b494fb10c1218424b53dd6fd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 21:16:05 2003 +1000

       - markus@cvs.openbsd.org 2003/09/19 17:43:35
         [clientloop.c sshtty.c sshtty.h]
         remove fatal callbacks from client code; ok deraadt

commit 8654d16f0ff3bfe17aa4616f03aba84acc5458e5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 21:14:55 2003 +1000

       - markus@cvs.openbsd.org 2003/09/19 17:40:20
         [scp.c]
         error handling for remote-remote copy; #638; report Harald Koenig;
         ok millert, fgs, henning, deraadt

commit aaa56cb80473feda33ef44643cc2a95df9d67984
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 21:13:59 2003 +1000

       - markus@cvs.openbsd.org 2003/09/19 11:33:09
         [packet.c sshd.c]
         do not call packet_close on fatal; ok deraadt

commit 3dbff2a93b0f326cd4891654c3553f901df8ede7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 21:12:56 2003 +1000

       - markus@cvs.openbsd.org 2003/09/19 11:31:33
         [channels.c]
         do not call channel_free_all on fatal; ok deraadt

commit 3d326221714451b616b82744d38af484e718b49b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 21:11:20 2003 +1000

       - markus@cvs.openbsd.org 2003/09/19 11:30:39
         [ssh-keyscan.c]
         avoid fatal_cleanup, just call exit(); ok deraadt

commit 6fa8abd58bb8beac0e73ccdba6dfa1414cb1112c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 21:10:21 2003 +1000

       - markus@cvs.openbsd.org 2003/09/19 11:29:40
         [ssh-agent.c]
         provide a ssh-agent specific fatal() function; ok deraadt

commit 631a4a9b3e2d6109b87e59f3cf2dac419d3764fe
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 21:08:21 2003 +1000

       - markus@cvs.openbsd.org 2003/09/19 09:03:00
         [buffer.c]
         sign fix in buffer_dump; Jedi/Sector One; pr 3473

commit a8151da5fe16c77f77e62f145e8b0efc25dc02c4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 21:06:46 2003 +1000

       - markus@cvs.openbsd.org 2003/09/19 09:02:02
         [packet.c]
         buffer_dump only if PACKET_DEBUG is defined; Jedi/Sector One; pr 3471

commit c0815c927e177f27b1bcd6370e4c2b10caf95efe
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 21:05:50 2003 +1000

       - miod@cvs.openbsd.org 2003/09/18 13:02:21
         [authfd.c bufaux.c dh.c mac.c ssh-keygen.c]
         A few signedness fixes for harmless situations; markus@ ok

commit fb16b2411eda857cd358dc4c9c63b66edc217a51
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 21:04:23 2003 +1000

       - markus@cvs.openbsd.org 2003/09/18 08:49:45
         [deattack.c misc.c session.c ssh-agent.c]
         more buffer allocation fixes; from Solar Designer; CAN-2003-0682;
         ok millert@

commit d1d41b318117258bd25f2eb2789ba3b91408bd16
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 21:01:27 2003 +1000

       - markus@cvs.openbsd.org 2003/09/18 07:56:05
         [authfile.c]
         missing  buffer_free(&encrypted); #662; zardoz at users.sf.net

commit d2730d39a1005502b406983de84b85f6b50237de
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 21:00:19 2003 +1000

       - markus@cvs.openbsd.org 2003/09/18 07:54:48
         [buffer.c]
         protect against double free; #660;  zardoz at users.sf.net

commit bd5361b23728640b7a6c2e4e10fcbd84101a6045
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 20:59:16 2003 +1000

       - markus@cvs.openbsd.org 2003/09/18 07:52:54
         [sshconnect.c]
         missing {}; bug #656; jclonguet at free.fr

commit 220bf133b699493f57ed22052108fccc17680ad7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 20:41:40 2003 +1000

     - (dtucker) [contrib/aix/pam.conf] Include example pam.conf for AIX from
       article by genty at austin.ibm.com, included with the author's permission.

commit 480ef8ddae5c5795859752c15f898271c019eefc
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Sep 21 21:38:11 2003 -0700

    [configure.ac] Bug 665: move 3 new AC_DEFINES outside of AC_TRY_RUN.
    Report by distler AT golem ph utexas edu.

commit 7a74c6b428f7126fcbd21b12a0a1a5a3bd2205ae
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Sep 21 21:00:59 2003 -0700

    Fix typo. s/SETEIUD_BREAKS_SETUID/SETEUID_BREAKS_SETUID/

commit 42d30828a476c47a0f2e2a2b87644c76652e1905
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 13:28:36 2003 +1000

     - (dtucker) [INSTALL] Bug #686: Document requirement for zlib 1.1.4 or
       higher.

commit 051c270f88881688f62f3c56b78f0e177accf53e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 13:05:26 2003 +1000

     - (dtucker) [openbsd-compat/port-aix.c] Use correct include for xmalloc.h,
       add canohost.h to stop warning.  Based on patch from openssh-unix-dev at
       thewrittenword.com

commit fbe3b36ca9386a9b32f05e36450216acaa8bb404
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 12:54:37 2003 +1000

     - (dtucker) [uidswap.c] Don't test restoration of uid on Cygwin since the
       OS does not support permanently dropping privileges.  Patch from
       vinschen at redhat.com.

commit 8daf4b45eab80b2fa4e06f26d09f834bd2e5bb93
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 12:32:00 2003 +1000

     - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config] Update
       ssh-host-config to match current defaults, bump README version.  Patch from
       vinschen at redhat.com.

commit d5e082f0d52f652ba50fe33c97f62442d6619045
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 12:08:23 2003 +1000

     - (dtucker) [configure.ac openbsd-compat/fake-rfc2553.c
       openbsd-compat/fake-rfc2553.h] Bug #659: Test for and handle systems with
       where gai_strerror is defined as "const char *".  Part of patch supplied
       by bugzilla-openssh at thewrittenword.com

commit be79af1dfedfd43d4f432da0a98971d667f25d77
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 11:58:21 2003 +1000

     - (dtucker) [configure.ac] Bug #659: uid swapping issues on IRIX 6.
       Part of patch supplied by bugzilla-openssh at thewrittenword.com

commit 00130115294af62753cd03c85fcdbcbcf63bc8bb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 11:40:24 2003 +1000

     - (dtucker) [configure.ac] Bug #693: uid swapping issues on NCR MP-RAS.
       Patch from david.haughton at ncr.com

commit ed92b213212336d49417c1e7dae41caf6c63b2db
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 11:26:16 2003 +1000

     - (dtucker) [configure.ac] Bug #653: uid swapping issues on Tru64.

commit ed9eb02326f653be1a76b5772bbe9a1632114f57
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 11:18:47 2003 +1000

     - (dtucker) [configure.ac] Bug #657: uid swappping issues on BSDi.

commit 20379a37fa82030fcf46fac963e9f344dab03196
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 11:07:40 2003 +1000

     - (dtucker) [configure.ac] Bug #655: uid swapping issues on Mac OS X.
       Patch from max at quendi.de.

commit 8a49dd107b0921b033753e6119e46b59b38e58a2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 10:59:34 2003 +1000

    Wrong filename

commit 782390e62e6a71ad2acf59b8f58e2957afc9dd0f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Sep 22 10:58:55 2003 +1000

     - (dtucker) [Makefile.in] Bug #644: Fix "make clean" for out-of-tree
       builds.  Portability corrections from tim@.

commit 4724d96ca8af844c0c5446388e82e728e2b8c55e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 19 21:25:23 2003 +1000

     - (dtucker) [acconfig.h] Updated basename test needs HAVE_BASENAME

commit c11b1e84204e0ff449e9f3c50b990264a54f8921
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 19 20:56:51 2003 +1000

     - (dtucker) [session.c] Bug #643: Fix size_t -> u_int and fix null deref
       when /etc/default/login doesn't exist or isn't readable.  Fixes from
       jparsons-lists at saffron.net and georg.oppenberg at deu mci com.

commit 91acbf211c2d7508155daf75461435333254093a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 19 20:43:38 2003 +1000

     - (dtucker) [openbsd-compat/port-aix.h] Bug #640: Don't include audit.h
       unless required.  Reorder to reduce warnings.

commit 8040939f7269fa2adfe3deb264c2c2c6d1d93407
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 19 17:05:24 2003 +1000

     - (djm) Bug #646: Fix location of x11-ssh-askpass; Jim

commit 968c8d25e9201e4b75b56951df9082af5ed0499a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 19 16:58:21 2003 +1000

     - (djm) Bug #641: Allow RedHat RPM building without GTK-2; Patch from
       jason AT devrandom.org

commit f09ad861e62978d4f6d77453977d7b58d63caf07
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 19 16:41:01 2003 +1000

     - (djm) Bug #661: Remove duplicate check for basename; from
       bugzilla-openssh AT thewrittenword.com

commit 677179f23a332c0d1e17fd0d00f5ffd5c4b311cb
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 19 16:30:14 2003 +1000

     - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
       djast AT cs.toronto.edu

commit 5d07e6d46518c3b74e98c153795f753c79740ba2
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 18 18:25:46 2003 +1000

    20030918
     - (djm) Bug #652: Fix empty password auth

commit 628c8732307100700f58b4baf6ea9af3a32133ea
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Sep 17 13:20:33 2003 -0700

    [openbsd-compat/inet_ntoa.c] 20030917 "Sync with V_3_7 branch" undid
    20030916 "Missed dead header in inet_ntoa.c"

commit e007cf7fa45f59c7e3504247ebd10e8e42628a7e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 17 07:32:17 2003 +1000

    - (djm) Crank RPM spec file versions

commit 5efcecc26525b58f699997697e6114fd83708733
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 17 07:31:14 2003 +1000

     - (djm) OpenBSD Sync
       - markus@cvs.openbsd.org 2003/09/16 21:02:40
         [buffer.c channels.c version.h]
         more malloc/fatal fixes; ok millert/deraadt; ghudson at MIT.EDU

commit f2728099baa0fe4e6f1a8bfa321aefbf412f6543
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 17 07:24:25 2003 +1000

     - (djm) Sync with V_3_7 branch

commit e12104839298a45ecba1dc0059494229a1bf51f3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Sep 16 17:23:29 2003 +0000

     - (bal) Missed dead header in inet_ntoa.

commit b925b4b82fe60bb764e23a0115c9de73b8e0b816
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Sep 15 22:40:49 2003 -0700

    [configure.ac] Fix portability issues.

commit f2b4e4e07e7e2eae064d8e9f54f86f32a297bade
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Sep 16 03:31:03 2003 +0000

       - deraadt@cvs.openbsd.org 2003/09/16 03:03:47
         [buffer.c]
         do not expand buffer before attempting to reallocate it; markus ok

commit 16eec18a090fa22147605c5482d6e777a7ce85b5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 16 13:24:50 2003 +1000

    Fix line width

commit e1a790d0d165ff70acb502fbfc72bd55cd2b8fb1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Sep 16 11:52:19 2003 +1000

     - (dtucker) [acconfig.h configure.ac defines.h session.c] Bug #252: Retrieve
       PATH (or SUPATH) and UMASK from /etc/default/login on platforms that have it
       (eg Solaris, Reliant Unix).  Patch from Robert.Dahlem at siemens.com.  ok djm@

commit 7b6cb5c5ef9ddd12e7cb695357209f1c08a57fc5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 14 13:16:55 2003 +1000

     - (dtucker) [regress/Makefile] AIX's make doesn't like " +=", so replace
       with vanilla "=".
    
    Hopefully everybody's "make" will be happy with that.

commit b12d16fd003a62c564290f7b6ef44d68934823e3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 14 11:40:35 2003 +1000

     - (dtucker) [Makefile regress/Makefile] Fix portability issues preventing
       the regression tests from running with Solaris' make.  Patch from Brian
       Poole (raj at cerias.purdue.edu).
    
    Further info:  Solaris' /usr/ccs/bin/make
    * requires a space before "+=" (but not "=")
    * does not like @for
    
    The bit that relies on a trailing "/" on $OBJ so "rm ${OBJ}$$F works in the
    current dir if OBJ isn't set is my fault.  Nasty but it works.

commit 455813b79e1bd6e2a525d38da52a49defcc03f68
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 13 22:12:11 2003 +1000

    Add extern __progname, needed if SSHD_PAM_SERVICE not defined

commit c58c2eedb04168330060406d7634db155d871fb2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 13 22:02:05 2003 +1000

     - (dtucker) [auth-pam.c] Use SSHD_PAM_SERVICE for PAM service name, patch
       from cjwatson at debian.org.

commit ae477e922e12f32f715759a6e77447e244528070
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Sep 12 18:15:15 2003 -0700

    [configure.ac] define WITH_ABBREV_NO_TTY for SCO.  Report by Roger Cornelius.

commit 2270c7e8aa380a95628ec4faaf5544c0cbb70da5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 13 10:41:56 2003 +1000

     - (dtucker) [auth-passwd.c] On AIX, call setauthdb() before loginsuccess(),
       required to correctly reset failed login count when using a password
       registry other than "files" (eg LDAP, see bug #543).

commit dc7e65646fc2811b58d67dc6c3bfb0740047c552
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 13 09:46:03 2003 +1000

     - (dtucker) [regress/agent-timeout.sh] Timeout of 5 sec is borderline for
       slower hosts, increase to 10 sec.

commit e660ede8c0b479051db419e67319904ca9787539
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Sep 12 13:21:14 2003 -0700

    [regress/yes-head.sh] shell portability fix.

commit ec28ca16b1bd74e8954e3c4d13364baadc1382a4
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Sep 12 13:02:16 2003 -0700

    [Makefile.in] only mkdir regress if it does not exist.

commit b7efb630f66f0723a1f06c0e9178fa7c03bfec7b
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Sep 12 11:20:32 2003 -0700

    [regress/agent-ptrace.sh] sh doesn't like "if ! shell_function; then".

commit 23ee359b08fbdacc546ab84414eb9c63b6a2005d
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Sep 11 22:32:17 2003 -0700

    [regress/agent-ptrace.sh regress/dynamic-forward.sh
    regress/sftp-cmds.sh regress/stderr-after-eof.sh regress/test-exec.sh]
    no longer depends on which(1). patch by dtucker@

commit d546a84ef6e2569499d72ed4e1e918c073a7568e
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Sep 11 22:24:36 2003 -0700

    [configure.ac] Prefer setuid/setgid on UnixWare and Open Server.

commit 1e1ef645661427c77a6bc3fd22aacabfade5f784
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Sep 11 22:19:31 2003 -0700

    [configure.ac] Move libgen tests to before libwrap to unbreak
    UnixWare 2.03 using --with-tcp-wrappers.

commit c82afd5c8844c2cd5c411124fb077ca15dce6095
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 11 14:42:55 2003 +1000

     - (dtucker) [configure.ac] Bug #588, #615: Move other libgen tests to after
       the dirname test, to allow a broken dirname to be detected correctly.
       Based partially on patch supplied by alex.kiernan at thus.net.  ok djm@

commit 9a959ea1b5d59f8c3de9cb17c10dd2260117f877
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Sep 10 20:17:40 2003 +1000

     - (dtucker) [regressh/yes-head.sh] Some platforms (eg Solaris) don't have
       "yes".

commit b2427c82bb8e152c1c792302b60a823268654824
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Sep 10 15:22:44 2003 +1000

    - (dtucker) [configure.ac] Part of bug #615: tcsendbreak might be a macro.

commit 9f7ffc5a17db16b3d79fdc9ad2379cf38430092a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Sep 10 11:39:05 2003 +1000

     - (dtucker) [configure.ac] Bug #636: Add support for Cray's new X1 machine.
       Patch from wendyp at cray.com.

commit 1eb40cf514eaf0abb70442c258d06fbf5ce3b03f
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Sep 9 08:35:20 2003 -0700

    [regress/sftp-badcmds.sh regress/sftp-cmds.sh] Fix errors like
    UX:rm: ERROR: Cannot remove '.' or '..'

commit 5543947d7f022e1bc705aecce6761b00e8cba02f
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Sep 9 08:27:40 2003 -0700

    [regress/agent-timeout.sh] s/TIMEOUT/SSHAGENT_TIMEOUT/ Fixes conflict
    with shell read-only variable.

commit 8b2157d86ae1e9a36f200d61597b84322857db8e
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Sep 9 06:07:10 2003 -0700

    [regress/Makefile] Fixes for building outside of a read-only source tree.

commit 2e0e38e3107381c18b99d55548f29252138c4622
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Sep 8 16:11:33 2003 -0700

    [ssh-keygen.c] s/PATH_MAX/MAXPATHLEN/ ok mouring@

commit b284e16c103bb87c444f372514fc2d1c6fb96033
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Sep 8 14:35:16 2003 -0700

    [configure.ac acconfig.h openbsd-compat/getrrsetbyname.c] test for
    HEADER.ad in arpa/nameser.h

commit 0ac16a449218a88885f7b10bfb706c62e246496a
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Sep 8 06:33:33 2003 -0700

    [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and
    _getlong in #ifndef

commit 167bd9cfef47736fdda2cc428802303d32cce9dc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 7 12:34:54 2003 +1000

     - (dtucker) [CREDITS Makefile.in configure.ac mdoc2man.awk mdoc2man.pl]
       Replace mdoc2man.pl with mdoc2man.awk, provided by Peter Stuge.

commit 7c600f24a4d6e2f4a9eae27ec4acebbc0943ae56
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 7 11:37:27 2003 +1000

     - (dtucker) [acconfig.h] Typo.

commit 3393c5c36eec663fcd3aa867f84fd050233342c8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 7 09:43:42 2003 +1000

     - (dtucker) openbsd-compat/xcrypt.c] #elsif -> #elif

commit e7f7580cab715bb3c82c3109edd45b9e2f49f6e5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 7 09:32:58 2003 +1000

     - (dtucker) [regress/sftp-cmds.sh] Skip quoted file test on Cygwin.

commit e1e26a6c1545f9b54d439178cffa4129fae91426
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 7 09:31:02 2003 +1000

     - (dtucker) [regress/sftp-batch.sh] Make temporary batch file name more
       distinctive, so "rm ${BATCH}.*" doesn't match the script itself.

commit d199b6d69bee62d6e46db5aaf3ead9fa07b79d80
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 7 09:28:03 2003 +1000

     - (dtucker) [dynamic-forward.sh forwarding.sh sftp-batch.sh (all regress/)]
       Add ${EXEEXT}: required to work on Cygwin.

commit 57ac36ffb4a9b168d92a4c978b8550f980f06806
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Sep 7 09:22:21 2003 +1000

     - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)]
       Put "which" inside quotes.

commit 9f18be63ab1f6987c7bd5514e920b99dbeceb79b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Sep 6 16:44:39 2003 +1000

     - (dtucker) [acconfig.h configure.ac uidswap.c] Prefer setuid/setgid on AIX.

commit b2db4e83a350415a87c037414fc5e4c6074eba0d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Sep 5 11:35:52 2003 +1000

     - (dtucker) [Makefile.in] Add distclean target for regress/, fix clean target.

commit 77d07e927d08eb2f5e383b80769078ebfd6bb90f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 22:06:16 2003 +1000

       - [Makefile.in regress/agent-ptrace] Fix minor regress issues on Cygwin.

commit 118576556b95b696bf7149e4c6c811cb28c87460
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 18:04:16 2003 +1000

       - [Makefile.in regress/agent-getpeereid.sh] config.h is now in $BUILDDIR
         not $OBJ.

commit 9d9d44811b4f8270807f694d98a13a1b1bf08cf5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 15:39:54 2003 +1000

       - [regress/README.regress] Add a basic readme.

commit ebc3c13d40f36d0772ee8d204a19a1def0190754
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 15:37:58 2003 +1000

       - [regress/Makefile] Remove BSDisms.

commit 6d3921f64bbdb304df9d8ef6887a46dacf3c60b9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 15:35:48 2003 +1000

       - [regress/test-exec.sh] Use sudo, search for "whoami" equivalent, always
         use Strictmodes no, wait longer for sshd startup.

commit bd05609dff890e0667015d91591ef6630276804b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 15:26:57 2003 +1000

       - [regress/ssh-com-sftp.sh] Remove dependency on /dev/stdin.

commit 4735115e4d966f5347e6f3ea0ea10797f37e4034
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 15:24:50 2003 +1000

       - [regress/sftp-cmds.sh] Use portable "test" option.

commit a241d87e948d9776fc324a28645dd74b16d6c28b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 15:22:01 2003 +1000

       - [regress/dynamic-forward.sh] Some "which" programs output on stderr.

commit 53c55f41798a7c386251f6922046b8d1f551a8f9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 15:16:56 2003 +1000

       - [regress/agent.sh regress/proto-version.sh regress/ssh-com.sh
         regress/test-exec.sh] Handle different was of echoing without newlines.

commit 58f89bc14db0475c52abff7376111269cc892af8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 15:07:59 2003 +1000

       - [regress/agent-ptrace.sh regress/agent-timeout.sh]
         "grep -q" -> "grep >/dev/null"

commit e15b0dd011b42612e699441a31ca88b9dc6b3f20
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 15:00:55 2003 +1000

       - [regress/sftp.sh] Remove dependency on /dev/stdin.

commit f2412548e9d0fd2c1eb1f117c1206fc1d191ba11
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 14:56:49 2003 +1000

    Missing $

commit c2c4223ed037375ac73a55a3b75f9154fe9c6037
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 14:54:39 2003 +1000

       - [regress/sftp-badcmds.sh regress/sftp-cmds.sh regress/sftp.sh
         regress/ssh-com-client.sh regress/ssh-com-sftp.sh regress/stderr-data.sh
         regress/transfer.sh] Use ${EXEEXT} where appropriate.

commit c376a88c102e237eb0172f7afcc496ce7311a0fe
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 14:32:02 2003 +1000

       - [regress/stderr-after-eof.sh] Search for a usable checksum program.

commit 933e4f1c271312cb1f66dda5a21420563bf3080c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 14:26:31 2003 +1000

       - [regress/sftp-cmds.sh] Ensure file used for test are readable.

commit 60de9f1851f19b43ba97a8d05861a4bf3416703d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 14:02:56 2003 +1000

       - [regress/rekey.sh] Remove dependence on /dev/zero (not all platforms have
         it).  The sparse file will take less disk space too.

commit 871f7408abd34f42adc6a3f023c1a29227eb9759
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 13:59:48 2003 +1000

       - [regress/reconfigure/sh] Make path to sshd fully qualified if required.

commit 5569759bce2f3660ef314d58a08652e05222d580
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 13:55:25 2003 +1000

       - [regress/agent-ptrace.sh] Skip tests if platform doesn't support it or
         gdb cannot be found.

commit 2297ac41ca1c39558484f05a3c298b358f77c528
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 13:49:30 2003 +1000

       - [regress/agent-getpeereid.sh] Skip test on platforms that don't support
         getpeereid.

commit 150a81c7457e6b37e09f26aebef447dd2f3ae3f7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Sep 4 13:41:06 2003 +1000

     - (dtucker) Portablize regression tests.  Parts contributed by Roumen
       Petrov, David M. Williams and Corinna Vinschen.
       - [Makefile.in] Add "make tests" target and "make clean" hooks.

commit c2b9827695589ce8554df7c1776969cdf89b8c16
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 3 12:13:30 2003 +1000

       - jmc@cvs.openbsd.org 2003/09/02 18:50:06
         [sftp.1 ssh_config.5]
         escape punctuation;
         ok deraadt@

commit f117f877b1829ecbc2376c2302d14c22c25acc6f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 3 12:12:54 2003 +1000

       - markus@cvs.openbsd.org 2003/09/02 16:40:29
         [version.h]
         enter 3.7

commit a256c650acd9b4f5d4bbc515607c74c3f9f3995e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 3 12:11:30 2003 +1000

       - markus@cvs.openbsd.org 2003/08/28 12:54:34
         [auth.h]
         remove kerberos support from ssh1, since it has been replaced with GSSAPI;
         but keep kerberos passwd auth for ssh1 and 2; ok djm, hin, henning, ...

commit 856f0be66908352828bb595f7ad5213623c0c610
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 3 07:32:45 2003 +1000

       - markus@cvs.openbsd.org 2003/08/26 09:58:43
         [auth-passwd.c auth.c auth.h auth1.c auth2-none.c auth2-passwd.c]
         [auth2.c monitor.c]
         fix passwd auth for 'username leaks via timing'; with djm@, original
         patches from solar

commit 39638b6aebf5ca69ba75c79c0cc0572e1f396258
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 23:33:42 2003 +1000

     - (djm) Fix openbsd-compat/ again - remove references to strl(cpy|cat).h

commit 341c6e687c2e2d3629f19d4b43fccc2dc8d7f9d3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 23:18:52 2003 +1000

     - (djm) Bug #423: reorder setting of PAM_TTY and calling of PAM session
       management (now done in do_setusercontext). Largely from
       michael_steffens AT hp.com

commit f4b6f10deda4413528ddb5ffbb69c5da84ae58b9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 23:12:06 2003 +1000

     - (djm) Don't initialise pam_conv structures inline. Avoids HP/UX compiler
       error. Part of Bug #423, patch from  michael_steffens AT hp.com

commit 0b56b45d6f54215718d0547581247fdc879c527b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 23:09:41 2003 +1000

    fix date

commit 982d326045fd776c4c2b831e4c94515b0c895df9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:59:01 2003 +1000

       - markus@cvs.openbsd.org 2003/09/01 20:44:54
         [auth2-gss.c]
         fix leak

commit fb10e9abe83d4d0b9ec36ee90587270d5bdc0cfd
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:58:22 2003 +1000

       - markus@cvs.openbsd.org 2003/09/01 18:15:50
         [readconf.c readconf.h servconf.c servconf.h ssh.c]
         remove unused kerberos code; ok henning@

commit 46aa3b91398a18dc6865e801167a2a77ec9f402e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:57:54 2003 +1000

       - markus@cvs.openbsd.org 2003/09/01 13:52:18
         [ssh.h]
         rm whitespace

commit 84d03efdf7715eaeacc46abf3c9dc0a210a0bbbe
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:57:27 2003 +1000

       - markus@cvs.openbsd.org 2003/09/01 12:50:46
         [readconf.c]
         rm gssapidelegatecreds alias; never supported before

commit 9b7b03b27084f0d7fca3caefc956d5c4c02e6928
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:57:05 2003 +1000

       - markus@cvs.openbsd.org 2003/09/01 09:50:04
         [sshd_config.5]
         gss kex is not supported; sxw@inf.ed.ac.uk

commit 134350c20c7e4aa428f9dbe8f9ba36e6027cfc1f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:56:42 2003 +1000

       - markus@cvs.openbsd.org 2003/08/31 13:31:57
         [gss-serv.c]
         whitspace KNF

commit a0c4ad21b67c4d27678550508e049a0a24f89cad
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:56:18 2003 +1000

       - markus@cvs.openbsd.org 2003/08/31 13:30:18
         [gss-serv.c]
         correct string termination in parse_ename(); sxw@inf.ed.ac.uk

commit 324948b320631096a1d33c9d984fcdbfa35b203a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:55:45 2003 +1000

       - markus@cvs.openbsd.org 2003/08/31 13:29:05
         [session.c]
         call ssh_gssapi_storecreds conditionally from do_exec();
         with sxw@inf.ed.ac.uk

commit b5829f56eba3a3d8a1cad944c84e9468eefc732c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:53:32 2003 +1000

       - markus@cvs.openbsd.org 2003/08/31 12:14:22
         [progressmeter.c]
         do write to buf[-1]

commit 17af176302916a5f97174063773a173a324fe093
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:53:01 2003 +1000

       - markus@cvs.openbsd.org 2003/08/31 10:26:04
         [progressmeter.c]
         pass file_size + 1 to snprintf: fixes printing of truncated
         file names; fix based on patch/report from sturm@;

commit fbdeecef92bbf5b265bdb8d8c876c6989a0e8c9e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:52:31 2003 +1000

       - markus@cvs.openbsd.org 2003/08/29 10:04:36
         [channels.c nchan.c]
         be less chatty; debug -> debug2, cleanup; ok henning@

commit 7630ee2fa66079d1967feb8310e96c4f51803107
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:52:00 2003 +1000

       - markus@cvs.openbsd.org 2003/08/29 10:03:15
         [compat.c compat.h]
         SSH_BUG_K5USER is unused; ok henning@

commit 1a0c0b96219b037865d624079a81ab7d88bbccc1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:51:17 2003 +1000

       - markus@cvs.openbsd.org 2003/08/28 12:54:34
         [auth-krb5.c auth.h auth1.c monitor.c monitor.h monitor_wrap.c]
         [monitor_wrap.h readconf.c servconf.c session.c ssh_config.5]
         [sshconnect1.c sshd.c sshd_config sshd_config.5]
         remove kerberos support from ssh1, since it has been replaced with GSSAPI;
         but keep kerberos passwd auth for ssh1 and 2; ok djm, hin, henning, ...

commit 55c47edc81accd3118fc0fda2c37765631c0aef0
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 2 22:14:07 2003 +1000

     - (djm) OpenBSD CVS Sync
       - deraadt@cvs.openbsd.org 2003/08/24 17:36:51
         [auth2-gss.c]
         64 bit cleanups; markus ok

commit 4d5dffce9f7b26392228cdc4397f40a804e37cf4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Aug 30 00:11:56 2003 +0000

    ChangeLog fix pointed out by Darren.  Yes, we should not use $Id$ when
    describing those changes. <chuckle>

commit 515d0f9a1eeedcbd03bb78cf09a17d99e597b5a3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Aug 29 16:59:52 2003 +0000

     - (bal) openbsd-compat/ clean up.  Considate headers, add in $Id$ on our
       files, and added missing license to header.

commit 43a0dc6653e24d31798879b2caa4d0eaf287531c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 26 14:22:12 2003 +1000

     - (dtucker) [auth.c] Do not check for locked accounts when PAM is enabled.

commit 2fae867806fc3498be5bba343c6438068dfcf5b3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 26 13:43:12 2003 +1000

     - (dtucker) [contrib/aix/inventory.sh] Add public domain notice.  ok mouring@
       (the original author)

commit 6ad50438eda264f1eb4e064b084ab0e0b0f7567f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 26 12:22:04 2003 +1000

     - (dtucker) [Makefile.in] Remove auth2-krb5.

commit 08bbb2f69d83c687f5aaea053a30dac3c3ef1cd3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 26 12:14:05 2003 +1000

       - djm@cvs.openbsd.org 2003/08/25 10:33:33
         [sshconnect2.c]
         fprintf->logit to silence login banner with "ssh -q"; ok markus@

commit 7858726e8a11574f01a888761b60377530c918d2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 26 12:12:56 2003 +1000

       - fgsch@cvs.openbsd.org 2003/08/25 08:13:09
         [sftp-int.c]
         fix div by zero when listing for filename lengths longer than width.
         markus@ ok.

commit 600ad8de76e12820ed1ff0db71946b4e03d5349c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 26 12:10:48 2003 +1000

       - deraadt@cvs.openbsd.org 2003/08/24 17:36:52
         [monitor.c monitor_wrap.c sshconnect2.c]
         64 bit cleanups; markus ok

commit 6b191a234cff048b9778352fa9ac81296cdde4d4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 26 12:09:53 2003 +1000

       - markus@cvs.openbsd.org 2003/08/22 20:55:06
         [LICENCE]
         add Simon Wilkinson

commit 1e66a39e40f184f5a5e8c158cd0e1686ab8988b3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 26 12:08:15 2003 +1000

       - markus@cvs.openbsd.org 2003/08/22 13:22:27
         [auth2.c] (auth2-krb5.c removed)
         nuke "kerberos-2@ssh.com"

commit be1a901f9947fdcf56703afaf15942c33462a3dc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 26 12:04:31 2003 +1000

       - markus@cvs.openbsd.org 2003/08/22 13:20:03
         [sshconnect2.c]
         remove support for "kerberos-2@ssh.com"

commit 49aaf4ad522c6b599ec13f75f8a6b7eab6942143
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 26 11:58:16 2003 +1000

     - (dtucker) [Makefile.in acconfig.h auth-krb5.c auth-pam.c auth-pam.h
       configure.ac defines.h gss-serv-krb5.c session.c ssh-gss.h sshconnect1.c
       sshconnect2.c] Add Portable GSSAPI support, patch by Simon Wilkinson.

commit 0efd155c3c184f0eaa2e1eb244eaaf066e6906e0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Aug 26 11:49:55 2003 +1000

       - markus@cvs.openbsd.org 2003/08/22 10:56:09
         [auth2.c auth2-gss.c auth.h compat.c compat.h gss-genr.c gss-serv-krb5.c
         gss-serv.c monitor.c monitor.h monitor_wrap.c monitor_wrap.h readconf.c
         readconf.h servconf.c servconf.h session.c session.h ssh-gss.h
         ssh_config.5 sshconnect2.c sshd_config sshd_config.5]
         support GSS API user authentication; patches from Simon Wilkinson,
         stripped down and tested by Jakob and myself.

commit 30912f7259b771a1cf705c0bc47a6c3f3edffb43
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 26 10:48:14 2003 +1000

     - (djm) Bug #629: Mark ssh_config option "pamauthenticationviakbdint"
       as deprecated. Remove mention from README.privsep. Patch from
       aet AT cc.hut.fi

commit 36ca53a5a025114d7c55b881027294a28b7d465a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 25 15:01:04 2003 +1000

     - (dtucker) [README buildbff.sh inventory.sh] (all in contrib/aix)
       Update package builder: correctly handle config variables, use lsuser
       rather than /etc/passwd, fix typos, add Id's.

commit 3c8e1e1bbf5810c00554d476534908ba9370fe87
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 25 13:27:40 2003 +1000

     - (dtucker) [configure.ac] Bug #533, #551: define BROKEN_GETADDRINFO on
       Tru64, solves getnameinfo and "bad addr or host" errors.  ok djm@

commit 1f499fd3688d034daf787859044ede73767b6141
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 25 13:08:49 2003 +1000

     - (djm) Bug #564: Perform PAM account checks for all authentications when
       UsePAM=yes; ok dtucker

commit e41bba584737f028579961ddf6669b6a768e47e7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 25 11:51:19 2003 +1000

     - (dtucker) [acconfig.h auth.c configure.ac sshd.8] Bug #422 again: deny
       any access to locked accounts.  ok djm@

commit 5ade9abc37df3dacacbe20104877ca6dab61082a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 25 01:16:21 2003 +0000

     - (bal) redo how we handle 'mysignal()'.  Move it to
       openbsd-compat/bsd-misc.c, s/mysignal/signal/ and #define signal to
       be our 'mysignal' by default.  OK djm@

commit af4a6c3a5619299a16cfbb545cde110849596204
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 25 01:10:51 2003 +0000

     - (bal) openbsd-compat/ OpenBSD updates.  Mostly licensing, ansifications
       and minor fixes.

commit 331b6af8fa96417cf126383de7e2ed024b7c7e2c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 25 10:58:26 2003 +1000

     - (djm) Bug #621: Select OpenSC keys by usage attributes. Patch from
       larsch@trustcenter.de

commit 49d32566c26005364958a87b16857ec5073739bf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 22 18:43:48 2003 +1000

     - (dtucker) [contrib/cygwin/ssh-user-config] Put keys in authorized_keys
       rather that authorized_keys2.  Patch from vinschen@redhat.com.

commit 59d3d5b8b4813bdd1d4518d6839bd392ff6d21f7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 22 09:34:41 2003 +1000

     - (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal
       -lbroken; ok dtucker

commit 70a3d55b4a50c624557b81a5dece2727cd01cff1
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 21 17:58:29 2003 +1000

     - (dtucker) [configure.ac] Move openpty/ctty test outside of case statement
       and after normal openpty test.

commit 8e3653d2f330a96b4aefaccac3f1031749aebd53
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 21 16:49:41 2003 +1000

     - (dtucker) [defines.h] Put CMSG_DATA, CMSG_FIRSTHDR with other CMSG* macros,
       change CMSG_DATA to use __CMSG_ALIGN (and thus work properly), reformat for
       consistency.

commit f4220e6cefdddd30acd0dcaa152dedff84a15c0f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 21 16:44:07 2003 +1000

       - markus@cvs.openbsd.org 2003/08/14 16:08:58
         [ssh-keygen.c]
         exit after primetest, ok djm@

commit f38ea77c03a5473ec43fe07ec24cfb1ca7f27034
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 13 20:48:07 2003 +1000

     - (dtucker) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
       Add a tcsendbreak function for platforms that don't have one, based on the
       one from OpenBSD.
    
    Any more of these and I'll split them out into bsd-termio.[ch].

commit 1c52ee3e6f2653a474c8a31aafa5a7e595dd8081
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 13 20:38:36 2003 +1000

       - markus@cvs.openbsd.org 2003/08/13 09:07:10
         [readconf.c ssh.c]
         socks4->socks, since with support both 4 and 5; dtucker@zip.com.au

commit ec960f2c933aa55ca5dc319cff55cecce34f1f4b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 13 20:37:05 2003 +1000

       - markus@cvs.openbsd.org 2003/08/13 08:46:31
         [auth1.c readconf.c readconf.h servconf.c servconf.h ssh.c ssh_config
         ssh_config.5 sshconnect1.c sshd.8 sshd.c sshd_config sshd_config.5]
         remove RhostsAuthentication; suggested by djm@ before; ok djm@, deraadt@,
         fgsch@, miod@, henning@, jakob@ and others

commit 3bdbd848ea86c27a65ee766fd2c9d9158dadb381
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 13 20:31:05 2003 +1000

       - markus@cvs.openbsd.org 2003/08/13 08:33:02
         [session.c]
         use more portable tcsendbreak(3) and ignore break_length;
         ok deraadt, millert

commit d85efee43778647ea6505e44f1f9520a841015c4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Aug 13 20:28:14 2003 +1000

     - (dtucker) [session.c] Remove #ifdef TIOCSBRK kludge.

commit 7802f3191499078ca54d2580ba2163f9cf266d20
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 11 23:03:53 2003 +1000

    Update Corinna's address.

commit bc8c8f36fbd430e3e041cf9bb70c10206058757c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 11 23:00:33 2003 +1000

     - (dtucker) [openbsd-compat/xcrypt.c] Remove Cygwin #ifdef block (duplicate
       in bsd-cygwin_util.h).

commit ec0943a96c80c920bee584240a889ae7b619b4e8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Aug 11 22:55:36 2003 +1000

     - (dtucker) OpenBSD CVS Sync
       (thanks to Simon Wilkinson for help with this -dt)
       - markus@cvs.openbsd.org 2003/07/16 15:02:06
         [auth-krb5.c]
         mcc -> fcc; from Love Hörnquist Åstrand <lha@it.su.se>
         otherwise the kerberos credentinal is stored in a memory cache
         in the privileged sshd. ok jabob@, hin@ (some time ago)

commit f38db7f5dae83b5aeeab681edd266a62b3ebc1f6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 8 13:43:37 2003 +1000

     - (dtucker) [auth-pam.c] Don't set PAM_TTY if tty is null.  ok djm@

commit 65914f1eb3e05694d64e540ff1bf3b8387795657
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Aug 8 12:15:11 2003 +1000

     - (dtucker) [openbsd-compat/fake-rfc2553.h] Older Linuxes have AI_PASSIVE and
       AI_CANONNAME in netdb.h but not AI_NUMERICHOST, so check each definition
       separately before defining them.

commit 80649c5fa6af0f6c8122f567c2c01b6aabfef07c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 7 16:28:16 2003 +1000

     - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.h] Move Cygwin
       specific defines and includes to bsd-cygwin_util.h.  Fixes build error too.

commit 854d7fd43968c5a20e906aa300c687f3434c7da8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 7 16:23:43 2003 +1000

     - (dtucker) [openbsd-compat/bsd-cygwin_util.c openbsd-compat/bsd-cygwin_util.h]
       Remove incorrect filenames from comments (file names are in Id tags).

commit f315224d7c7ced4f012ddaef1a6b4f4bf7883b25
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 7 15:58:28 2003 +1000

     - (dtucker) [defines.h] Bug #336: Add CMSG_DATA and CMSG_FIRSTHDR macros if
       not already defined (eg Linux with some versions of libc5), based on those
       from OpenBSD.

commit 89f4cf0d29c3cfbdd4ef697944afde7a887b5b1a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 7 13:29:04 2003 +1000

     - (dtucker) [canohost.c] Bug #336: Only check ip options if IP_OPTIONS is
       defined (fixes compile error on really old Linuxes).

commit b9d3f41ceb432a6edc53fa41e0af70872f14a56b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Aug 7 13:24:24 2003 +1000

     - (dtucker) [session.c] Have session_break_req not attempt to send a break
       if TIOCSBRK and TIOCCBRK are not defined (eg Cygwin).

commit bdf571b0dc29efdec02c8a56f102077bf49aeb7c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 3 00:36:16 2003 +1000

     - (dtucker) [openbsd-compat/bsd-misc.c] Fix cut-and-paste bug in tcgetpgrp.

commit 19c4bbc37f892288a3f71b48ca09e7840cb84112
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 3 00:17:30 2003 +1000

    Sync OpenBSD ID

commit db732b14d742b09d3819128e2bce113945d514f8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 3 00:07:35 2003 +1000

      - markus@cvs.openbsd.org 2003/07/31 22:34:03
        [progressmeter.c]
        print rate similar old version; round instead truncate;
        (included in previous progressmeter.c commit)

commit 85f04c6fd545562ce8b53b9a70ba8145cceaa5a9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 3 00:05:58 2003 +1000

       - avsm@cvs.openbsd.org 2003/07/31 15:50:16
         [atomicio.c]
         correct comment: atomicio takes vwrite, not write; deraadt@ ok

commit 4b60966863d241efc29f0897a7f299ec8e5f6c2b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 3 00:05:01 2003 +1000

       - markus@cvs.openbsd.org 2003/07/31 09:21:02
         [auth2-none.c]
         check whether passwd auth is allowd, similar to proto 1; rob@pitman.co.za
         ok henning

commit 40311f2feba510bc646710ca3c44c61b7a21a73c
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Aug 3 00:00:47 2003 +1000

    Add imported progressmeter.c changes to Changelog

commit b2f9d4161a28e6afc4c621bc6848a13668a5aaad
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 2 23:51:38 2003 +1000

     - (dtucker) [Makefile.in moduli.c moduli.h] Add new files and to Makefile.
    
    Should have added with this sync:
       - djm@cvs.openbsd.org 2003/07/28 09:49:56
         [ssh-keygen.1 ssh-keygen.c]
         Support for generating Diffie-Hellman groups (/etc/moduli) from ssh-keygen.
         Based on code from Phil Karn, William Allen Simpson and Niels Provos.
         ok markus@, thanks jmc@

commit 048737c9bcf25a02932d17b74398082930ee817e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 2 23:33:48 2003 +1000

    Remove unused variable.

commit 2e9c9cf702d8e90809d901ec51358406be6f810a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 2 23:31:42 2003 +1000

    - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
      Add a tcgetpgrp function.

commit 06ef75bf0c2449ab4880f6ff40729497782e6e60
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 2 23:28:38 2003 +1000

       - markus@cvs.openbsd.org 2003/07/29 18:24:00
         [LICENCE progressmeter.c]
         replace 4 clause BSD licensed progressmeter code with a replacement
         from Nils Nordman and myself; ok deraadt@
         (copied from OpenBSD an re-applied portable changes)

commit 019cefeaadc06a3664076cae10aedae4aed13911
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 2 22:40:07 2003 +1000

       - djm@cvs.openbsd.org 2003/07/28 09:49:56
         [ssh-keygen.1 ssh-keygen.c]
         Support for generating Diffie-Hellman groups (/etc/moduli) from ssh-keygen.
         Based on code from Phil Karn, William Allen Simpson and Niels Provos.
         ok markus@, thanks jmc@

commit c20c60bc99ea5e1b94236c1b3f00a8f4514a21f6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 2 22:31:45 2003 +1000

       - markus@cvs.openbsd.org 2003/07/23 07:42:43
         [sshd_config]
         remove AFS; itojun@

commit 6aaa58c4709c43ffb9f3f2be299cd5c4044f24a3
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 2 22:24:49 2003 +1000

     - (dtucker) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2003/07/22 13:35:22
         [auth1.c auth.h auth-passwd.c monitor.c monitor.h monitor_wrap.c
         monitor_wrap.h readconf.c readconf.h servconf.c servconf.h session.c ssh.1
         ssh.c ssh_config.5 sshconnect1.c sshd.c sshd_config.5 ssh.h]
         remove (already disabled) KRB4/AFS support, re-enable -k in ssh(1);
         test+ok henning@
     - (dtucker) [Makefile.in acconfig.h configure.ac] Remove KRB4/AFS support.
     - (dtucker) [auth-krb4.c radix.c radix.h] Remove KRB4/AFS specific files.
    
    I hope I got this right....

commit 4c29dd9f4438d2ab6ac8d2df361fd48360b208ab
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Aug 2 20:37:03 2003 +1000

     - (dtucker) [monitor.h monitor_wrap.h] Remove excess ident tags.

commit 7f2d795e3f338fbbaced85d5d318d54749d9133f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 30 14:53:11 2003 +1000

     - (djm) [auth-pam.c] Don't use crappy APIs like sprintf. Thanks bal

commit fbba5a0501e5bdb03a412f099e45c2760a380d55
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 26 19:38:30 2003 +1000

     - (dtucker) [openbsd-compat/xcrypt.c] Fix typo: DISABLED_SHADOW ->
       DISABLE_SHADOW.  Fixes HP-UX compile error.

commit 0410e32f47c0dcfc3385a1db2ee44f8bb35c10c4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 24 06:52:13 2003 +0000

     - (bal) [auth-passwd.c openbsd-compat/Makefile.in openbsd-compat/xcrypt.c
        openbsd-compat/xcrypt.h] Split off encryption into xcrypt() interface,
        and isolate shadow password functions.  Tested in Solaris, but should
        not break other platforms too badly (except maybe HP =).  Also brings
        auth-passwd.c into full sync with OpenBSD tree.

commit acb98497fb7ff75362491d1c17a5e01fe2beb5b8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jul 23 14:33:10 2003 +1000

     - (dtucker) [configure.ac] Back out change for bug #620.

commit 700e4380ce6b0dc854f3962cd7c87ae4b4d7d478
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 19 21:28:31 2003 +1000

    Typo: BROKEN_ADDRINFO -> BROKEN_GETADDRINFO

commit cca1bdb8a8b94a834847fa1189165f4be0fe1d9d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 19 20:11:54 2003 +1000

       - djm@cvs.openbsd.org 2003/07/19 00:46:31
         [regress/sftp-cmds.sh]
         regress test for sftp arguments with escaped quotes; ok markus

commit 554d5b544af212c272d4055162e663e22f6fabe0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 19 20:09:21 2003 +1000

       - djm@cvs.openbsd.org 2003/07/19 00:45:53
         [sftp-int.c]
         fix sftp filename parsing for arguments with escaped quotes. bz #517;
         ok markus

commit 03a29baf35e1a26aaa0eba37f53c97010d5f56af
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 19 20:07:45 2003 +1000

       - deraadt@cvs.openbsd.org 2003/07/18 01:54:25
         [scp.c]
         userid is unsigned, but well, force it anyways; andrushock@korovino.net

commit 538d180395609462130ef28e92cbb05f3a987dcb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 19 19:56:18 2003 +1000

       - markus@cvs.openbsd.org 2003/07/16 10:36:28
         [sshtty.c]
         clear IUCLC in enter_raw_mode; from rob@pitman.co.za; ok deraadt@, fgs@

commit e98dfa323e7f7dc57afb70f99851a596f3194047
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 19 19:54:31 2003 +1000

       - markus@cvs.openbsd.org 2003/07/16 10:34:53
         [ssh.c sshd.c]
         don't exit on multiple -v or -d; ok deraadt@

commit fe0078ae492ab0c020fa6ee5bccd8d08ca5f47a6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 19 19:52:28 2003 +1000

       - markus@cvs.openbsd.org 2003/07/14 12:36:37
         [sshd.c]
         remove undocumented -V option. would be only useful if openssh is used
         as ssh v1 server for ssh.com's ssh v2.

commit 394b8c8db307fa4d4c39ecb4d276980ce9927146
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jul 19 19:49:45 2003 +1000

     - (dtucker) [configure.ac] Bug #620: Define BROKEN_GETADDRINFO for
       Solaris/x86.  Patch from jrhett at isite.net.

commit 1a721156b0a7f86e2d431735be8b8a3cd7803b3f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 14 17:32:29 2003 +1000

       - markus@cvs.openbsd.org 2003/07/10 20:05:55
         [sftp.c]
         sync usage with manpage, add missing -R

commit 81a0b371f4872b99001e3eb20b0a154714801d15
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 14 17:31:06 2003 +1000

       - markus@cvs.openbsd.org 2003/07/10 14:42:28
         [packet.c]
         the 2^(blocksize*2) rekeying limit is too expensive for 3DES,
         blowfish, etc, so enforce a 1GB limit for small blocksizes.

commit 29588616c214e411e1823b2949e5fa9d6a49d75f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 14 17:28:34 2003 +1000

       - avsm@cvs.openbsd.org 2003/07/09 13:58:19
         [key.c]
         minor tweak: when generating the hex fingerprint, give strlcat the full
         bound to the buffer, and add a comment below explaining why the
         zero-termination is one less than the bound.  markus@ ok

commit 0abf13bb504ae7361d0f5ed581398c7408b073f0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 14 16:43:42 2003 +1000

     - (dtucker) [port-aix.h] Fix prototypes.

commit fc3454ee6752333ce7af349b71be12aa9cbe4fcc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 14 16:41:55 2003 +1000

     - (dtucker) Bug #543: [configure.ac port-aix.c port-aix.h]
       Call setauthdb() before loginfailed(), which may load password registry-
       specific functions.  Based on patch by cawlfiel@us.ibm.com.

commit 30317e37e4c3ba6b0a7c0b21f17760e4f45a6b12
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 14 16:26:51 2003 +1000

     - (dtucker) [port-aix.h] Work around name collision on AIX for r_type by
       undef'ing it.

commit 5c6a91a39d83f2fe68de28d9635076dd4066d7e2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 14 16:21:44 2003 +1000

     - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare
       loginfailed at all, so assume 3-arg loginfailed if not declared.

commit b9aa0a0baa33efb06a773de18f2b45c12c15cbaf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 8 22:59:59 2003 +1000

     - (dtucker) [auth-passwd.c auth.c session.c sshd.c port-aix.c port-aix.h]
       Convert aixloginmsg into platform-independant Buffer loginmsg.

commit 793e817d491b5081d2a156b546ae06f28d11a737
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 8 21:01:04 2003 +1000

     - (dtucker) Check return value of setpcred().

commit a0c0b6311210e0cddfb1b038bd7b37f5a298ef3e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jul 8 20:52:12 2003 +1000

     - (dtucker) [acconfig.h auth-passwd.c configure.ac session.c port-aix.[ch]]
       Include AIX headers for authentication functions and make calls match
       prototypes.  Test for and handle 3-args and 4-arg variants of loginfailed.

commit f1159b5b29069caba12dfee88a3a9fb5dc83074d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Mon Jul 7 19:44:01 2003 +1000

     - (dtucker) [configure.ac] Bug #600: Check that getrusage is declared before
       searching libraries for it.  Fixes build errors on NCR MP-RAS.

commit 8661b569039c116e9439c1c17cc34ca9dbe25847
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jul 6 15:20:46 2003 +1000

     - (dtucker) [ssh-rand-helper.c loginrec.c]
       Apply atomicio typing change to these too.

commit 0a4f04b5b255d116e4de441c93a867aac9f616ee
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 3 20:37:47 2003 +1000

       - djm@cvs.openbsd.org 2003/07/03 08:09:06
         [readconf.c readconf.h ssh-keysign.c ssh.c]
         fix AddressFamily option in config file, from brent@graveland.net;
         ok markus@

commit e2f2be7a3abd4176baded47da1d1d02de3ed1984
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 3 20:27:55 2003 +1000

       - markus@cvs.openbsd.org 2003/07/03 08:24:13
         [regress/Makefile]
         enable tests for dynamic fwd via socks (-D), uses nc(1)

commit 7a2466291b03fd93059a6887b0f771d27bc64e79
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 3 20:26:04 2003 +1000

       - markus@cvs.openbsd.org 2003/07/03 08:21:46
         [regress/dynamic-forward.sh]
         add socks5; speedup; reformat; based on patch from dtucker@zip.com.au

commit 3f521e21c0b94cd0ac4752d60a9f9b4dfa9bf3f8
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 3 16:20:42 2003 +1000

       - markus@cvs.openbsd.org 2003/07/02 20:37:48
         [ssh.c]
         convert hostkeyalias to lowercase, otherwise uppercase aliases will
         not match at all; ok henning@

commit 46471c9a81bdd0d797149a20364645bc6ffcf2cc
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 3 13:55:19 2003 +1000

       - markus@cvs.openbsd.org 2003/07/02 14:51:16
         [channels.c ssh.1 ssh_config.5]
         (re)add socks5 suppport to -D; ok djm@
         now ssh(1) can act both as a socks 4 and socks 5 server and
         dynamically forward ports.

commit 9189ff89c3c15f152d8daedb09c4101a96365da4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 3 13:52:04 2003 +1000

       - markus@cvs.openbsd.org 2003/07/02 12:56:34
         [channels.c]
         deny dynamic forwarding with -R for v1, too; ok djm@

commit edeb1f74498db67636f231e8313cc56d4ff112ec
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 3 13:48:04 2003 +1000

       - markus@cvs.openbsd.org 2003/06/29 12:44:38
         [sshconnect.c]
         memset 0, not \0; andrushock@korovino.net

commit 9f63f22aa0ab13673f197642a66a98b09a18abd0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 3 13:46:56 2003 +1000

       - deraadt@cvs.openbsd.org 2003/06/28 16:23:06
         [atomicio.c atomicio.h authfd.c clientloop.c monitor_wrap.c msg.c
         progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c
         sshd.c]
         deal with typing of write vs read in atomicio

commit e53270481c279cb50cf31bc83dc6c91835f9a524
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jul 3 13:40:44 2003 +1000

       - djm@cvs.openbsd.org 2003/06/28 07:48:10
         [sshd.c]
         report pidfile creation errors, based on patch from Roumen Petrov; ok markus@

commit 200d0a7bf58f5ef3679d2bab1824ac4fcc5a088f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 30 19:21:36 2003 +1000

     - (djm) Search for support functions necessary to build our
       getrrsetbyname() replacement. Patch from Roumen Petrov

commit 6eb9304782a7404fca406f742d4546e55c8dc1c7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 29 21:30:41 2003 +1000

     - (dtucker) [configure.ac] Add sanity test after system-dependant compiler
       flag modifications.

commit cc9fd54a3636d98dbada76f71bd5e6e82495f9c0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 29 21:23:37 2003 +1000

     - (dtucker) Bug #602: move #include of netdb.h to after in.h (fixes compiler
       warnings on Solaris 2.5.1).

commit 3b08df9da7e52576487cc409d5b42c337788d59a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 29 21:20:04 2003 +1000

    Same day...

commit 723569b257c8b1f48836ea777886c10bfa844692
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 28 18:08:16 2003 +1000

     - (djm) Bug #593: Sanity check OpenSC card reader number; patch from
       aj@dungeon.inka.de

commit 4a8e2848556682541799118528fe3b56b901c5f7
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 28 18:02:47 2003 +1000

     - (djm) Bug #591: use PKCS#15 private key label as a comment in case
       of OpenSC. Report and patch from larsch@trustcenter.de

commit f4f36f30f56b0dca3a31666ca4c61d6def427bf0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 28 14:27:29 2003 +1000

    Add Roumen Petrov

commit a3020db6b44fd898c49d07dcbb2afc5db4c4c5b2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 28 12:54:33 2003 +1000

     - (dtucker) [configure.ac] Bug #570: Have ./configure --enable-FEATURE
       actually enable the feature, for those normally disabled.  Patch by
       openssh (at) roumenpetrov.info.

commit b611c12e67fcdd35b4afb2bf3fafc6f626059f0a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 28 12:42:09 2003 +1000

     - (dtucker) [regress/dynamic-forward.sh] Import new regression test.

commit a99c1b77ab1c866d42ebc48c86da5767b2f6f53d
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 28 12:40:12 2003 +1000

       - markus@cvs.openbsd.org 2003/06/26 20:08:33
         [readconf.c]
         do not dump core for 'ssh -o proxycommand host'; ok deraadt@

commit a6612d43cf0ef743649bdac9d13bc2cff4f79cc5
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 28 12:39:03 2003 +1000

       - miod@cvs.openbsd.org 2003/06/25 22:39:36
         [sftp-server.c]
         Typo police: attribute is better written with an 'r'.

commit 502d384b74fae68dd9e265f48c2026cef6c12806
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 28 12:38:01 2003 +1000

       - markus@cvs.openbsd.org 2003/06/24 08:23:46
         [auth2-hostbased.c auth2-pubkey.c auth2.c channels.c key.c key.h
          monitor.c packet.c packet.h serverloop.c sshconnect2.c sshd.c]
         int -> u_int; ok djm@, deraadt@, mouring@

commit 674f71d77e3683746a960a13da39d2d68cdcafad
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat Jun 28 12:33:12 2003 +1000

       - markus@cvs.openbsd.org 2003/06/23 09:02:44
         [ssh_config.5]
         document EnableSSHKeysign; bugzilla #599; ok deraadt@, jmc@

commit a0472e095d8c635439d036e84971fc1489863683
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 24 20:22:09 2003 +1000

     - (dtucker) Have configure refer the user to config.log and
       contrib/findssl.sh for OpenSSL header/library mismatches.

commit 89b249be64b61c8df2af3af5ba508428d52d2263
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 22 21:22:04 2003 +1000

    Missed a line cut-and-pasting the ChangeLog

commit b8dae8ece0ae9b553324cfb48419bdfcf350f9eb
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 22 20:48:45 2003 +1000

    20030622
     - (dtucker) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2003/06/20 05:48:21
         [sshd_config]
         sync some implemented options; ok markus@

commit 91cf261bd5604132496359ad4c18f8a15db7076b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 22 20:46:53 2003 +1000

    20030622
     - (dtucker) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2003/06/20 05:47:58
         [sshd_config.5]
         sync description of protocol 2 cipher proposal; ok markus

commit a251f809a08dbfaee8b9ff5f310f9351527afe88
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 22 20:45:15 2003 +1000

     - (dtucker) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2003/06/18 11:28:11
         [ssh-rsa.c]
         backout last change, since it violates pkcs#1
         switch to share/misc/license.template

commit 6cf1a2cfe86d37d7a0a3cfc0085f8c89b04dcc82
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 22 18:32:10 2003 +1000

     - (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before
       testing its value.
    
    When HAVE_SETPROCTITLE is defined (at least on NetBSD, gcc 2.95.3) the test
    "#if SPT_TYPE == SPT_REUSEARGV" is not true (probably because SPT_TYPE or
    SPT_REUSEARGV is not defined).  This results in the following build error:
    
    $ gcc [flags] setproctitle.c
    setproctitle.c: In function `compat_init_setproctitle':
    setproctitle.c:102: `argv_start' undeclared (first use in this function)

commit e0194e52ca533eef87e3799ff987f83eab7eadcf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun Jun 22 12:33:27 2003 +1000

     - (dtucker) OpenBSD CVS Sync (regress/)
       - markus@cvs.openbsd.org 2003/06/21 09:14:05
         [reconfigure.sh]
         missing $SUDO; from dtucker@zip.com.au
     - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS.

commit 50cea67222ce5d5d5d334c8dd8eb5885d056ba04
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 18 22:45:34 2003 +1000

     - (dtucker) OpenBSD CVS Sync (regress/)
       - markus@cvs.openbsd.org 2003/06/12 15:43:32
         [Makefile]
         test -HUP; dtucker at zip.com.au

commit 76437600b285d333896997081b07a04369ca5608
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 18 22:43:13 2003 +1000

     - (dtucker) OpenBSD CVS Sync (regress/)
       - markus@cvs.openbsd.org 2003/06/12 15:40:01
         [try-ciphers.sh]
         add ctr

commit c43362c89a6b6c5b18b4f132a8a584de61caa4a9
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 18 22:41:41 2003 +1000

     - (dtucker) OpenBSD CVS Sync (regress/)
       - mouring@cvs.openbsd.org 2003/05/15 04:07:12
         [sftp-cmds.sh]
         Advanced put/get testing for sftp.  OK @djm

commit ee5f83d3eae52e997f93b9489aaaba3c828dbe32
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 18 22:36:48 2003 +1000

     - (dtucker) OpenBSD CVS Sync (regress/)
       - markus@cvs.openbsd.org 2003/05/14 22:08:27
         [ssh-com-client.sh ssh-com-keygen.sh ssh-com-sftp.sh ssh-com.sh]
         test against some new commerical versions

commit a4040f5904b2f7adc5fcf1656bf47a202b54ca45
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 18 22:35:11 2003 +1000

     - (dtucker) OpenBSD CVS Sync (regress/)
       - djm@cvs.openbsd.org 2003/04/04 09:34:22
         [Makefile sftp-cmds.sh]
         More regression tests, including recent directory rename bug; ok markus@

commit d57a76eec557a9ff43764f2fffdf994e0141ce5b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 18 22:32:51 2003 +1000

     - (dtucker) OpenBSD CVS Sync (regress/)
       - markus@cvs.openbsd.org 2003/04/02 12:21:13
         [Makefile]
         enable rekey test

commit 3a222ac0d0398f28e2868c5d7410b384fda881bd
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 18 22:21:33 2003 +1000

     - (dtucker) [regress/copy.1 regress/copy.2] Remove temp data files from CVS.

commit fc8a7ea202046052d074931b4e9c07b505b8a1df
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 18 22:18:57 2003 +1000

     - (dtucker) [reconfigure.sh rekey.sh sftp-badcmds.sh]
       Import new regression tests from OpenBSD

commit 0275b52387cfca184be6947cac6f493ea5161e24
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 18 20:29:35 2003 +1000

       - markus@cvs.openbsd.org 2003/06/17 18:14:23
         [cipher-ctr.c]
         use license from /usr/share/misc/license.template for new code

commit 80163e1b72d2abb8338a104d97798048d9bfd5a1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 18 20:29:18 2003 +1000

       - markus@cvs.openbsd.org 2003/06/16 10:22:45
         [ssh-add.c]
         print out key comment on each prompt; make ssh-askpass more useable; ok djm@

commit 8c1d2e3926c483551c5a2b0e356d300ad2908d9e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 18 20:29:01 2003 +1000

       - markus@cvs.openbsd.org 2003/06/16 08:22:35
         [ssh-rsa.c]
         make sure the signature has at least the expected length (don't
         insist on len == hlen + oidlen, since this breaks some smartcards)
         bugzilla #592; ok djm@

commit 56a0bb07c47285fe78268c95650032ab0ea667cd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 18 20:28:40 2003 +1000

       - markus@cvs.openbsd.org 2003/06/12 19:12:03
         [scard.c scard.h ssh-agent.c ssh.c]
         add sc_get_key_label; larsch at trustcenter.de; bugzilla#591

commit b2cdcb50a2900953035234bf94f7b586fd9dd429
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 18 20:26:34 2003 +1000

       - nino@cvs.openbsd.org 2003/06/12 15:34:09
         [scp.c]
         Typo. Ok markus@.

commit 116aabbb665d553ca79cc4d634ef10f86199d437
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 18 20:26:13 2003 +1000

       - djm@cvs.openbsd.org 2003/06/12 12:22:47
         [LICENCE]
         mention more copyright holders; ok markus@

commit 469954debd6cb78d8c109785e418b235cf004565
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 18 20:25:33 2003 +1000

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2003/06/12 07:57:38
         [monitor.c sshlogin.c sshpty.c]
         typos; dtucker at zip.com.au

commit 53950b68bf28a8d3eebdf39bea96a9046806c5d2
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 14 08:43:22 2003 +1000

     - (djm) Update license on fake-rfc2553.[ch]; ok itojun@

commit bc976f92d33aa1e13740a193b77fd3694d96b344
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed Jun 11 23:56:41 2003 +1000

    Fix typos in comments.

commit af63951c5764672986576fdcd64f7fb931586c93
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 11 22:51:32 2003 +1000

     - (djm) Put licenses on substantial header files

commit 141efa7036ecf85ca20ade360e2d4e62e3428415
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 11 22:50:56 2003 +1000

     - (djm) Mention portable copyright holders in LICENSE

commit 4bfeb14742628535ef5e0f8e38dc150d1b158b26
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 11 22:08:36 2003 +1000

     - (djm) Sync LICENSE against OpenBSD

commit d94f20d28e9e966576302cd951776401c2856df6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 11 22:06:33 2003 +1000

       - djm@cvs.openbsd.org 2003/06/11 11:18:38
         [authfd.c authfd.h ssh-add.c ssh-agent.c]
         make agent constraints (lifetime, confirm) work with smartcard keys;
         ok markus@

commit 0e1b937f1362866765c09c11d3f4066f108ff910
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 11 22:05:45 2003 +1000

       - jakob@cvs.openbsd.org 2003/06/11 10:18:47
         [dns.c]
         sync with check_host_key() change

commit 7392ae62706e67828714f66d53676bc64f68b1e8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 11 22:05:25 2003 +1000

       - jakob@cvs.openbsd.org 2003/06/11 10:16:16
         [sshconnect.c]
         clean up check_host_key() and improve SSHFP feedback. ok markus@

commit 2b92d32e199aa93f2e9d585ca00d56c46775c177
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 11 22:05:06 2003 +1000

       - deraadt@cvs.openbsd.org 2003/06/10 22:20:52
         [packet.c progressmeter.c]
         mostly ansi cleanup; pval ok

commit f1ce505daf3ab14b42aa1eba41272fa103d3f4d0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 11 22:04:39 2003 +1000

       - jmc@cvs.openbsd.org 2003/06/10 09:12:11
         [scp.1 sftp-server.8 ssh.1 ssh-add.1 ssh-agent.1 ssh_config.5]
         [sshd.8 sshd_config.5 ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8]
         - section reorder
         - COMPATIBILITY merge
         - macro cleanup
         - kill whitespace at EOL
         - new sentence, new line
         ssh pages ok markus@

commit 78f2e5ca98e36fa9e87e967243aedacde8d64156
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 10 21:09:09 2003 +1000

     - (djm) Re-merge OpenSC info into README.smartcard

commit c18c06e131f7b3660fdab6c0d4b6b087274ffb50
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 10 18:55:22 2003 +1000

     - (djm) Sync README.smartcard with OpenBSD -current

commit 400b8786d6d184675152a2f04d3fe806f7c954ae
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri Jun 6 10:46:04 2003 +1000

     - (dtucker) [uidswap.c] Fix setreuid and add missing args to fatal(). ok djm@

commit 881753bef2110c4d0bbd71a08e769c84f6eefc15
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 5 22:20:11 2003 +1000

     - (dtucker) Define EAI_NONAME in fake-rfc2553.h (used by fake-rfc2553.c).

commit 4aff13f1e7122ee41ee32a2388894936b54dcf4e
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 5 19:37:30 2003 +1000

     - (dtucker) Add includes.h to fake-rfc2553.c so it will build.

commit 76b5c8a83acab596c45624a5353b0ad5930321b3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 5 19:19:35 2003 +1000

     - (djm) Bug #589 - scard-opensc: load only keys with a private keys
       Patch from larsch@trustcenter.de

commit f49078dfdfaaaa323fa133a3e97c4b7f88510163
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 5 18:53:42 2003 +1000

     - (djm) Bug #588 - Add scard-opensc.o back to Makefile.in
       Patch from larsch@trustcenter.de

commit c28e38d23a3d074e02c1f63b64569a31d499a0e8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 5 18:52:47 2003 +1000

     - (djm) Merge all the openbsd/fake-* into fake-rfc2553.[ch]

commit b95bb7f9b13905ade12cac848e34339ae8a1cc2f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 5 10:04:12 2003 +1000

     - (djm) Don't use xmalloc() or pull in toplevel headers in fake-* code

commit ceb3136f5f121e0d6d3a78dcc52c6bf186a7f872
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 5 09:56:35 2003 +1000

    KNF

commit 5fe46a45c834bf2e336d979e2ae755b94e01d707
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 5 09:53:31 2003 +1000

     - (djm) Implement paranoid priv dropping checks, based on:
       "SetUID demystified" - Hao Chen, David Wagner and Drew Dean
       Proceedings of USENIX Security Symposium 2002

commit 0f68486a7673885ba2834af80fd14f1e3be16e8f
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 5 09:52:42 2003 +1000

    Put AI_NUMERICHOST back where it belongs.

commit 10eac0cf8f946526a7c0c5cd89287076f792b65d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 5 09:48:32 2003 +1000

     - (djm) Support AI_NUMERICHOST in fake-getaddrinfo.c. Needed for recent
       canohost.c changes.

commit 66c884070e57b8ac3db5ead0f51e73ea0ba3ccb0
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu Jun 5 00:11:53 2003 +1000

    Revert recently introduced typo: AI_NUMERICHOST -> NI_NUMERICHOST

commit 0cbb9dea050942c643f739b79d0d9f30d75da213
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 4 22:56:15 2003 +1000

     - (djm) Always use mysignal() for SIGALRM

commit cc685c1cbece3cd3ece00a41c41b9781662a01aa
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 4 22:51:38 2003 +1000

       - djm@cvs.openbsd.org 2003/06/04 12:41:22
         [sftp.c]
         kill ssh process on receipt of signal; ok markus@

commit b69aaa8db7b6d079a2efad6d57796daedd449886
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 4 22:51:24 2003 +1000

       - djm@cvs.openbsd.org 2003/06/04 12:40:39
         [scp.c]
         kill ssh process upon receipt of signal, bz #241.
         based on patch from esb AT hawaii.edu; ok markus@

commit 65d1f5765ff9b6b50a0ea97a2cc47fe4115f8972
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 4 22:51:08 2003 +1000

       - djm@cvs.openbsd.org 2003/06/04 12:18:49
         [scp.c]
         ansify; ok markus@

commit 9fc7c699af19977dbb5984374076821bf1f0fd13
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 4 22:50:54 2003 +1000

       - djm@cvs.openbsd.org 2003/06/04 12:03:59
         [serverloop.c]
         remove bitrotten commet; ok markus@

commit 4c322482bbf1a7465c5ef1b1e280c09d39c8bb2e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 4 22:12:17 2003 +1000

     - (djm) Update to fix of bug #584: lock card before return.
       From larsch@trustcenter.de

commit 31b3a0a98f520dede4e218898eed3cf9d415c903
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 4 20:32:12 2003 +1000

       - djm@cvs.openbsd.org 2003/06/04 10:23:48
         [sshd.c]
         remove duplicated group-dropping code; ok markus@

commit 941ac459ce52af15caddcfafce3cf611138600ce
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 4 20:31:53 2003 +1000

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2003/06/04 08:25:18
         [sshconnect.c]
         disable challenge/response and keyboard-interactive auth methods
         upon hostkey mismatch. based on patch from fcusack AT fcusack.com.
         bz #580; ok markus@

commit 2527f5755a76a51093ce212c98003f379a9479aa
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 4 19:22:06 2003 +1000

     - (djm) Bug #584: scard-opensc.c doesn't work without PIN. Patch from
       larsch@trustcenter.de; ok markus@

commit 485397c48d5157d9d31cd81562fb557654335d40
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 4 19:15:10 2003 +1000

     - (djm) Bug #577 - wrong flag in scard-opensc.c sc_private_decrypt.
       ok markus@

commit 865173ee038a5c35a357c44e1b17e4510ddc2630
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 4 19:06:59 2003 +1000

     - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from
       simon@sxw.org.uk (Also matches a change in OpenBSD a while ago)

commit d311c4e54b0919004150f9e2db20cb3d6867c5ab
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 3 13:09:16 2003 +1000

    change "No more 4-term BSD licenses in our tree" to
           "No more 4-term BSD licenses in linked code"
    
    mdoc2man.pl is 4-term BSDL

commit dafb12ed28cfe17f25e0f13bad8c4b2eb309a584
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 3 13:06:18 2003 +1000

    a   - millert@cvs.openbsd.org 2003/06/03 02:56:16
         [scp.c]
         Remove the advertising clause in the UCB license which Berkeley
         rescinded 22 July 1999.  Proofed by myself and Theo.

commit eb28cbc3996a7a6157f7637ed2270555a32cc292
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Tue Jun 3 12:45:27 2003 +1000

     - (dtucker) [port-aix.c bsd-cray.c] Fix uses of verify_reverse_mapping.

commit 048d88d5aa25cb6b20594af2aba1c0c5c96d3276
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 3 12:43:14 2003 +1000

    trim prior to 3.6p1

commit 638733ed60e35ee9ee3d0b3e84171b2aec751726
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 3 12:18:50 2003 +1000

    2-term license, matching the rest of loginrec code

commit 329638e49c00639d6616b58cda234ba2b3059022
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 3 12:12:50 2003 +1000

     - (djm) Sync openbsd-compat with OpenBSD CVS.
        - No more 4-term BSD licenses in our tree

commit 4636d93c0c772e63ea1c97d40467569f8658e8aa
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 3 11:23:32 2003 +1000

    Removal of advertising clause in accordance with:
    ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
    
    ok theo@ and millert@

commit 3a961dc0d36c1f87788b707130f6d07709822d38
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 3 10:25:48 2003 +1000

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2003/06/02 09:17:34
         [auth2-hostbased.c auth.c auth-options.c auth-rhosts.c auth-rh-rsa.c]
         [canohost.c monitor.c servconf.c servconf.h session.c sshd_config]
         [sshd_config.5]
         deprecate VerifyReverseMapping since it's dangerous if combined
         with IP based access control as noted by Mike Harding; replace with
         a UseDNS option, UseDNS is on by default and includes the
         VerifyReverseMapping check; with itojun@, provos@, jakob@ and deraadt@
         ok deraadt@, djm@
     - (djm) Fix portable-specific uses of verify_reverse_mapping too

commit 35276253a60a3e57ec21b82b2e3c81e03c0206de
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 3 10:14:28 2003 +1000

     - (djm) Replace setproctitle replacement with code derived from
       UCB sendmail

commit eacbb4fcc1c8baf68db9376f3d6179a30016a36e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 2 19:10:41 2003 +1000

       - jakob@cvs.openbsd.org 2003/06/02 08:31:10
         [ssh_config.5]
         VerifyHostKeyDNS is v2 only. ok markus@

commit 61d3680acab4704db04b94983d0bc3ac1fbecd84
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 2 19:09:48 2003 +1000

       - deraadt@cvs.openbsd.org 2003/05/29 16:58:45
         [sshd.c uidswap.c]
         seteuid and setegid; markus ok

commit ab2db41b6173565461b73f48e97d94ffe0ab9353
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 2 19:09:13 2003 +1000

       - djm@cvs.openbsd.org 2003/05/26 12:54:40
         [sshconnect.c]
         fix format strings; ok markus@

commit 5d5f05417386dc648d1d37fcd30639f6241416c9
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 2 19:08:25 2003 +1000

    RCS ID sync

commit 8d2ee9bc711c77ae5287f9ff9a7de058323245d4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 2 18:59:45 2003 +1000

    remove a bit of diff which snuck into the copyright header

commit f46844214d5c902ef2e0302a4b691a7abfc35652
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 2 18:59:08 2003 +1000

     - (djm) Sync license on openbsd-compat/bindresvport.c with OpenBSD CVS

commit dcc8312a197384167ddf55741090b7bddf92d34e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 2 18:57:59 2003 +1000

     - (djm) Fix use of macro before #define in cipher-aes.c

commit dba59508205febc2f0dbf5e1cc9c3f9268af2f70
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 2 17:43:19 2003 +1000

     - (djm) Remove "noip6" option from RedHat spec file. This may now be
       set at runtime using AddressFamily option.

commit 237ca4ab08686f347ff55d9cdc38dd2fd0beba2f
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jun 1 19:25:27 2003 -0700

    openbsd-compat/xmmap.[ch] License clarifications. Add missing CVS ID.

commit f2e3e9deba2de12a01de9cf74befb6e94a3781d2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 2 12:15:54 2003 +1000

     - (djm) Always use saved_argv in sshd.c as compat_init_setproctitle may
       clobber

commit f3bff949576dbc207f958b38f56ed6df686a5e0c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 2 12:13:40 2003 +1000

     - (djm) Fix segv from bad reordering in auth-pam.c

commit 46337202d456b0c970e50a9e78fbf58da46f17a8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 2 11:04:39 2003 +1000

     - (djm) Fix segv from bad reordering in auth-pam.c

commit ae22174b219392223606a11b8930a5f70698f72c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 2 10:42:17 2003 +1000

    sync logintest license with that of loginrec.c

commit b4967c31051067aa590cc1e0135d77ee92365fc0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 1 03:23:57 2003 +0000

    License clarifications.
            bsd-nextstep.[ch] - myself
            bsd-waitpid.[ch] - myself
            port-irix.[ch] - Denis Parker & Michael Stone (original coders when
                    done in session.c)

commit 2972d6c045134f54e13e8823f7ac40155c9825a4
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 30 17:43:42 2003 +1000

     - (dtucker) Define SSHD_ACQUIRES_CTTY for NCR MP-RAS and Reliant Unix.
    
    I'm pretty sure these are required.  I also want to add -D_XOPEN_SOURCE=1
    -D_XOPEN_SOURCE_EXTENDED=1 to CPPFLAGS for MP-RAS but I haven't had confirmation
    that it will not break anything else.

commit 3cb84e5ec8a8d4297981aca60ac4fced346eea41
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 30 16:58:22 2003 +1000

     - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at
       roumenpetrov.info

commit a6a7c19dcbd96553b63b7524490e3528bd726ed8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 26 21:36:13 2003 +1000

     - (djm) Avoid auth2-chall.c warning when compiling without
       PAM, BSD_AUTH and SKEY

commit 9155a681fdbae4c5a90959f0444275a1396b19cf
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 26 21:34:36 2003 +1000

       - djm@cvs.openbsd.org 2003/05/24 09:30:40
         [authfile.c monitor.c sftp-common.c sshpty.c]
         cast some types for printing; ok markus@
    
    (missed a hunk)

commit 0652348e925c1408f3fcdf8c0b6a8c326a27fd98
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 25 14:45:02 2003 +1000

    remove #include we don't need

commit 04bd8b0bcc92eca7304898ce35705e0f403514c1
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 25 14:38:33 2003 +1000

       - djm@cvs.openbsd.org 2003/05/24 09:30:40
         [authfile.c monitor.c sftp-common.c sshpty.c]
         cast some types for printing; ok markus@

commit c11fe255ab45b8cf7783cedbcd688b00ed5308aa
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 25 14:38:02 2003 +1000

    - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2003/05/24 09:02:22
         [log.c]
         pass logged data through strnvis; ok markus

commit 6014578b90a6cad5104b05c4449aec07756be033
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 24 11:41:16 2003 +1000

     - (dtucker) Correct --osfsia in INSTALL.  Patch by skeleten at shillest.net

commit 08293fa435972a1073b604f02dc9d2441c7da788
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 23 18:44:41 2003 +1000

       - djm@cvs.openbsd.org 2003/05/23 08:29:30
         [sshconnect.c]
         fix leak; ok markus@

commit fbf486b4a6e0f39b3d6533a2c18d1a120e98b83c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 23 18:44:23 2003 +1000

       - jmc@cvs.openbsd.org 2003/05/20 12:09:31
         [ssh.1 ssh_config.5 sshd.8 sshd_config.5 ssh-keygen.1]
         new sentence, new line

commit 5067792a7267cd1affe339bf7e9469ecc444eb25
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 23 18:44:04 2003 +1000

     - (djm) OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2003/05/20 12:03:35
         [sftp.1]
         - new sentence, new line
         - added .Xr's
         - typos
         ok djm@

commit d419bdae777eee388e9f5a6f0e12fdd76981bac0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 23 18:43:40 2003 +1000

     - (djm) Use VIS_SAFE on logged strings rather than default strnvis
       encoding (which encodes many more characters)

commit 1340ec297b94f39785190793ffb915e6729702f0
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 20 09:24:42 2003 +1000

     - (djm) Configure logic to detect syslog_r and friends

commit 74a3442d10b875d73f770249844138856b87e4e9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 20 09:24:17 2003 +1000

       - deraadt@cvs.openbsd.org 2003/05/18 23:22:01
         [log.c]
         use syslog_r() in a signal handler called place; markus ok

commit eb0e969a4f68e3e63c8848f2aa29f575a3346f88
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 11:28:44 2003 +1000

     - (djm) Sync auth-pam.h with what we actually implement

commit c322bbaabd1741a6671f38953897e3d9e8d850e4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 10:39:37 2003 +1000

    unbreak; with dtucker

commit 3867bf3e7a8b9ec6b49a07a7728797e96eae8aa5
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 09:33:15 2003 +1000

    unfuck

commit 5b5ca19ef058e069937e23ae0058c22bf62abd23
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 00:50:02 2003 +1000

     - (djm) KNF on auth-sia.[ch]

commit e7fb10319246b876c1bd9a14c825799a59afa9ad
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 00:46:46 2003 +1000

     - (djm) KNF on md5crypt.c

commit 317412502b900ddecdafdfa171da99271846478b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 19 00:13:38 2003 +1000

     - (djm) Big KNF on openbsd-compat/

commit e323df6c4851b04386e747a009474f469fe97137
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 18 22:24:09 2003 +1000

     - (djm) Sync openbsd-compat/ with OpenBSD CVS head

commit 0b8e9006d87075968dc402afa0f6ca359184b83b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 18 21:44:07 2003 +1000

     - (djm) Tidy and trim TODO

commit f5399c24dc53a9afebf089a013a0359e7c775a90
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 18 20:53:59 2003 +1000

       - markus@cvs.openbsd.org 2003/05/17 04:27:52
         [cipher.c cipher-ctr.c myproposal.h]
         experimental support for aes-ctr modes from
         http://www.ietf.org/internet-drafts/draft-ietf-secsh-newmodes-00.txt
         ok djm@

commit a9825785e864fa795d4b39d99d14bc6f9995a7dc
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 18 20:53:10 2003 +1000

       - itojun@cvs.openbsd.org 2003/05/17 03:25:58
         [auth-rhosts.c]
         just in case, put numbers to sscanf %s arg.

commit 7e1bbc55af32d8f5d81200323198c65b548faaad
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 18 20:52:40 2003 +1000

     - (djm) Remove IPv4 by default hack now that we can specify AF in config

commit 20a8f97b034df418d0e5e04b11000b44ab07e628
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 18 20:50:30 2003 +1000

       - djm@cvs.openbsd.org 2003/05/16 03:27:12
         [readconf.c ssh_config ssh_config.5 ssh-keysign.c]
         add AddressFamily option to ssh_config (like -4, -6 on commandline).
         Portable bug #534; ok markus@

commit 25d9342f04249e3af01058bb9ba2a539f928bab0
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 18 20:45:47 2003 +1000

     - (djm) Return of the dreaded PAM_TTY_KLUDGE, which went missing in
       recent merge

commit 4c9e9ab1657016a4fb85e4c1a6cac110a42c1e9b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun May 18 01:22:43 2003 +0000

     - (bal) strcat -> strlcat on openbsd-compat/realpath.c (rev 1.8 OpenBSD)

commit e27c6cc3adceec08bb72d4c872a04598e9ae6b41
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 16 18:21:01 2003 +1000

     - (djm) Guard free_pam_environment against NULL argument. Works around
       HP/UX PAM problems debugged by dtucker

commit c46b6bc4f7341198707355c8aff1d6702830f77e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 16 15:51:44 2003 +1000

     - (djm) A few type mismatch fixes from Bug #565

commit e3e71247c3a63e3169f25e49c6e9c6438a3b922e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 16 12:00:44 2003 +1000

    clarify

commit 6ac2c48a195fd0c2bed1e8284e0658a4aae66756
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 16 11:42:35 2003 +1000

     - (djm) Add warning for UsePAM when built without PAM support

commit b78d5eb6c58d54fb9972afe487ad94e63cc7d5c7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 16 11:39:04 2003 +1000

       - djm@cvs.openbsd.org 2003/05/15 14:55:25
         [readconf.c readconf.h ssh_config ssh_config.5 sshconnect.c]
         add a ConnectTimeout option to ssh, based on patch from
         Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@

commit 99b4b88aba7131f04439ac6baaaae4dde02aa965
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 16 11:38:46 2003 +1000

       - markus@cvs.openbsd.org 2003/05/15 14:09:21
         [auth2-krb5.c]
         fix 64bit issue; report itojun@

commit f9b3feb847011c56b3e2a26e67b388e9f746ca62
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 16 11:38:32 2003 +1000

       - jakob@cvs.openbsd.org 2003/05/15 14:02:47
         [readconf.c servconf.c]
         warn for unsupported config option. ok markus@

commit 6e80c36e2a2c733adedc65ae9fe272b74dc9a06c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 16 11:38:00 2003 +1000

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2003/05/15 13:52:10
         [ssh.c]
         Make "ssh -V" print the OpenSSL version in a human readable form. Patch
         from Craig Leres (mindrot at ee.lbl.gov); ok markus@

commit 5d0ccf3b244bec1f89cdfc9adad8dae39c193d6b
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Thu May 15 21:42:59 2003 +1000

     - (dtucker) HP-UX needs to include <sys/strtio.h> for TIOCSBRK

commit eff041d19e5e11e734a60cdb77f97082395145bb
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 21:33:46 2003 +1000

     - (djm) Bug #444: Wrong paths after reconfigure

commit 04cb5360545617905ba9099027dd381fc9729344
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 21:29:10 2003 +1000

     - (djm) Bug #529: sshd doesn't work correctly after SIGHUP (copy argv
             correctly)

commit b10f1cd8787c4efa3a97fb6354e2e4fb2958f849
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 20:55:27 2003 +1000

     - (djm) Only build getrrsetbyname replacement when using --with-dns

commit 46a7b40d1e14ab5947eb3697bd8c2ed86cc0476c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 14:17:28 2003 +1000

       - markus@cvs.openbsd.org 2003/05/15 04:08:41
         [ssh.1]
         ~B is ssh2 only

commit 156cbe8c67d1824745c17efe0ec42487be9a5d28
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 14:16:41 2003 +1000

     - (djm) Enable UsePAM when built --with-pam

commit d248b5bd1bc1999a4d5d5ba7b433fc50e267baf6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 14:15:23 2003 +1000

       - jakob@cvs.openbsd.org 2003/05/15 04:08:44
         [readconf.c servconf.c]
         disable kerberos when not supported. ok markus@

commit ffda4cb2181683af35a4aee85c00d83ed9b7f11c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:57:51 2003 +1000

     - (djm) Avoid uuencode.c warnings

commit 34bb56743a0c8777ec2527e6f5be2f97dd61eb24
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:49:58 2003 +1000

       - mouring@cvs.openbsd.org 2003/05/15 03:43:59
         [sftp-int.c sftp.c]
         Teach ls how to display multiple column display and allow users
         to return to single column format via 'ls -1'.  OK @djm

commit 19c8f2b310d06b1cf213186a96abce09bf676061
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:49:21 2003 +1000

       - mouring@cvs.openbsd.org 2003/05/15 03:43:59
         [sftp-int.c]
         Teach ls how to display multiple column display and allow users
         to return to single column format via 'ls -1'.  OK @djm

commit 4962ed6ab434c361ff636617e0542d6043c7e700
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:48:59 2003 +1000

       - mouring@cvs.openbsd.org 2003/05/15 03:39:07
         [sftp-int.c]
         Make put/get (globed and nonglobed) code more consistant. OK djm@

commit ed12a26f0d4749bf6e2807afc40e97d06bda041c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:37:43 2003 +1000

       - djm@cvs.openbsd.org 2003/05/15 03:10:52
         [ssh-keygen.c]
         avoid warning; ok jakob@

commit 3a3261ff99f660b8191f3e5366054566fb0a05de
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:37:19 2003 +1000

       - markus@cvs.openbsd.org 2003/05/15 03:08:29
         [cipher.c cipher-bf1.c cipher-aes.c cipher-3des1.c]
         split out custom EVP ciphers

commit b0622653baa8e4136e116945fdd1c393ab0eaba3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:27:28 2003 +1000

       - jakob@cvs.openbsd.org 2003/05/15 02:27:15
         [dns.c]
         add missing freerrset

commit 5975cf12c309735fe3fd6a81782d46a11d166437
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:23:36 2003 +1000

     - (djm) Adapt README.dns for portable

commit a47f526dd7a10aeefb9bba577e91376de01a6a6c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 13:23:07 2003 +1000

     - (djm) Tidy Makefile clean targets

commit d9ec370ac3a27fc9374c4182b7477ec0fc8473f4
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 12:27:08 2003 +1000

     - (djm) Import getrrsetbyname() function from OpenBSD libc (for DNS support)

commit 2aa0ab463f479649760110ca52fa341880c5ae3a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 12:05:28 2003 +1000

       - jakob@cvs.openbsd.org 2003/05/15 01:48:10
         [readconf.c readconf.h servconf.c servconf.h]
         always parse kerberos options. ok djm@ markus@
     - (djm) Always parse UsePAM

commit f842fcb296b9fbc0de905837c6074c732db550e5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 12:01:28 2003 +1000

       - markus@cvs.openbsd.org 2003/05/15 00:28:28
         [sshconnect2.c]
         cleanup unregister of per-method packet handlers; ok djm@

commit 9d2be48b8fe5c3f54e932e578e3029ebe0a773fb
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 11:12:19 2003 +1000

    better glue w/ jakob@

commit 7abe09bf86b0ce437dfbf5dd7ccafadd1f39289e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 10:53:49 2003 +1000

     - (djm) Configure glue for DNS support (code doesn't work in portable yet)

commit 54c459866e2da288a3895eecf097104ac6f9f4d0
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 10:20:13 2003 +1000

       - markus@cvs.openbsd.org 2003/05/14 22:24:42
         [clientloop.c session.c ssh.1]
         allow to send a BREAK to the remote system; ok various

commit 37876e913a069036501086a247ed2ea430cea206
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 10:19:46 2003 +1000

       - jakob@cvs.openbsd.org 2003/05/14 18:16:20
         [key.c key.h readconf.c readconf.h ssh_config.5 sshconnect.c]
         [dns.c dns.h README.dns ssh-keygen.1 ssh-keygen.c]
         add experimental support for verifying hos keys using DNS as described
         in draft-ietf-secsh-dns-xx.txt. more information in README.dns.
         ok markus@ and henning@

commit abbae980e7532da68e7f6aa1da716fb69e7521ad
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 15 10:16:21 2003 +1000

     - (djm) OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2003/05/14 13:11:56
         [ssh-agent.1]
         setup -> set up;
         from wiz@netbsd

commit 1ea7166019154c4e4c829ff5b170b778a5a4cab7
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 22:33:58 2003 +1000

     - (djm) Bug #258: sscanf("[0-9]") -> sscanf("[0123456789]") for portability

commit abef5628e833163d5666736184e06e9af81d2636
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Wed May 14 21:48:51 2003 +1000

     - (dtucker) Set ai_socktype and ai_protocol in fake-getaddrinfo.c. ok djm@

commit be64d43d01bd6cdad89fee1db0e3b559d97cef96
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 19:31:12 2003 +1000

       - markus@cvs.openbsd.org 2003/05/14 08:57:49
         [monitor.c]
         http://bugzilla.mindrot.org/show_bug.cgi?id=560
         Privsep child continues to run after monitor killed.
         Pass monitor signals through to child; Darren Tucker

commit d6ead282dbf346f9037f6f8aa370c7ebbfbb5c62
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 19:30:38 2003 +1000

       - jmc@cvs.openbsd.org 2003/05/14 08:25:39
         [sftp.1]
         - better formatting in SYNOPSIS
         - whitespace at EOL
         ok djm@

commit 4d995195354696ae0ab6dea7dfa3367fc144ce89
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 19:23:56 2003 +1000

     - (djm) Avoid KrbV leak for MIT Kerberos

commit 9d507dac1f78d87f2808ab247a44cd3860146375
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 15:31:12 2003 +1000

     - (djm) Die screaming if start_pam() is called when UsePAM=no

commit 2e193e29f0f48dc2bf11cb3cf8a1806689ae1d55
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 15:13:03 2003 +1000

    Put in alphabetical order

commit 4e448a31ae12e6f84caa7cdfc8b4c23db92459db
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 15:11:48 2003 +1000

     - (djm) Add new UsePAM configuration directive to allow runtime control
       over usage of PAM. This allows non-root use of sshd when built with
       --with-pam

commit 9c617693c2250c62e5e326372bc783e3416a94b0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 14:31:11 2003 +1000

     - (djm) Make portable build with MIT krb5 (some issues remain)

commit 3ab496b3dd961423bc5e312fd5dbbef975f4d238
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:47:37 2003 +1000

       - markus@cvs.openbsd.org 2003/05/14 02:15:47
         [auth2.c monitor.c sshconnect2.c auth2-krb5.c]
         implement kerberos over ssh2 ("kerberos-2@ssh.com"); tested with jakob@
         server interops with commercial client; ok jakob@ djm@

commit fb7508edc8db9b5f445170237ec666beb3a3f6ac
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:47:07 2003 +1000

       - djm@cvs.openbsd.org 2003/05/14 01:00:44
         [sftp.1]
         emphasise the batchmode functionality and make reference to pubkey auth,
         both of which are FAQs; ok markus@

commit f84cc6343a66c041461a357cbe53e6becede6011
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:46:53 2003 +1000

       - markus@cvs.openbsd.org 2003/05/14 00:52:59
         [ssh2.h]
         ranges for per auth method messages

commit 935063553af1e017a18cd2475f31817cb4f4e611
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:46:33 2003 +1000

       - markus@cvs.openbsd.org 2003/05/12 18:35:18
         [ssh-keyscan.1]
         typo: DSA keys are of type ssh-dss; Brian Poole

commit 280ecfb6e4072ebe4e6e29850492b5cc15491eb4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:46:00 2003 +1000

       - markus@cvs.openbsd.org 2003/05/12 16:55:37
         [sshconnect2.c]
         for pubkey authentication try the user keys in the following order:
            1. agent keys that are found in the config file
            2. other agent keys
            3. keys that are only listed in the config file
         this helps when an agent has many keys, where the server might
         close the connection before the correct key is used. report & ok pb@

commit b1ca8bb159bba7cedebe8fa467bf29e4ab1a65be
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:45:42 2003 +1000

       - markus@cvs.openbsd.org 2003/05/11 20:30:25
         [channels.c clientloop.c serverloop.c session.c ssh.c]
         make channel_new() strdup the 'remote_name' (not the caller); ok theo

commit db2747259c1a433a504085f733768d0d209eb50d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:45:22 2003 +1000

       - markus@cvs.openbsd.org 2003/05/11 16:56:48
         [authfile.c ssh-keygen.c]
         change key_load_public to try to read a public from:
         rsa1 private or rsa1 public and ssh2 keys.
         this makes ssh-keygen -e fail for ssh1 keys more gracefully
         for example; report from itojun (netbsd pr 20550).

commit 3155432cd97e4dd380f11222407be0299714ce4a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:44:58 2003 +1000

       - david@cvs.openbsd.org 2003/04/30 20:41:07
         [sshd.8]
         fix invalid .Pf macro usage introduced in previous commit
         ok jmc@ mouring@

commit 049245d260696b7b2473ed4c0f931cb9ee1ceae5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:44:42 2003 +1000

       - mouring@cvs.openbsd.org 2003/04/30 01:16:20
         [sshd.8 sshd_config.5]
         Escape ?, * and ! in .Ql for nroff compatibility.  OpenSSH Portable
         Bug #550 and * escaping suggested by jmc@.

commit ea5ade28fbc228b0e7cbaba30cee8579edaee845
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:43:53 2003 +1000

       - deraadt@cvs.openbsd.org 2003/04/26 04:29:49
         [ssh-keyscan.c]
         -t in usage(); rogier@quaak.org

commit 8ce778a9f040d04b6fe28f24dc8c5fac5dd5797c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:43:25 2003 +1000

       - markus@cvs.openbsd.org 2003/04/16 14:35:27
         [auth.h]
         document struct Authctxt; with solar

commit 5d421c04e6eb1b1a62f633beca356d9d8bfc6041
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:42:40 2003 +1000

       - mouring@cvs.openbsd.org 2003/04/14 21:31:27
         [sftp-int.c]
         Missing globfree(&g) in process_put() spotted by Vince Brimhall
         <VBrimhall@novell.com>.  ok@ Theo

commit 2372ace57287c6963a5790fb254e47de57537e0a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:42:23 2003 +1000

       - markus@cvs.openbsd.org 2003/04/14 14:17:50
         [channels.c sshconnect.c sshd.c ssh-keyscan.c]
         avoid hardcoded SOCK_xx; with itojun@; should allow ssh over SCTP

commit 44e72a764f7febd041263c61c6931896a67d338e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:42:08 2003 +1000

       - naddy@cvs.openbsd.org 2003/04/12 11:40:15
         [ssh.1]
         document -V switch, fix wording; ok markus@

commit ef095ce00ab8e6ff4257839b6fedc2efcbc80ea8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:41:39 2003 +1000

       - markus@cvs.openbsd.org 2003/04/12 10:15:36
         [misc.c]
         debug->debug2

commit a201bb3f8a55fed2e75a3d6cfcaf3721497c15f3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:41:23 2003 +1000

       - markus@cvs.openbsd.org 2003/04/12 10:13:57
         [cipher.c]
         hide cipher details; ok djm@

commit c652cac5f75590a4df536fb69713ba506082f5f4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:40:54 2003 +1000

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2003/04/09 12:00:37
         [readconf.c]
         strip trailing whitespace from config lines before parsing.
         Fixes bz 528; ok markus@

commit d558092522153caa627e33e4a76c6f64332bc609
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 13:40:06 2003 +1000

     - (djm) RCSID sync w/ OpenBSD

commit 1a27a1ee8c0ddd6f390feade92259c001f36530f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 14 10:27:09 2003 +1000

     - (djm) Bug #117: Don't lie to PAM about username

commit 75d3b05c57e8284389f77d6105ebc29d00875b17
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 12 18:15:49 2003 +1000

     - (djm) Redhat spec: Don't install profile.d scripts when not
       building with GNOME/GTK askpass (patch from bet@rahul.net)

commit 0d8b792931b32442b66b9300e8678e425446ae3b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat May 10 23:42:12 2003 +1000

     - (djm) 2-clause license on loginrec.c, with permission from
       andre@ae-35.com

commit 4f9f42a9bb6a6aa8f6100d873dc6344f2f9994de
Author: Damien Miller <djm@mindrot.org>
Date:   Sat May 10 19:28:02 2003 +1000

     - (djm) Merge FreeBSD PAM code: replaces PAM password auth kludge with
       proper challenge-response module

commit c437cda328b4733b59a7ed028b72e6b7f58f86e6
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 10 17:05:46 2003 +1000

     - (dtucker) Bug #536: Test for and work around openpty/controlling tty
       problem on Linux (fixes "could not set controlling tty" errors).
    
    Also renames STREAMS_PUSH_ACQUIRES_CTTY to the more generic SSHD_ACQUIRES_CTTY
    and moves the Solaris-specific comments to configure.ac.

commit e8831091c390dcfd6b6cbc299e26192697b392bf
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 10 16:48:23 2003 +1000

     - (dtucker) Bug #318: Create ssh_prng_cmds.out during "make" rather than
       "make install".  Patch by roth@feep.net.

commit ac279284f6e15486c7760d3e5a26903b24d447d2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 4 11:36:25 2003 +1000

    Add bug# to ChangeLog.

commit 70a08cd29d38d63a8af77fdfe5e5a6fac633039a
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sun May 4 10:41:20 2003 +1000

     - (dtucker) Move #include of bsd-cygwin_util.h to openbsd-compat.h.  Patch from
       vinschen@redhat.com.

commit 04cc5385b1d9a38ce0f24d40354647117046f9a7
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Sat May 3 07:32:56 2003 +1000

     - (dtucker) Add missing "void" to record_failed_login in bsd-cray.c.  Noted
       by wendyp@cray.com.

commit bd570d7a22b7a4c5f64646c177439b64508b76c2
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 2 23:50:09 2003 +1000

    Added ok for record_failed_login() change

commit 97363a8b24601bad631f6f187c487a166f7eb959
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 2 23:42:25 2003 +1000

     - (dtucker) Move handling of bad password authentications into a platform
       specific record_failed_login() function (affects AIX & Unicos).

commit 3c01654deb235191d798a5254561624872a7f010
Author: Darren Tucker <dtucker@zip.com.au>
Date:   Fri May 2 20:48:21 2003 +1000

     - (dtucker) Bug #544: ignore invalid cmsg_type on Linux 2.0 kernels,
       privsep should now work.

commit eab4bae03894f07ea556db4d781795c724245af7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 29 23:22:40 2003 +1000

     - (djm) Add back radix.o (used by AFS support), after it went missing from
       Makefile many moons ago
     - (djm) Apply "owl-always-auth" patch from Openwall/Solar Designer
     - (djm) Fix blibpath specification for AIX/gcc
     - (djm) Some systems have basename in -lgen. Fix from ayamura@ayamura.org

commit 0e7f4363f3d7b2ae707709607fd816f663c7449a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 28 23:30:43 2003 +0000

     - (bal) [defines.h progressmeter.c scp.c] Some more culling of non 64bit
       hacked code.

commit f50ad1fd04fa23af4968f406c5993869f0aeee61
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 27 18:44:31 2003 +0000

     - (bal) auth2.c same changed as above.

commit 683036ee2c4d08c6ef5ca92050dc62f9ac657379
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 27 18:41:30 2003 +0000

     - (bal) auth1.c minor resync while looking at the code.

commit 796b9a5495673a3b701a93e56d3578768d912fd3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 27 18:01:37 2003 +0000

     - (bal) Since we don't support platforms lacking u_int_64.  We may
       as well clean out some of those evil #ifdefs

commit 93b6b776ad34ea49f18d5ab380cc83ff5ef22d8f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 27 17:55:33 2003 +0000

     - (bal) Bug #541: return; was dropped by mistake.  Reported by
       furrier@iglou.com

commit 405dc604f8c6274153bf13be7e25e1979bd557e2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 21:12:52 2003 +1000

     - (djm) Bug #539: Specify creation mode with O_CREAT for lastlog. Report
       from matth@eecs.berkeley.edu

commit 2a3f20e397b72e1efa834f8bf884e2dbdea9928b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 21:12:00 2003 +1000

       - (djm) Fix missed log => logit occurance (reference by function pointer)

commit bf2a0174e35bbebb76f464d9395e82a7675e56de
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 21:07:14 2003 +1000

       - hin@cvs.openbsd.org 2003/04/09 08:23:52
         [servconf.c]
         Don't include <krb.h> when compiling with Kerberos 5 support

commit a0898b850538c127980454000c3759fadf15df12
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 21:05:52 2003 +1000

       - itojun@cvs.openbsd.org 2003/04/08 20:21:29
         [*.c *.h]
         rename log() into logit() to avoid name conflict.  markus ok, from
         netbsd
         - (djm) XXX - Performed locally using:
           "perl -p -i -e 's/(\s|^)log\(/$1logit\(/g' *.c *.h"
       - (djm) Fix up missing include for packet.c

commit 996acd2476d9d34b18bb4f99012ea0927458f418
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 20:59:48 2003 +1000

    *** empty log message ***

commit 5f16a5ee4e35d36e72f8f72fb2334087cb2ea680
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 20:51:55 2003 +1000

       - millert@cvs.openbsd.org 2003/04/07 21:58:05
         [progressmeter.c]
         The UCB copyright here is incorrect.  This code did not originate
         at UCB, it was written by Luke Mewburn.  Updated the copyright at
         the author's request.  markus@ OK

commit b1ecd9cd9761e021c912375149c28084bace43ef
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 20:51:24 2003 +1000

       - markus@cvs.openbsd.org 2003/04/07 08:29:57
         [monitor_wrap.c]
         typo: get correct counters; introduced during rekeying change.

commit 3bed191ca2539025761dd366859ea7d6c6443d1d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 20:50:59 2003 +1000

       - itojun@cvs.openbsd.org 2003/04/03 07:25:27
         [progressmeter.c]
         $OpenBSD$
       - itojun@cvs.openbsd.org 2003/04/03 10:17:35
         [progressmeter.c]
         remove $OpenBSD$, as other *.c does not have it.

commit 703ced55bbe66774a73b4dbe1e952cc269c5d3fb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 20:50:26 2003 +1000

       - markus@cvs.openbsd.org 2003/04/02 14:36:26
         [ssh-keysign.c]
         potential segfault if KEY_UNSPEC; cjwatson@debian.org; bug #526

commit a5539d2698ea83b4a7f9abe7cde8306e2fd76f33
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 20:50:06 2003 +1000

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2003/04/02 09:48:07
         [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
         [readconf.h serverloop.c sshconnect2.c]
         reapply rekeying chage, tested by henning@, ok djm@

commit a92a589e9716d6b10250c3eb8f4d81d64cd60dd8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 19:41:25 2003 +1000

     - (djm) Make the spec work with Redhat 9.0 (which renames sharutils)

commit d186d7441048f08ffb4f7282da6f8ed75a169bfa
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 9 19:40:33 2003 +1000

     - (djm) Bug #539: Specify creation mode with O_CREAT for lastlog. Report
       from matth@eecs.berkeley.edu

commit c8a49d743ae2ab739ca4266e7013bc9c3079aaee
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 2 15:18:22 2003 +0000

     - (bal) if IP_TOS is not found or broken don't try to compile in
       packet_set_tos() function call.  bug #527

commit a0ab669c133a756bd5b8f4eef82693e367c49532
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 1 21:47:16 2003 +1000

     - (djm) Release 3.6.1p1

commit b80e52ab6f8230d87d33fab7f7bc79e3ddb7aa8b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 1 21:46:53 2003 +1000

     - (djm) Crank spec file versions

commit 13c1c7a75e523dc6320e1dd1b2affb223f5002f1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 1 21:45:26 2003 +1000

       - markus@cvs.openbsd.org 2003/04/01 10:56:46
         [version.h]
         3.6.1

commit d32090426bc9ebf6ec982acad029b75a48033175
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 1 21:44:37 2003 +1000

       - markus@cvs.openbsd.org 2003/04/01 10:31:26
         [compat.c compat.h kex.c]
         bugfix causes stalled connections for ssh.com < 3.0; noticed by ho@;
         tested by ho@ and myself

commit 2dc074ef4bd925a7c95b9741ab20ab07c79dc2ff
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 1 21:43:39 2003 +1000

       - markus@cvs.openbsd.org 2003/04/01 10:10:23
         [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
         [readconf.h serverloop.c sshconnect2.c]
         rekeying bugfixes and automatic rekeying:
         * both client and server rekey _automatically_
               (a) after 2^31 packets, because after 2^32 packets
                   the sequence number for packets wraps
               (b) after 2^(blocksize_in_bits/4) blocks
           (see: draft-ietf-secsh-newmodes-00.txt)
           (a) and (b) are _enabled_ by default, and only disabled for known
           openssh versions, that don't support rekeying properly.
         * client option 'RekeyLimit'
         * do not reply to requests during rekeying
       - markus@cvs.openbsd.org 2003/04/01 10:22:21
         [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
         [readconf.h serverloop.c sshconnect2.c]
         backout rekeying changes (for 3.6.1)

commit 495dca35186a9a33c85a6fa2bcc1b127512bb688
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 1 21:42:14 2003 +1000

     - (djm) OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2003/03/28 10:11:43
         [scp.1 sftp.1 ssh.1 ssh-add.1 ssh-agent.1 ssh_config.5 sshd_config.5]
         [ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8]
         - killed whitespace
         - new sentence new line
         - .Bk for arguments
         ok markus@

commit f18462f5bff7265d151f9367d4dd2632a0b0fb25
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 1 21:31:56 2003 +1000

    license from samba

commit b3207e8061c00791d40b3cc01bd352e002068255
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 26 16:01:11 2003 +1100

     - (djm) OpenBSD CVS Sync
       - deraadt@cvs.openbsd.org 2003/03/26 04:02:51
         [sftp-server.c]
         one last fix to the tree: race fix broke stuff; pr 3169;
         srp@srparish.net, help from djm

commit 68d893dfed6d29c92410296c19f425c95fe9fbb8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 25 09:07:52 2003 +1100

     - (djm) Fix getpeerid support for 64 bit BE systems. From
        Arnd Bergmann <arndb@de.ibm.com>

commit 62b6b17080f24da1513e41e426064fdc2e53cf23
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 24 13:35:58 2003 +1100

     - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
       Report from murple@murple.net, diagnosis from dtucker@zip.com.au

commit b062c293e084f16df3d09f9db510be4ddec6d2d6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 24 09:12:09 2003 +1100

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2003/03/23 19:02:00
         [monitor.c]
         unbreak rekeying for privsep; ok millert@

commit 009b23f6ab8ee16480228bd12b50c76e037c9094
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Mar 20 20:50:41 2003 -0800

    [contrib/caldera/openssh.spec] workaround RPM quirk. Fix %files section

commit c8c548d24883eaff20ea1665022ee92bd0632e29
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 21 01:18:09 2003 +0000

     - (bal) Disable Privsep for Tru64 after pre-authentication due to issues
       with SIA.  Also, clean up of tru64 support patch by Chris Adams
       <cmadams@hiwaay.net>

commit a5a2648b81c9347c241c37e6cba78f1df47e9320
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 21 01:05:37 2003 +0000

     - (bal) Collection of Cray patches (bsd-cray.h fix for CRAYT3E and improved
       guessing rules)

commit d54d9382a48355294a6bb2e1e847e0a48fd8c19f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 21 00:55:32 2003 +0000

     - (bal) scp.c 'limit' conflicts with Cray.  Rename to 'limitbw'

commit 5bd6eb71daf357f544a6b4d4c7c3cbbbe12b4edf
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 21 00:34:34 2003 +0000

     - (bal) The days of lack of int64_t support are over.  Sorry kids.

commit 5efd43088bc1f6f7b3a7d78fd2ed82ee1cbd6ad5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 20 11:05:10 2003 +1100

    Build gtk2 askpass by default (instead of old GNOME one)

commit 334821518eb45656d91c5df3a334f6ed8dc9c7f7
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 20 10:52:14 2003 +1100

    Bump RPM versions

commit 4874c32531f92d9766c538f628c6b1a5a29996f3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 20 10:11:34 2003 +1100

       - markus@cvs.openbsd.org 2003/03/17 11:43:47
         [version.h]
         enter 3.6

commit 05f5578e1fe80be7c9ab6880eae7b7941c8eed98
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 20 10:08:05 2003 +1100

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2003/03/17 10:38:38
         [progressmeter.c]
         don't print \n if backgrounded; from ho@

commit 4e4dc561ae948a410fb82fd8b0960ec2cf8e2e70
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Mar 18 10:21:40 2003 -0800

    [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
    add nanosleep(). testing/corrections by Darren Tucker <dtucker@zip.com.au>

commit cafbcc73349f4e14afed5207b81a1205afc2cee2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 17 16:13:53 2003 +1100

     - (djm) Fix return value checks for RAND_bytes. Report from
       Steve G <linux_4ever@yahoo.com>

commit c51d0735a4a68ddcd927f003ffb3fc917cb207c2
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 15 11:37:09 2003 +1100

       - markus@cvs.openbsd.org 2003/03/13 11:44:50
         [ssh-agent.c]
         ssh-agent is similar to ssh-keysign (allows other processes to use
         private rsa keys). however, it gets key over socket and not from
         a file, so we have to do blinding here as well.

commit ed33d3b4d229b0e815f43d8a3192047ef161dcd7
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 15 11:36:18 2003 +1100

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2003/03/13 11:42:19
         [authfile.c ssh-keysign.c]
         move RSA_blinding_on to generic key load method

commit c1365e19b0f5ae8d05b697cd40d1fb4f664112b6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 13 09:42:51 2003 +1100

    Fix bug #

commit c9c1d3757f76381c432bac4ed6b20cfd90167601
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 10 12:10:45 2003 +1100

     - (djm) AIX package builder update from dtucker@zip.com.au

commit 933cc8fb9cd3e34b9b656f73ad8b661c08551875
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 10 11:38:10 2003 +1100

     - (djm) Bug #245: TTY problems on Solaris. Fix by stevesk@ and
       dtucker@zip.com.au

commit f211efc69071744ad22e0b8a1c7ca01bdff0b91b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 10 11:23:06 2003 +1100

     - (djm) One more portable-specific one from dlheine@suif.Stanford.EDU/
       CLOUSEAU

commit 0011138d47e284273ba77415f7162aaab60d9a44
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 10 11:21:17 2003 +1100

    - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2003/03/05 22:33:43
         [channels.c monitor.c scp.c session.c sftp-client.c sftp-int.c]
         [sftp-server.c ssh-add.c sshconnect2.c]
         fix memory leaks; from dlheine@suif.Stanford.EDU/CLOUSEAU; ok djm@

commit 73942b9d54ec71ae76e58d5bf3b06f094bfc3002
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 25 14:32:16 2003 +1100

    duh

commit 17bbc45a11a6cab7f308095c5aef6d9fbfe798c9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 25 10:25:12 2003 +1100

    me <- idiot

commit ca49a977888c5a318c55749fd6e1d3a9efe4b0bf
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 25 10:22:35 2003 +1100

     - (djm) Fix some compile errors spotted by dtucker and his fabulous
       tinderbox

commit fe1f14375a6a739fa662b4a9d5e9744bff9716eb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 15:45:42 2003 +1100

     - (djm) Bug #456: Support for NEC SX6 with Unicos; from wendyp@cray.com

commit 1a3ccb07c5709672d327afefd7fb6971e96b1ef7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 13:04:01 2003 +1100

     - (djm) Bug #494: Allow multiple accounts on Windows 9x/Me;
       From vinschen@redhat.com

commit 8d8168a255c17ca343865d1ee4962f2cba46b2d8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 12:55:55 2003 +1100

     - (djm) Rest of Bug #499: Import a basename() function from OpenBSD libc

commit b16f874d89402333aabcc7988de59766934bf83d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 12:47:15 2003 +1100

     - (djm) Most of Bug #499: Cygwin compile fixes for new progressmeter

commit 30947c72878e2dd1e6cf614d73bae226ab863b60
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 12:35:08 2003 +1100

     - (djm) Bug #501: gai_strerror should return char*;
       fix from dtucker@zip.com.au

commit d194048f573136f1c2c34d25f951b78f4ffc7d77
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 12:18:46 2003 +1100

     - (djm) Add new object files to Makefile and reorder

commit 543402108ed6140bff2ddd6eb4011413b1d3b97f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 12:05:18 2003 +1100

       - mpech@cvs.openbsd.org 2003/02/21 10:34:48
         [auth-krb4.c]
         ...sizeof(&adat.session) is not good here.
         henning@, deraadt@, millert@

commit 9f82c8fa4f9b6b258caf432567d43b5194d99ad0
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 12:04:33 2003 +1100

       - markus@cvs.openbsd.org 2003/02/21 09:05:53
         [servconf.c]
         print sshd_config filename in debug2 mode.

commit 06ebedf3656bbe603d0a0d8db9eeeb35ff702643
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 12:03:38 2003 +1100

       - markus@cvs.openbsd.org 2003/02/16 17:30:33
         [monitor.c monitor_wrap.c]
         fix permitrootlogin forced-commands-only for privsep; bux #387; ok provos@

commit 8e7fb335235bd6a7f8387a40bf71eaf9798f6f7e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 12:03:03 2003 +1100

       - markus@cvs.openbsd.org 2003/02/16 17:09:57
         [kex.c kexdh.c kexgex.c kex.h sshconnect2.c sshd.c ssh-keyscan.c]
         split kex into client and server code, no need to link
         server code into the client; ok provos@

commit 1587fb8a174f57a064d603bbd595c3369aa697aa
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 12:02:12 2003 +1100

       - markus@cvs.openbsd.org 2003/02/12 21:39:50
         [crc32.c crc32.h]
         replace crc32.c with a BSD licensed version; noted by David Turner

commit e8a240f966c567304d810ba0234bca326e4abecb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 12:01:40 2003 +1100

       - markus@cvs.openbsd.org 2003/02/12 09:33:04
         [key.c key.h ssh-dss.c ssh-rsa.c]
         merge ssh-dss.h ssh-rsa.h into key.h; ok deraadt@

commit 7b406276c45abede9a3e6d5b979b37b8d50287f7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 12:00:16 2003 +1100

       - markus@cvs.openbsd.org 2003/02/10 11:51:47
         [ssh-add.1]
         xref sshd_config.5 (not sshd.8); mark@summersault.com; bug #490

commit 556f9315a538c9575c2fcaf2a3ca4d9c068ade78
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:59:26 2003 +1100

       - markus@cvs.openbsd.org 2003/02/06 21:22:43
         [auth1.c auth2.c]
         undo broken fix for #387, fixes #486

commit 9e51a73122fdb06c14068017d8f2a04179bf6bf6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:58:44 2003 +1100

       - markus@cvs.openbsd.org 2003/02/06 09:29:18
         [sftp-server.c]
         fix races in rename/symlink; from Tony Finch; ok djm@

commit 9f1e33a6b295f46dba45b0eefac173f699480943
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:57:32 2003 +1100

       - markus@cvs.openbsd.org 2003/02/06 09:27:29
         [ssh.c ssh_config.5]
         support 'ProxyCommand none'; bugzilla #433; binder@arago.de; ok djm@

commit 97f39ae810a8589c262f2b88d7dd4e70c0b84d70
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:57:01 2003 +1100

       - markus@cvs.openbsd.org 2003/02/06 09:26:23
         [session.c]
         missing call to setproctitle() after authentication; ok provos@

commit 61f08ac35a06e758c20fc85b9944d1feee146d47
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:56:27 2003 +1100

       - markus@cvs.openbsd.org 2003/02/05 09:02:28
         [readconf.c]
         simplify ProxyCommand parsing, remove strcat/xrealloc; ok henning@, djm@

commit b7df3af154d035be480b9d9f433f440f1c66e1bd
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:55:46 2003 +1100

       - markus@cvs.openbsd.org 2003/02/04 09:33:22
         [monitor.c monitor_wrap.c]
         skey/bsdauth: use 0 to indicate failure instead of -1, because
         the buffer API only supports unsigned ints.

commit 386f1f3e6c5c3ea72970fcce4d939b2d4eb1bf3e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:54:57 2003 +1100

       - markus@cvs.openbsd.org 2003/02/04 09:32:08
         [key.c]
         better debug3 message

commit e8cea9e7553aa7df59608c0ae7a5a8dcbcde95a6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:54:10 2003 +1100

       - markus@cvs.openbsd.org 2003/02/03 08:56:16
         [sshpty.c]
         don't call error() for readonly /dev; from soekris list; ok mcbride,
         henning, deraadt.

commit babb47a059148bb97de254f8964dffe7dab213dc
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:53:32 2003 +1100

       - markus@cvs.openbsd.org 2003/02/02 10:56:08
         [kex.c]
         add support for key exchange guesses; based on work by
         avraham.fraenkel@commatch.com; fixes bug #148; ok deraadt@

commit eeeeb3517e3b878bc4d2f8db9cbebd8e912b0cca
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:52:58 2003 +1100

       - markus@cvs.openbsd.org 2003/02/02 10:51:13
         [scp.c]
         call okname() only when using system(3) for remote-remote copy;
         fixes bugs #483, #472; ok deraadt@, mouring@

commit ffadc583f63eb8b37750bdce6b70c6102ae621b4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:52:26 2003 +1100

       - jmc@cvs.openbsd.org 2003/01/31 21:54:40
         [sshd.8]
         typos; sshd(8): help and ok markus@
         help and ok millert@

commit 2eb26e89c5472e6b3041bb5c776e819835bcbf4c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:51:32 2003 +1100

       - stevesk@cvs.openbsd.org 2003/01/28 17:24:51
         [scp.1]
         remove example not pertinent with -1 addition; ok markus@

commit 8ee66a21cd0d033f8e8207b83f941ab7771b9ca3
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:50:50 2003 +1100

       - markus@cvs.openbsd.org 2003/01/28 16:11:52
         [scp.1]
         document -l; pekkas@netcore.fi

commit 180fc5b23682ec39964b70dc3a43f9658b7c4acb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:50:18 2003 +1100

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2003/01/27 17:06:31
         [sshd.c]
         more specific error message when /var/empty has wrong permissions;
         bug #46, map@appgate.com; ok henning@, provos@, stevesk@

commit 0775976dc61e0c172b3b508cd13f087e477c5793
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 24 11:48:22 2003 +1100

     - (djm) Tweak gnome-ssh-askpass2:
       - Retry kb and mouse grab a couple of times, so passphrase dialog doesn't
         immediately fail if you are doing something else when it appears (e.g.
         dragging a window)
       - Perform server grab after we have the keyboard and/or pointer to avoid
         races.

commit c8936acfe1a3c570d79d8868f636c94adba3ca36
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 11 10:04:03 2003 +1100

     - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com

commit 850b942037d527117a38d4e0350a5ee786020779
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 6 10:50:42 2003 +1100

     - (djm) Teach fake-getaddrinfo to use getservbyname() when provided a
       string service name. Suggested by markus@, review by itojun@

commit 4b0f1ad4dbf1e3c42e9043ce0b0739a89f5b4c86
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 1 04:43:34 2003 +0000

     - (bal) AIX 4.2.1 lacks nanosleep().  Patch to use nsleep() provided by
       dtucker@zip.com.au

commit 4d9dc1aa82a8c1e5feaef74ba1ee532b02823947
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 30 10:20:56 2003 +1100

     - (djm) Unbreak root password auth. Spotted by dtucker@zip.com.au

commit cd6853c31c226d4538f0a46b4ebcdcc734d4b6c0
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 28 11:33:42 2003 +1100

     - (djm) Search libposix4 and librt for nanosleep. From dtucker@zip.com.au
       and openssh-unix-dev@thewrittenword.com

commit 6dc562a7aacbedbf9d2dfcef19fcba19c226b453
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 27 21:15:10 2003 +0000

     - (bal) Bugzilla 477 patch by wendyp@cray.com.  Define TIOCGPGRP for
       cray.  Also removed test for tcgetpgrp in configure.ac since it
       is no longer used.

commit 3bc0c062abf4d7a41373694ae04363579e2345e4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 24 11:50:32 2003 +1100

     - (djm) Add TIMEVAL_TO_TIMESPEC macros

commit 8e12147df54c5e490e847bbc0ede41ac0a17af9c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 24 11:37:38 2003 +1100

       - markus@cvs.openbsd.org 2003/01/23 14:06:15
         [scp.1 scp.c]
         scp -12; Sam Smith and others; ok provos@, deraadt@

commit ff74d748e941fd9078aa8ac3fddecd249ab8ceb2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 24 11:36:58 2003 +1100

       - markus@cvs.openbsd.org 2003/01/23 14:01:53
         [scp.c]
         bandwidth limitation patch (scp -l) from niels@; ok todd@, deraadt@

commit 6c71179f6839ab49e4e8a91209eef85dc190d5f1
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 24 11:36:23 2003 +1100

       - markus@cvs.openbsd.org 2003/01/23 13:50:27
         [authfd.c authfd.h readpass.c ssh-add.1 ssh-add.c ssh-agent.c]
         ssh-add -c, prompt user for confirmation (using ssh-askpass) when
         private agent key is used; with djm@; test by dugsong@, djm@;
         ok deraadt@

commit 5a93add673a68d9ef67504b17913254498f4deb9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 24 11:34:52 2003 +1100

     - (djm) OpenBSD CVS Sync
       - jmc@cvs.openbsd.org 2003/01/23 08:58:47
         [sshd_config.5]
         typos; ok millert@

commit 21de87b936c0d2989790284dca3d5c51796ca966
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 23 17:41:20 2003 +1100

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2003/01/23 00:03:00
         [auth1.c]
         Don't log TIS auth response; "get rid of it" - markus@

commit 8b9cde784784949f9fdf0451f9da9030b76ca705
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 22 17:53:16 2003 +1100

     - (djm) Sync regress with OpenBSD -current

commit e9b7d720c8de6c293a3632c1fbf02cfa9c542923
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 22 16:21:02 2003 +1100

    unbreak for PAM case

commit 2101bfc4e1dbe1dc475d71158b1c24c6d2e2e412
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 22 15:42:26 2003 +1100

     - (djm) Reorganise PAM & SIA password handling to eliminate some common code

commit 53d81483f0bcea8af2207583bb6e83c187d522fc
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 22 11:47:19 2003 +1100

     - (djm) OpenBSD CVS Sync
       - marc@cvs.openbsd.org 2003/01/21 18:14:36
         [ssh-agent.1 ssh-agent.c]
         Add a -t life option to ssh-agent that set the default lifetime.
         The default can still be overriden by using -t in ssh-add.
         OK markus@

commit 89fe3f30a71dee3b5effbcbc3b142c86ab129fe2
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jan 19 20:20:24 2003 -0800

     [configure.ac] Add -belf to build ELF binaries on OpenServer 5 when
     using cc. (gcc already did)

commit 4ea542b41a5d677c3c91b883c935c1930a5bede4
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jan 19 20:15:13 2003 -0800

    [progressmeter.c] make compilers without long long happy.

commit 140344b8097ccf596b40131c1b22bef8139631f4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 20 13:15:10 2003 +1100

     - (djm) Fix compilation for NetBSD from dtucker@zip.com.au

commit e443e9398eb95f95bee82009cfae30951646c6e9
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 18 16:24:06 2003 +1100

     - (djm) Revert fix for Bug #442 for now.

commit 9715bb1833947456dc4fa1cf536fbd32a129979f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 17 10:31:38 2003 +1100

     - (djm) Bug #470: Detect strnvis, not strvis in configure.
        From d_wllms@lanl.gov

commit cb3e3c8b24b5c62a56241719df3702b5d598d5f4
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 16 15:39:13 2003 +1100

    20030116
     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2003/01/16 03:41:55
         [sftp-int.c]
         explicitly use first glob result

commit 5fa01fd7fba87bbd716b4ca32d4d7e2f7180975a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 14 22:24:47 2003 +1100

       - djm@cvs.openbsd.org 2003/01/14 10:58:00
         [sftp-client.c sftp-int.c]
         Don't try to upload or download non-regular files. Report from
         apoloval@pantuflo.escet.urjc.es; ok markus@

commit 7a992387cb9a14fbe9b1a1108bd41c8cb1ccd38a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 14 22:24:19 2003 +1100

    oops

commit dc70857773267f4832ac159c2f98db125f25f419
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 14 22:24:05 2003 +1100

       - djm@cvs.openbsd.org 2003/01/13 11:04:04
         [sftp-int.c]
         make cmds[] array static to avoid conflict with BSDI libc.

commit 71a51415348921728b5b41ac45003858436634c3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 14 22:23:23 2003 +1100

       - markus@cvs.openbsd.org 2003/01/12 16:57:02
         [progressmeter.c]
         allow WARNINGS=yes; ok djm@

commit 0946d876f9b7abea25eb0d617b1860575937e5f4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 14 22:22:43 2003 +1100

       - markus@cvs.openbsd.org 2003/01/11 18:29:43
         [log.c]
         set fatal_cleanups to NULL in fatal_remove_all_cleanups();
         dtucker@zip.com.au

commit 0141319d859ace49008c9a9923f6b448190786b3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 14 22:22:11 2003 +1100

     - (djm) OpenBSD CVS Sync
       - fgsch@cvs.openbsd.org 2003/01/10 23:23:24
         [sftp-int.c]
         typo; from Nils Nordman <nino at nforced dot com>.

commit 7d9012729123a55cbed793028618c81339309cbb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 13 16:55:22 2003 +1100

     - (djm) Bug #467: Add a --disable-strip option to turn off stripping of
       installed binaries. From mdev@idg.nl

commit ec201964e4afc9d97b4f11251cb42db0bd4fb062
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 13 10:04:58 2003 +1100

     - (djm) Rework openbsd-compat/setproctitle.c a bit: move emulation type
       detection to configure.ac. Prompted by stevesk@

commit 4790772cda87697a33e54d35c7cc2763914e014a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 13 10:00:34 2003 +1100

    more

commit 6fd00e042c13dfd94cdcaef5b4d1656d900b8ce6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 10 21:46:02 2003 +1100

       - fgsch@cvs.openbsd.org 2003/01/10 08:19:07
         [scp.c sftp.1 sftp.c sftp-client.c sftp-int.c  progressmeter.c]
         [progressmeter.h]
         sftp progress meter support.
         original diffs by Nils Nordman <nino at nforced dot com> via
         markus@, merged to -current by me, djm@ ok.

commit b46b9f322d82a7c912e6e15dbd8a73261acf2991
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 10 21:45:12 2003 +1100

       - djm@cvs.openbsd.org 2003/01/10 10:32:54
         [channels.c]
         hush socket() errors, except last. Fixes mindrot bug #408; ok markus@

commit 86b781c179911d609bd0e3cfa3992f510cd56413
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 10 21:44:48 2003 +1100

       - djm@cvs.openbsd.org 2003/01/10 10:29:35
         [scp.c]
         Don't ftruncate after write error, creating sparse files of
         incorrect length
         mindrot bug #403, reported by rusr@cup.hp.com; ok markus@

commit a7f3aaadc30b1533def73449081263a5d42d4aa4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 10 21:43:58 2003 +1100

       - djm@cvs.openbsd.org 2003/01/10 08:48:15
         [sftp-client.c]
         Simplify and avoid redundancy in packet send and receive
         functions; ok fgs@

commit 62d57f605a84b8d80803a36a612a37a5137a9963
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 10 21:43:24 2003 +1100

       - fgsch@cvs.openbsd.org 2003/01/10 08:19:07
         [scp.c sftp.1 sftp.c sftp-client.c sftp-int.c]
         sftp progress meter support.
         original diffs by Nils Nordman <nino at nforced dot com> via
         markus@, merged to -current by me, djm@ ok.

commit 956f3fb28b93420e87a51d1611029accebb2e43b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 10 21:40:00 2003 +1100

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2003/01/08 23:53:26
         [sftp.1 sftp.c sftp-int.c sftp-int.h]
         Cleanup error handling for batchmode
         Allow blank lines and comments in input
         Ability to suppress abort on error in batchmode ("-put blah")
         Fixes mindrot bug #452; markus@ ok

commit a8ed44b79e6dd78d7871b0fb8149951b54662ef5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 10 09:53:12 2003 +1100

     - (djm) Enable new setproctitle emulation for Linux, AIX and HP/UX. More
       systems may be added later.

commit 13b2e55c36ec316bd4ec15e830c9eae888d2cb68
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jan 8 20:09:30 2003 -0800

    [scp.c] make compilers without long long happy.

commit 458c6bfa10bb370487e9e27f540e1a7e7a5909cc
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jan 8 20:04:27 2003 -0800

    [auth.c] declare today at top of allowed_user() to keep older compilers happy.

commit d0d7a8b27b4cc9faaa4d8e4112d5d1fe759b0939
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jan 8 17:22:59 2003 -0800

    [Makefile.in configure.ac] replace fixpath with sed script. Patch by Mo DeJong.

commit 2047b3bdf69549eff9031fcf4464fd011381ecf2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 8 23:28:40 2003 +1100

     - (djm) Update README to reflect AIX's status as a well supported platform.
       From dtucker@zip.com.au

commit 6342180b7f64c96e020db99b97428e4a69a39567
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 8 14:05:23 2003 +1100

       - fgsch@cvs.openbsd.org 2003/01/07 23:42:54
         [sftp.1]
         add version; from Nils Nordman <nino at nforced dot com> via markus@.
         markus@ ok

commit 770b374a68fdb27de2c6314f154db57067875ff8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 8 14:04:53 2003 +1100

       - djm@cvs.openbsd.org 2003/01/06 23:51:22
         [sftp-client.c]
         Fix "get -p" download to not add user-write perm. mindrot bug #426
         reported by gfernandez@livevault.com; ok markus@

commit 275295eb41278ccb0bf652271c33d656f2dc0de3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 8 14:04:09 2003 +1100

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2003/01/01 18:08:52
         [channels.c]
         move big output buffer messages to debug2

commit e77c17ee4a699052bb012751b527d72488350fc7
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 8 12:37:03 2003 +1100

     - (djm) Avoid redundant xstrdup/xfree in auth2-pam.c. From Solar via markus@

commit 13dd03a0e2605f0ec2da811aa814a58bc2dd9a3d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 8 11:16:48 2003 +1100

     - (djm) Sync openbsd-compat/ with OpenBSD -current

commit bc9b7c41e2339cc5158357213dad9f238612705b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 8 00:06:48 2003 +1100

    missing newline

commit 06817f9cd3bf6720ff59b38efe42ebfd8db47546
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 7 23:55:59 2003 +1100

     - (djm) Fix my fix of the fix for the Bug #442 for PAM case. Spotted by
       dtucker@zip.com.au. Reorder for clarity too.

commit f25c18d7e8810ad94c7d2030cb0427e22745531e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 7 17:38:58 2003 +1100

     - (djm) Bug #178: On AIX /etc/nologin wasnt't shown to users. Fix from
       Ralf.Wenk@fh-karlsruhe.de and dtucker@zip.com.au

commit b93addb6d667b36bdbb298b8b3c581c1738c0c9f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 7 17:04:18 2003 +1100

     - (djm) Bug #111: Run syslog and stderr logging through strnvis to eliminate
       nasties. Report from peak@argo.troja.mff.cuni.cz

commit 7df881d20e85ecbd389311cea999162a945774e1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 7 16:46:58 2003 +1100

     - (djm) Bug #110: bogus error messages in lastlog_get_entry(). Fix based
       on one by peak@argo.troja.mff.cuni.cz

commit 64004b5566282ceb395674e0c4aaa89e04b3847d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 7 16:15:20 2003 +1100

     - (djm) Fix Bug #442 for PAM case

commit e832819cf7289b467070fc31c5080c133f0a101e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 7 15:18:32 2003 +1100

     - (djm) Bug #26: Use local mkstemp() rather than glibc's silly one. Fixes
       Can't pass KRB4 TGT passing. Fix from: jan.iven@cern.ch

commit 48cb8aa935211ff95ff62267a799d3548df442d4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 7 12:19:32 2003 +1100

     - (djm) Bug #442: Check for and deny access to accounts with locked
       passwords. Patch from dtucker@zip.com.au

commit 5e4471e45a9ba9a4ecafa91e15142feaa682bf02
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 7 10:51:23 2003 +1100

     - (djm) Bug #401: Work around Linux breakage with IPv6 mapped addresses.
       Based on fix from yoshfuji@linux-ipv6.org

commit dfedbf8e5a1f6719a9e91f79900d8cc0d055c453
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 3 14:52:53 2003 +1100

     - (djm) Bug #446: Set LOGIN env var to pw_name on AIX. Patch from
       mii@ornl.gov

commit 02e16ad95fb1f56ab004b01a10aab89f7103c55d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 3 14:42:27 2003 +1100

     - (djm) Bug #460: Filling utmp[x]->ut_addr_v6 if present. Patch from
       cjwatson@debian.org

commit 8aff5cbed75279094e2cf701d6eed38dbe4275b8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 3 14:34:06 2003 +1100

     - (djm) Bug #461: ssh-copy-id fails with no arguments. Patch from
       cjwatson@debian.org

commit 678ee51ff3493f0185dcb23bfb9fb2ba299d89b1
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jan 1 23:43:55 2003 +0000

      - (stevesk) [session.c sshlogin.c sshlogin.h] complete portable
        parts of pass addrlen with sockaddr * fix.
        from Hajimu UMEMOTO <ume@FreeBSD.org>

commit 1b96cfb97585459bbb71198123425f7e831e2845
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:58:17 2002 +0000

     - (bal) [msg.c msg.h scp.c ssh-keysign.c sshconnect2.c]  Resync CVS IDs since
       we already did s/msg_send/ssh_msg_send/

commit 40b950356303d5293f1f684d2748be18291541af
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:53:08 2002 +0000

       - markus@cvs.openbsd.org 2002/12/13 15:20:52
         [scp.c]
         1) include stalling time in total time
         2) truncate filenames to 45 instead of 20 characters
         3) print rate instead of progress bar, no more stars
         4) scale output to tty width
         based on a patch from Niels; ok fries@ lebel@ fgs@ millert@

commit 1d568f9fce07fd6ea1f6d9f84cd204a17264e28e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:44:36 2002 +0000

       - markus@cvs.openbsd.org 2002/12/13 10:03:15
         [channels.c misc.c sshconnect2.c]
         cleanup debug messages, more useful information for the client user.

commit faa1ea8c20f6f234e14b192705ddaeb1bc67f7de
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:42:52 2002 +0000

       - markus@cvs.openbsd.org 2002/12/10 19:47:14
         [packet.c]
         static

commit a743398d04d2bb40b95b8d508152fb15601e2329
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:41:41 2002 +0000

       - markus@cvs.openbsd.org 2002/12/10 19:26:50
         [packet.c]
         move tos handling to packet_set_tos; ok provos/henning/deraadt

commit 46767607e290343fdd43f6f6b4dc170647700698
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:26:08 2002 +0000

       - markus@cvs.openbsd.org 2002/12/10 08:56:00
         [session.c]
         Make sure $SHELL points to the shell from the password file, even if shell
         is overridden from login.conf; bug#453; semen at online.sinor.ru; ok millert@

commit b9fa691819cabfeb1a1bc721daa45593e1bb59e2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:24:54 2002 +0000

       - millert@cvs.openbsd.org 2002/12/09 16:50:30
         [ssh.c]
         Avoid setting optind to 0 as GNU getopt treats that like we do optreset.
         markus@ OK

commit d57678182944d4acf87b7dfa0db7725e7721c6d6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:23:37 2002 +0000

      - djm@cvs.openbsd.org 2002/12/06 05:20:02
         [sftp.1]
         Fix cut'n'paste error, spotted by matthias.riese@b-novative.de; ok deraadt@

commit 418e078378d078c6995742e3f95f7c22f3580fb1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:22:09 2002 +0000

       - markus@cvs.openbsd.org 2002/12/05 11:08:35
         [scp.c]
         use roundup() similar to rcp/util.c and avoid problems with strange
         filesystem block sizes, noted by tjr@freebsd.org; ok djm@

commit 611797ed1533f14ac2c04a2531ad90615afa6174
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:15:57 2002 +0000

       - stevesk@cvs.openbsd.org 2002/12/04 04:36:47
         [session.c]
         remove xauth entries before add; PR 2994 from janjaap@stack.nl.
         ok markus@

commit c276c1208e43ed4305d723004ddf602fbe99513b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:14:51 2002 +0000

       - markus@cvs.openbsd.org 2002/11/27 17:53:35
         [scp.c sftp.c ssh.c]
         allow usernames with embedded '@', e.g. scp user@vhost@realhost:file /tmp;
         http://bugzilla.mindrot.org/show_bug.cgi?id=447; ok mouring@, millert@

commit acaac975cad5a45c14da53f1e61e5c6d133de85d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:13:37 2002 +0000

       - stevesk@cvs.openbsd.org 2002/11/26 02:38:54
         [canohost.c]
         KNF, comment and error message repair; ok markus@

commit 9394d2fc0a3fed5cfca0bae0cb6dd8e4c1ee1e9d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:11:54 2002 +0000

      - stevesk@cvs.openbsd.org 2002/11/26 02:35:30
         [ssh-keygen.1]
         remove outdated statement; ok markus@ deraadt@

commit e7ee7fe602edcca6f55c445cd56775ab3b0a759d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:11:02 2002 +0000

       - wcobb@cvs.openbsd.org 2002/11/26 00:45:03
         [scp.c ssh-keygen.c]
         Remove unnecessary fflush(stderr) calls, stderr is unbuffered by default.
         ok markus@

commit 2594d9a06bb1b7e0d249a02e0c217280883bdbf0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:09:59 2002 +0000

      - stevesk@cvs.openbsd.org 2002/11/24 21:46:24
         [ssh-keysign.8]
         typo: "the the"

commit 604dc728907e684e3c70bd5ebf0485d8de6fc94e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:08:57 2002 +0000

      - markus@cvs.openbsd.org 2002/11/21 23:04:33
         [ssh.c]
         debug->debug2

commit 93576d9538f3b6d373248ffd2ed5ab9852a1555c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:06:19 2002 +0000

       - deraadt@cvs.openbsd.org 2002/11/21 23:03:51
         [auth-krb5.c auth1.c hostfile.h monitor_wrap.c sftp-client.c sftp-int.c ssh-add.c ssh-rsa.c
          sshconnect.c]
         KNF

commit 064496feaab2183b6dc5db0b0bebe0b226e2d31d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:04:22 2002 +0000

       - markus@cvs.openbsd.org 2002/11/21 22:45:31
         [cipher.c kex.c packet.c sshconnect.c sshconnect2.c]
         debug->debug2, unify debug messages

commit 1f53083fc47e1ebd9f08f8d04035720316385560
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:03:02 2002 +0000

       - markus@cvs.openbsd.org 2002/11/21 22:22:50
         [dh.c]
         debug->debug2

commit f49dbff61d9729962b91b293ec65d85d810dbd26
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:01:55 2002 +0000

       - markus@cvs.openbsd.org 2002/11/18 16:43:44
         [clientloop.c]
         don't overwrite SIG{INT,QUIT,TERM} handler if set to SIG_IGN;
         e.g. if ssh is used for backup; report Joerg Schilling; ok millert@

commit 44adb8fed9214d209eb8d7d47d5adb053c69f190
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 23 02:00:23 2002 +0000

       - fgsch@cvs.openbsd.org 2002/11/15 10:03:09
         [authfile.c]
         lseek(2) may return -1 when getting the public/private key lenght.
         Simplify the code and check for errors using fstat(2).
    
         Problem reported by Mauricio Sanchez, markus@ ok.

commit ab1c12a11c0c05223405a814d39281b5b0b9b712
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 5 20:59:33 2002 +1100

     - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org

commit 1c9e688548a0f47fcfe41de43625f5b8a7d500dd
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Nov 22 13:29:01 2002 -0800

    [configure.ac] fix STDPATH test for IRIX. First reported by advax@triumf.ca.
    This type of solution tested by <herb@sgi.com>

commit be2396458eb442f095402019609d425fd54cacc1
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Nov 13 15:55:55 2002 -0800

    [configure.ac] remove unused variables no_libsocket and no_libnsl

commit 748fcf9881f67f75b5b5935b1a0f18945e9c0443
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Nov 13 15:50:04 2002 -0800

    [contrib/solaris/opensshd.in] add umask 022 so sshd.pid is not world writable.

commit f5397c081d790a3758e1ee65eca1ab7b3632b0d0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Nov 9 16:11:10 2002 +0000

     - (bal) AIX does not log login attempts for unknown users (bug #432).
       patch by dtucker@zip.com.au

commit 224313cdaedbcad4f3453895fa7d8de66e133f47
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Nov 9 15:59:27 2002 +0000

     - (bal) Update ssh-host-config and minor rewrite of bsd-cygwin_util.c
       ntsec now default if cygwin version beginning w/ version 56.  Patch
       by Corinna Vinschen <vinschen@redhat.com>

commit 007eb912eae0258744043d08e85f99ba3201aeea
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Nov 9 15:54:08 2002 +0000

       - markus@cvs.openbsd.org 2002/11/07 22:35:38
         [scp.c]
         check exit status from ssh, and exit(1) if ssh fails; bug#369;
         binder@arago.de

commit b6df73b06abb12772d816e64f210ad30ebaf54cb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Nov 9 15:52:31 2002 +0000

       - markus@cvs.openbsd.org 2002/11/07 22:08:07
         [readconf.c readconf.h ssh-keysign.8 ssh-keysign.c]
         we cannot use HostbasedAuthentication for enabling ssh-keysign(8),
         because HostbasedAuthentication might be enabled based on the
         target host and ssh-keysign(8) does not know the remote hostname
         and not trust ssh(1) about the hostname, so we add a new option
         EnableSSHKeysign; ok djm@, report from zierke@informatik.uni-hamburg.de

commit c2faa4a504188d8fdf27467fca136f69e451fc27
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Nov 9 15:50:03 2002 +0000

       - markus@cvs.openbsd.org 2002/11/07 16:28:47
         [sshd.c]
         log to stderr if -ie is given, bug #414, prj@po.cwru.edu

commit 8e879cf6918efbf40984bbfb6db0deecc26881f5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Nov 9 15:48:49 2002 +0000

       - markus@cvs.openbsd.org 2002/11/05 20:10:37
         [sftp-client.c]
         typo; GaryF@livevault.com

commit 41ee2b0d77b1d890bc284972aaf5d8935a0c1893
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Nov 9 15:47:47 2002 +0000

       - markus@cvs.openbsd.org 2002/11/05 19:45:20
         [monitor.c]
         handle overflows for size_t larger than u_int; siw@goneko.de, bug #425

commit 9bda7ae4c695a0ff78e570151c067a62c5e44de6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Nov 9 15:46:24 2002 +0000

       - markus@cvs.openbsd.org 2002/11/04 10:09:51
         [packet.c]
         log before send disconnect; ok djm@

commit 485075e8faf48c34c930446dc3f3905465941d56
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Nov 9 15:45:12 2002 +0000

       - markus@cvs.openbsd.org 2002/11/04 10:07:53
         [auth.c]
         don't compare against pw_home if realpath fails for pw_home (seen
         on AFS); ok djm@

commit ee844912c94226a09c95e4140c158d9c4f37a0b5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Nov 9 15:43:23 2002 +0000

       - markus@cvs.openbsd.org 2002/10/23 10:40:16
         [bufaux.c]
         %u for u_int

commit 0cc2a476749e366d54afa842c5cc77d629deed29
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Nov 9 15:41:39 2002 +0000

       - markus@cvs.openbsd.org 2002/10/23 10:32:13
         [packet.c]
         use %u for u_int

commit 0851381bf7d4ce9a16399b216621edf7476ead05
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Nov 9 15:40:34 2002 +0000

       - itojun@cvs.openbsd.org 2002/10/16 14:31:48
         [sftp-common.c]
         64bit pedant.  %llu is "unsigned long long".  markus ok

commit 885929cd315b8e0bde419eab3a09523378972d68
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 21 20:26:16 2002 +1000

    fix changelog

commit 7b3f58cbcd1e30d02292b5574aaa3e2486288ec2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 21 10:50:25 2002 +1000

     - (djm) Bug #317: FreeBSD needs libutil.h for openpty() Report from
       dirk.meyer@dinoex.sub.org

commit 5a5da88c59d30c8a97625def757d20f151bb200c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 21 10:13:35 2002 +1000

     - (djm) Kill ssh-rand-helper children on timeout, patch from
       dtucker@zip.com.au

commit 3e0064781bfd3a0efdd28ee84f34a3807ff2988a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 16 00:24:03 2002 +0000

     - (bal) More advanced strsep test by Darren Tucker <dtucker@zip.com.au>

commit 97e38d866778f1c36486af5f7f1a238c41693d58
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 16 00:13:52 2002 +0000

    20021015
     - (bal) Fix bug id 383 and only call loginrestrict for AIX if not root.

commit 94f628f0abc38aeef6368178f2341d3747a3e5c8
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Oct 15 13:16:55 2002 -0700

    [contrib/caldera/openssh.spec] make ssh-agent setgid nobody

commit dc3c757f577ba1f81df4a65c3fd3dcb79f3bb8c2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Oct 4 23:54:54 2002 +0000

     - (bal) Disable post-authentication Privsep for OSF/1.  It conflicts with
       SIA.

commit 901119beab6622a263d9d0ccf4eb494bd33d3c77
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 4 11:10:04 2002 +1000

     - (djm) Bug #406: s/msg_send/ssh_msg_send/ for Mac OS X 1.2

commit 7e659de6f981aaf1059720e5e198aa652834e414
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 3 12:08:19 2002 +1000

     - (djm) Install ssh-agent setgid nobody in contrib/redhat/openssh.spec

commit 510d51300ed4542950534f1fb5ab11899e98d6d8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 3 11:56:58 2002 +1000

     - (djm) Bump RPM spec version numbers

commit 7156fc7da6b7b7c2f1a92c21fc5fac00fc752b0c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 3 11:55:37 2002 +1000

       - markus@cvs.openbsd.org 2002/10/01 13:24:50
         [version.h]
         OpenSSH 3.5

commit af9de38c4319948b8cf73cc1b18ae8270dba185e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 3 11:54:35 2002 +1000

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2002/10/01 20:34:12
         [ssh-agent.c]
         allow root to access the agent, since there is no protection from root.

commit d8769625fba2c08e9eae81d225bba58427196c5a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 30 12:00:55 2002 +1000

       - stevesk@cvs.openbsd.org 2002/09/27 15:46:21
         [ssh.1]
         clarify compression level protocol 1 only; ok markus@ deraadt@

commit e9264973ad26e4ee2acebf01126e28a712cca2a8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 30 11:59:21 2002 +1000

     - (djm) OpenBSD CVS Sync
       - mickey@cvs.openbsd.org 2002/09/27 10:42:09
         [compat.c compat.h sshd.c]
         add a generic match for a prober, such as sie big brother;
         idea from stevesk@; markus@ ok

commit aeaf2bee192f612bfea644bd1fda2596a7496a04
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 30 11:39:22 2002 +1000

    Avoid unpackages files warning on /usr/share/openssh/Ssh.bin

commit d0875620415fadcd150cada0061c1b099d3f436a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 30 11:09:54 2002 +1000

     Use contrib/ Makefile for building askpass programs

commit e81a65b1aab754ce59b0f37a85b4dbff4be30219
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 30 10:44:40 2002 +1000

    grrr, cut n' paste

commit 50f6123eefd6a76dbbd6c5353f8c0bb22ff9a5a2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 30 10:40:39 2002 +1000

     - (djm) Tidy contrib/, add Makefile for GNOME passphrase dialogs, tweak README

commit cd501ec30b448cb6fda4fb517fa94b69cb97652a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 30 10:34:05 2002 +1000

    tidy, fix typos, reorder

commit d94e549ea8c622c8a75023b649a5d4c051aacf7f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 27 13:25:58 2002 +1000

       - markus@cvs.openbsd.org 2002/09/26 11:38:43
         [auth1.c auth.h auth-krb4.c monitor.c monitor.h monitor_wrap.c]
         [monitor_wrap.h]
         krb4 + privsep; ok dugsong@, deraadt@

commit d27a76de65d557e36420046e44a014d3190f89cb
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 27 13:22:31 2002 +1000

       - markus@cvs.openbsd.org 2002/09/25 15:19:02
         [sshd.c]
         typo; pilot@monkey.org

commit d681d2602c87f7652a84b43f3521c4b06731e844
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 27 13:21:57 2002 +1000

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2002/09/25 11:17:16
         [sshd_config]
         sync LoginGraceTime with default

commit 81ed518b9b888502cc57b23c02c47634ca508748
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Sep 25 17:38:46 2002 -0700

    Cray fixes (bug 367) based on patch from Wendy Palm @ cray.
    This does not include the deattack.c fixes.

commit 164725f40ecda144de706c94778e47dc86ae9257
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 25 23:14:14 2002 +0000

    l) Fix issue where successfull login does not clear failure counts
       in AIX.  Patch by dtucker@zip.com.au ok by djm

commit dcbb6c2dc9569368f6f38a27ef560a7cd748d2ba
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 25 12:20:52 2002 +1000

       - todd@cvs.openbsd.org 2002/09/24 20:59:44
         [sshd.8]
         tweak the example $HOME/.ssh/rc script to not show on any cmdline the
         sensitive data it handles. This fixes bug # 402 as reported by
         kolya@mit.edu (Nickolai Zeldovich).
         ok markus@ and stevesk@

commit ef73f50a1218b3ce0143131fd71c4061a9a4a83e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 25 12:20:17 2002 +1000

       - markus@cvs.openbsd.org 2002/09/24 08:46:04
         [monitor.c]
         only call kerberos code for authctxt->valid

commit 7db40c9e2e457441b1935d425326e507e945c039
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 25 12:19:39 2002 +1000

       - markus@cvs.openbsd.org 2002/09/23 22:11:05
         [monitor.c]
         only call auth_krb5 if kerberos is enabled; ok deraadt@

commit b2f844dc513d31de09ae696092497856a2968d26
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 25 12:19:08 2002 +1000

     - (djm) OpenBSD CVS Sync
       - stevesk@cvs.openbsd.org 2002/09/23 20:46:27
         [canohost.c]
         change get_peer_ipaddr() and get_local_ipaddr() to not return NULL for
         non-sockets; fixes a problem passing NULL to snprintf(). ok markus@

commit 2c961cecb008de61eb0fdd220f406d08a788ee55
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Sep 23 16:54:10 2002 -0700

    [configure.ac] s/return/exit/ patch by dtucker@zip.com.au
       From autoconf guidelines:
       "Test programs should exit, not return, from main, because on some
        systems (old Suns, at least) the argument to return in main is ignored."

commit 6f0a188857a459b743d27045cdb8760c903ad3d3
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 22 01:26:51 2002 +1000

       - stevesk@cvs.openbsd.org 2002/09/20 18:41:29
         [auth.c]
         log illegal user here for missing privsep case (ssh2).
         this is executed in the monitor. ok markus@

commit 16aed055787953630641d7b0aa4c1f6cf3a6269f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 22 01:26:27 2002 +1000

       - stevesk@cvs.openbsd.org 2002/09/19 16:03:15
         [serverloop.c]
         log IP address also; ok markus@

commit 2138d152b23ab6f5f1aa127fc8959688c4fb6ce0
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 22 01:26:00 2002 +1000

       - markus@cvs.openbsd.org 2002/09/19 15:51:23
         [ssh-add.c]
         typo; cd@kalkatraz.de

commit a0e4559d720a25e06911847092356d78be200291
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 22 01:25:35 2002 +1000

     - (djm) OpenBSD CVS Sync
       - stevesk@cvs.openbsd.org 2002/09/19 14:53:14
         [compat.c]

commit 8c4e18a6ec22a09b9082ff74b668685c30a028e7
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 19 12:05:02 2002 +1000

       - djm@cvs.openbsd.org 2002/09/19 01:58:18
         [ssh.c sshconnect.c]
         bugzilla.mindrot.org #223 - ProxyCommands don't exit.
         Patch from dtucker@zip.com.au; ok markus@

commit 9b037b837aea146ab331edea68f39eb377cee3e5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 19 11:54:54 2002 +1000

       - itojun@cvs.openbsd.org 2002/09/17 07:47:02
         [channels.c]
         don't quit while creating X11 listening socket.
         http://mail-index.netbsd.org/current-users/2002/09/16/0005.html
         got from portable.  markus ok

commit 86247e2798f9e8f555f93f0c2c1872a4c13c43f6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 19 11:51:53 2002 +1000

       - stevesk@cvs.openbsd.org 2002/09/16 22:03:13
         [sshd.8]
         reference moduli(5) in FILES /etc/moduli.

commit 101c4a7bc96556d22ccf4c2095086353e4e61ca2
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 19 11:51:21 2002 +1000

       - stevesk@cvs.openbsd.org 2002/09/16 20:12:11
         [sshd_config.5]
         more details on X11Forwarding security issues and threats; ok markus@

commit a6eb2b7f8ebb2eef6f21c4da08ac11a97a38a190
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 19 11:50:48 2002 +1000

       - stevesk@cvs.openbsd.org 2002/09/16 19:55:33
         [session.c]
         log when _PATH_NOLOGIN exists; ok markus@

commit e1383cee9d671906424797c084940b2d382f2813
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 19 11:49:37 2002 +1000

       - stevesk@cvs.openbsd.org 2002/09/13 19:23:09
         [channels.c sshconnect.c sshd.c]
         remove use of SO_LINGER, it should not be needed. error check
         SO_REUSEADDR. fixup comments. ok markus@

commit f37e246f858cdd79be4f4e158b7b04778d1cb7e9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 19 11:47:55 2002 +1000

       - stevesk@cvs.openbsd.org 2002/09/12 19:50:36
         [session.c ssh.1]
         add SSH_CONNECTION and deprecate SSH_CLIENT; bug #384.  ok markus@

commit db30b12d7b41565aa7215c7aa45709cda0b41ab3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 19 11:46:58 2002 +1000

     - (djm) OpenBSD CVS Sync
       - stevesk@cvs.openbsd.org 2002/09/12 19:11:52
         [ssh-agent.c]
         %u for uid print; ok markus@

commit 10f3085137e80c1b01b07a807cc40688738d5db5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 12 14:49:00 2002 +1000

     - (djm) Made GNOME askpass programs return non-zero if cancel button is
       pressed.

commit 1d871767498c4bc31221b74ecf9e253c6df6e1ae
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 12 10:45:32 2002 +1000

    trim from 3.3p1 back (look in CVS for the full changelog)

commit 9b481510bb211f6131303d9ec58788b4e2c3a2c4
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 12 10:43:29 2002 +1000

     - (djm) Sync sys/tree.h with OpenBSD -current. Rename tree.h and
       fake-queue.h to sys-tree.h and sys-queue.h

commit 622accfdb75e5d3705f03bf6b55e37809fdfa777
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 12 10:34:13 2002 +1000

       - djm@cvs.openbsd.org 2002/09/12 00:13:06
         [sftp-int.c]
         zap unused var introduced in last commit

commit 771721fa31623a821d46a82e04b39cdc217a9c3a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 12 10:32:59 2002 +1000

     - (djm) Added getpeereid() replacement. Properly implemented for systems
       with SO_PEERCRED support. Faked for systems which lack it.

commit e1a49817078a22056be87cde74467d52583e9ea1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 12 09:54:25 2002 +1000

       - djm@cvs.openbsd.org 2002/09/11 22:41:50
         [sftp.1 sftp-client.c sftp-client.h sftp-common.c sftp-common.h]
         [sftp-glob.c sftp-glob.h sftp-int.c sftp-server.c]
         support for short/long listings and globbing in "ls"; ok markus@

commit 789e95dbe931bad60cb5f91d995470f433f4e02b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 12 09:52:46 2002 +1000

       - stevesk@cvs.openbsd.org 2002/09/11 18:27:26
         [authfd.c authfd.h ssh.c]
         don't connect to agent to test for presence if we've previously
         connected; ok markus@

commit b5fdfaae13daa5340725ab9418943f1da3d9f7e8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 12 09:52:03 2002 +1000

       - stevesk@cvs.openbsd.org 2002/09/11 17:55:03
         [ssh.1]
         add agent and X11 forwarding warning text from ssh_config.5; ok markus@

commit 538f1819d8fb22c7e3b3a5ee99c406f296c86335
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 12 09:51:10 2002 +1000

       - markus@cvs.openbsd.org 2002/09/10 20:24:47
         [ssh-agent.c]
         check the euid of the connecting process with getpeereid(2);
         ok provos deraadt stevesk

commit a10f56151b24ce677c2c93440d723597410229d5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 12 09:49:15 2002 +1000

       - markus@cvs.openbsd.org 2002/09/09 14:54:15
         [channels.c kex.h key.c monitor.c monitor_wrap.c radix.c uuencode.c]
         signed vs unsigned from -pedantic; ok henning@

commit 25162f2518f72035b50b254bfeb5b89d018223a6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 12 09:47:29 2002 +1000

       - itojun@cvs.openbsd.org 2002/09/09 06:48:06
         [auth1.c auth.h auth-krb5.c monitor.c monitor.h]
         [monitor_wrap.c monitor_wrap.h]
         kerberos support for privsep.  confirmed to work by lha@stacken.kth.se
         patch from markus

commit 4d53d39b071ebc2a0c6f1948b7c7630ab0021a73
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 12 09:43:56 2002 +1000

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2002/09/08 20:24:08
         [hostfile.h]
         no comma at end of enumerator list

commit 71eb0c1550ec6ad10d29779df7a7f97c44000e3a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 11 10:29:11 2002 +1000

     - (djm) Sync openbsd-compat with OpenBSD -current

commit c34e03e4711cabffae3504bcfdac26b67250c45d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 10 22:26:17 2002 +1000

     - (djm) Bug #138: Make protocol 1 blowfish work with old OpenSSL.
       Patch from Robert Halubek <rob@adso.com.pl>

commit e9994cb4d77d36f54af146a9ca0ea4db03b861b6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 10 21:43:53 2002 +1000

     - (djm) Bug #365: Read /.ssh/environment properly under CygWin.
       Patch from Mark Bradshaw <bradshaw@staff.crosswalk.com>

commit 005d4560ed000be8a667f876967348a99a7a8897
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 5 16:53:20 2002 +1000

     - (djm) Add support for building gtk2 password requestor from Redhat beta

commit 44d5b60336e2233813083e254a9ca751b7f3c172
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 5 16:46:24 2002 +1000

     - (djm) Add gnome-ssh-askpass2.c (gtk2) by merge with patch from
        Nalin Dahyabhai <nalin@redhat.com>

commit 539983800df7924a3c43e0c06b8ff2817efa2ce1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 5 16:32:02 2002 +1000

     - (djm) Merge openssh-TODO.patch from Redhat (null) beta

commit c13486300dea3ebcdd73d23f2f32225e4d14e37c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 5 14:35:14 2002 +1000

     - (djm) OpenBSD CVS Sync
       - stevesk@cvs.openbsd.org 2002/09/04 18:52:42
         [servconf.c sshd.8 sshd_config.5]
         default LoginGraceTime to 2m; 1m may be too short for slow systems.
         ok markus@

commit fc93d4bd31788a89341991dd500f40e6ed50cd4e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 23:26:29 2002 +1000

     - (djm) Patch from itojun@ for Darwin OS: test getaddrinfo, reorder libcrypt

commit 6b09792a55a787860e6a4f45f164234bcfc45bae
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 17:19:04 2002 +1000

     - (djm) Fix Redhat RPM build dependancy test

commit 05913badf373af1142b899d3a0c5633eefb265c4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:51:03 2002 +1000

       - stevesk@cvs.openbsd.org 2002/08/29 22:54:10
         [ssh_config.5 sshd_config.5]
         state XAuthLocation is a full pathname

commit 50b9a60082171c12deed0d52f47c03bdc75d8cb4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:50:06 2002 +1000

       - stevesk@cvs.openbsd.org 2002/08/29 19:49:42
         [ssh.c]
         shrink initial privilege bracket for setuid case; ok markus@

commit 9b1dacdf2cc18aa150bc2a293e7180db79103f9a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:47:35 2002 +1000

       - stevesk@cvs.openbsd.org 2002/08/29 16:09:02
         [ssh_config.5]
         more on UsePrivilegedPort and setuid root; ok markus@

commit 147bba3453ab94de72ac9f76bc4deabd1c24fd2e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:46:06 2002 +1000

       - stevesk@cvs.openbsd.org 2002/08/29 16:02:54
         [ssh.1 ssh.c]
         deprecate -P as UsePrivilegedPort defaults to no now; ok markus@

commit ebc230662977241a9fd9c68034de849772d39438
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:45:09 2002 +1000

       - stevesk@cvs.openbsd.org 2002/08/29 15:57:25
         [monitor.c session.c sshlogin.c sshlogin.h]
         pass addrlen with sockaddr *; from Hajimu UMEMOTO <ume@FreeBSD.org>
         NOTE: there are also p-specific parts to this patch. ok markus@

commit af65304a3c99a9a68d507ce0aefd2e7983eb396b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:40:37 2002 +1000

       - stevesk@cvs.openbsd.org 2002/08/27 17:18:40
         [ssh_config.5]
         some warning text for ForwardAgent and ForwardX11; ok markus@

commit f7c2391d83ba859a4581c3ce52804e6f61fd6adb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:39:48 2002 +1000

       - stevesk@cvs.openbsd.org 2002/08/27 17:13:56
         [ssh-rsa.c]
         RSA_public_decrypt() returns -1 on error so len must be signed;
         ok markus@

commit 5a80bba86f60c2ba8447c764ad2fd4e6207b544a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:39:02 2002 +1000

       - markus@cvs.openbsd.org 2002/08/22 21:45:41
         [session.c]
         send signal name (not signal number) in "exit-signal" message; noticed
         by galb@vandyke.com

commit de6f2de8ad528cd8cdfb4b4dc5de9e7ba086c957
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:37:26 2002 +1000

       - markus@cvs.openbsd.org 2002/08/22 21:33:58
         [auth1.c auth2.c]
         auth_root_allowed() is handled by the monitor in the privsep case,
         so skip this for use_privsep, ok stevesk@, fixes bugzilla #387/325

commit 061d5b144f7aaa9ce86838d437790b8e3a46050c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:33:31 2002 +1000

       - stevesk@cvs.openbsd.org 2002/08/22 20:57:19
         [ssh-agent.c]
         shutdown(SHUT_RDWR) not needed before close here; ok markus@

commit 066928648b11cc1ee02aca138853f17b3b6cf2f6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:32:10 2002 +1000

       - stevesk@cvs.openbsd.org 2002/08/22 19:38:42
         [clientloop.c]
         format with current EscapeChar; bugzilla #388 from wknox@mitre.org.
         ok markus@

commit 58f3486c74aec48238501002d03839540fde3a61
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:31:21 2002 +1000

       - stevesk@cvs.openbsd.org 2002/08/22 19:27:53
         [ssh-agent.c]
         use common close function; ok markus@

commit 4efdfff6ba324cb71617b4bffdc8fa164a7749e0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:28:18 2002 +1000

       - stevesk@cvs.openbsd.org 2002/08/21 20:10:28
         [ssh-agent.c]
         raise listen backlog; ok markus@

commit f771ab75f0a275e315857dfcee2a5cf284684907
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:25:52 2002 +1000

       - stevesk@cvs.openbsd.org 2002/08/21 19:38:06
         [servconf.c sshd.8 sshd_config sshd_config.5]
         change LoginGraceTime default to 1 minute; ok mouring@ markus@

commit b83df8d50531611cbd090d0d8f24789ea21386b1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:24:55 2002 +1000

       - espie@cvs.openbsd.org 2002/08/21 11:20:59
         [sshd.8]
         `RSA' updated to refer to `public key', where it matters.
         okay markus@

commit 6cffb9a8cdc628d5310550265ebd41a4dab0a822
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 4 16:20:26 2002 +1000

       - markus@cvs.openbsd.org 2002/08/12 10:46:35
         [ssh-agent.c]
         make ssh-agent setgid, disallow ptrace.
         (note: change not yet made in Makefile)

commit 3962119c8a07699ef082ef3839b6408135dfc33b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Aug 21 02:54:11 2002 +0000

     - (bal) [defines.h] Some platforms don't have SIZE_T_MAX.  So assign
       it to ULONG_MAX.

commit 479b476af623835b551ace88463665e6be7c8873
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Aug 20 19:04:51 2002 +0000

       - stevesk@cvs.openbsd.org 2002/08/17 23:55:01
         [ssh_config.5]
         ordered list here

commit 3541f18e10fd43aacb04261991c5ffa4819d53c6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Aug 20 19:03:20 2002 +0000

       - stevesk@cvs.openbsd.org 2002/08/17 23:07:14
         [ssh.1]
         ForwardAgent has defaulted to no for over 2 years; be more clear here.

commit bd9bf38b00f14098f51b965ba72a4e8fe5877607
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Aug 20 18:54:20 2002 +0000

       - stevesk@cvs.openbsd.org 2002/08/12 17:30:35
         [ssh.1 sshd.8 sshd_config.5]
         more PermitUserEnvironment; ok markus@

commit 15b6120e633fb1d66fbcbac3d5c7352d79ddbc20
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Aug 20 18:44:24 2002 +0000

       - stevesk@cvs.openbsd.org 2002/08/09 17:41:12
         [sshd_config.5]
         proxy vs. fake display

commit 1f8cf4f4fbb159830cf9f5f7925d053bb7dc920b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Aug 20 18:43:27 2002 +0000

       - stevesk@cvs.openbsd.org 2002/08/09 17:21:42
         [sshd_config.5]
         use Op for mdoc conformance; from esr@golux.thyrsus.com
         ok aaron@

commit d4ee3497cae7f5144cc570e15d67eaba2e1cdf2a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Aug 20 18:42:13 2002 +0000

       - stevesk@cvs.openbsd.org 2002/08/08 23:54:52
         [auth.c]
         typo in comment

commit e143f61b6f8875fd91efbfa609a0ef57c55af087
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Aug 20 18:41:15 2002 +0000

       - aaron@cvs.openbsd.org 2002/08/08 13:50:23
         [sshconnect1.c]
         Use & to test if bits are set, not &&; markus@ ok.

commit 0deb5d958a6bd93fc3a021adb946e19cde4fd4bd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Aug 20 18:40:03 2002 +0000

       - markus@cvs.openbsd.org 2002/08/02 22:20:30
         [ssh-rsa.c]
         replace RSA_verify with our own version and avoid the OpenSSL ASN.1 parser
         for authentication; ok deraadt/djm

commit 0e50d846b31da4c96959b8a386ccfb938bf4387f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Aug 20 18:39:14 2002 +0000

       - markus@cvs.openbsd.org 2002/08/02 21:23:41
         [ssh-rsa.c]
         diff is u_int (2x); ok deraadt/provos

commit dc7adf2670bcbb83bf4e95f4f9d6c544efe182cb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Aug 20 18:38:02 2002 +0000

       - marc@cvs.openbsd.org 2002/08/02 16:00:07
         [ssh.1 sshd.8]
         note that .ssh/environment is only read when
         allowed (PermitUserEnvironment in sshd_config).
         OK markus@

commit 0a4f7542da24b870c3d18bedfcbd4c87aa7ebcd3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Aug 20 18:36:25 2002 +0000

       - millert@cvs.openbsd.org 2002/08/02 14:43:15
         [monitor.c monitor_mm.c]
         Change mm_zalloc() sanity checks to be more in line with what
         we do in calloc() and add a check to monitor_mm.c.
         OK provos@ and markus@

commit d730b780716d3955066f9fcc89aa377b31079cff
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Aug 13 18:52:10 2002 -0700

    [configure.ac] Display OpenSSL header/library version.
    Patch by dtucker@zip.com.au

commit 5d860f02ca352cd8e51fe266cc2e1b5d58704964
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Aug 1 01:28:38 2002 +0000

       - markus@cvs.openbsd.org 2002/07/30 17:03:55
         [auth-options.c servconf.c servconf.h session.c sshd_config sshd_config.5]
         add PermitUserEnvironment (off by default!); from dot@dotat.at;
         ok provos, deraadt

commit 4b99be899cc47064c13d8beabc32fe5c3a8f94b5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Aug 1 01:26:29 2002 +0000

       - markus@cvs.openbsd.org 2002/07/29 18:57:30
         [sshconnect.c]
         print file:line

commit 8d631e851534b94585f8e9dcdf21ae0367752198
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Aug 1 01:25:00 2002 +0000

       - mouring@cvs.openbsd.org 2002/07/25 01:16:59
         [sftp.c]
         FallBackToRsh does not exist anywhere else.  Remove it from here.
         OK deraadt.

commit 3ed6640532ea53bc37182262141c9e917a448025
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Aug 1 01:21:56 2002 +0000

       - markus@cvs.openbsd.org 2002/07/24 16:11:18
         [hostfile.c hostfile.h sshconnect.c]
         print out all known keys for a host if we get a unknown host key,
         see discussion at http://marc.theaimsgroup.com/?t=101069210100016&r=1&w=4
    
         the ssharp mitm tool attacks users in a similar way, so i'd like to
         pointed out again:
            A MITM attack is always possible if the ssh client prints:
            The authenticity of host 'bla' can't be established.
         (protocol version 2 with pubkey authentication allows you to detect
         MITM attacks)

commit 18d2b5d399a6ee97c65a058c14054fd2da2b891a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 30 19:32:07 2002 +0000

     - (bal) [uidswap.c] SCO compile correction by gert@greenie.muc.de

commit 4bdb547ff4dd4625831dea1fdb6c479703ddf48e
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jul 28 20:42:23 2002 +0000

     - (stevesk) [ssh-rand-helper.c] RAND_bytes() and SHA1_Final() unsigned
       char arg.

commit e7dbdf7ff82fb11d3ebc2863a5896106dd63880e
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jul 28 20:31:18 2002 +0000

     - (stevesk) [CREDITS] solar

commit 6a998ebfa96c93994e9d98cd07f228de95d71a67
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jul 28 20:24:07 2002 +0000

     - (stevesk) [auth-pam.c] should use PAM_MSG_MEMBER(); from solar

commit a7609f548f2e0be63abe740d7dbdd7d8a4a17eeb
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 25 14:40:22 2002 +1000

     - (djm) Latest config.guess and config.sub from ftp://ftp.gnu.org/gnu/config/

commit 6d8d78827eeec670932247ebfde7bfe13adf7540
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 25 14:36:24 2002 +1000

     - (djm) Remove some cruft from INSTALL

commit 1fa330cf35028a45bff8f977ee2935a3a78b0502
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 23 21:29:49 2002 +0000

       - stevesk@cvs.openbsd.org 2002/07/15 17:15:31
         [uidswap.c]
         little more debugging; ok markus@

commit 41daec7538e7887dc540fdd56afbd21e3c42133e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 23 21:15:13 2002 +0000

       - stevesk@cvs.openbsd.org 2002/07/23 16:03:10
         [sshd.c]
         utmp_len is unsigned; display error consistent with other options.
         ok markus@

commit 7cea16bad574cbe60d22204df2e215ab1c8ce9e9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 23 21:13:40 2002 +0000

       - stevesk@cvs.openbsd.org 2002/07/22 17:32:56
         [monitor.c]
         u_int here; ok provos@

commit b9051ec9a49473b81bcd50868e3367186d919fb2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 23 21:11:09 2002 +0000

       - markus@cvs.openbsd.org 2002/07/22 11:03:06
         [session.c]
         fallback to _PATH_STDPATH on setusercontext+LOGIN_SETPATH errors;

commit 3cc4450d54f7f1dab1751ba79e525a24f4f3f1b0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 23 21:07:45 2002 +0000

       - stevesk@cvs.openbsd.org 2002/07/21 18:34:43
         [auth-options.h]
         remove invalid comment

commit 218a07dfb42b1be4d0bf6aaea15cca2b0247d277
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 23 21:06:45 2002 +0000

       - stevesk@cvs.openbsd.org 2002/07/21 18:32:20
         [auth-options.c]
         unneeded includes

commit 82ec9836b22dc29d127b9a6adb6bd88124568a11
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 23 21:05:17 2002 +0000

     - (bal) sync ID w/ ssh-agent.c

commit ee8d52d008c03e5aa19e1bd9b0baaf5faa6cfbb8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 23 21:03:02 2002 +0000

       - stevesk@cvs.openbsd.org 2002/07/19 17:42:40
         [ssh.c]
         display a warning from ssh when XAuthLocation does not exist or xauth
         returned no authentication data. ok markus@

commit 264ee307a8fd171dbb44121ec05b83f4143408cf
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 23 21:01:56 2002 +0000

       - markus@cvs.openbsd.org 2002/07/19 15:43:33
         [log.c log.h session.c sshd.c]
         remove fatal cleanups after fork; based on discussions with and code
         from solar.

commit 6f52b3e39958dde417eacd9ca8fb513a3ea5b769
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 23 21:00:17 2002 +0000

     - (bal) [bsd-cray.c bsd-cray.h] Part 2 of Cray merger.

commit 6fa740ba84f811cfcb12fcd94dffdd4c28cdf29e
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Jul 23 00:51:53 2002 +0000

    - (stevesk) [auth-pam.c] typo in comment

commit 38b050a0f526d1b7982deb9d19f59c95f7b91b22
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Jul 23 00:44:07 2002 +0000

     - (stevesk) [auth-pam.[ch] session.c] pam_getenvlist() must be
       freed by the caller; add free_pam_environment() and use it.

commit 446d886fa5b295b03031de840286dbe4b7d904a3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 23 00:03:33 2002 +0000

     - (bal) [monitor_mm.c openbsd-compat/xmmap.h] Move xmmap() defines
       into it's own header.

commit 762104ede03f5ed71dadc77466aa1948531d8704
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 23 00:00:05 2002 +0000

     - (bal) [configure.ac]  Missing ;; from cray patch.

commit 232ccf775459210ee79873d4411328bff6b8d66a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jul 22 23:34:25 2002 +0000

     - (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync
       with Cray (mostly #ifdef renaming).  Patch by wendyp@cray.com.

commit 066e1ab8a36123a910e4dc7b3e2eb15890234a60
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Jul 22 16:20:29 2002 +0000

     - (stevesk) [xmmap.c] missing prototype for fatal()

commit beb5f3304b74fe04a1fde815fe70ecf2f30e95b1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jul 22 15:28:53 2002 +0000

     - (bal) AIX tty data limiting patch fix by leigh@solinno.co.uk

commit 287077eaf2db7115a08f0fa9bd811ddda6119209
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jul 21 23:59:39 2002 +0000

     - (stevesk) [auth-pam.[ch] ssh.h] move SSHD_PAM_SERVICE to auth-pam.h

commit 21e04eb2be1e6a621148b29ac6f57f2677dedc21
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jul 21 23:20:07 2002 +0000

     - (stevesk) [auth-pam.h] unneeded include

commit 7ba4970498e029dc277d87eccd2f0ca79f64fb41
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jul 21 23:16:00 2002 +0000

     - (stevesk) [auth-pam.h] license

commit 3429a1bf6063f2c8c3ed2429da6455f1b2c1ccc7
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jul 21 22:49:47 2002 +0000

     - (stevesk) [auth-pam.c] cast to avoid initialization type mismatch
       warning on pam_conv struct conversation function.

commit 63007d42ee68157abc5a31a5003dae4448b03f7b
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jul 21 17:57:01 2002 +0000

     - (stevesk) [auth-pam.c] merge rest of solar's PAM patch;
       PAM_NEW_AUTHTOK_REQD remains in #if 0 for now.

commit 6cdecd0892b9b9a7a8e3e3917272d04727eb82fa
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jul 21 17:26:54 2002 +0000

     - (stevesk) [auth-pam.c] merge cosmetic changes from solar's
       openssh-3.4p1-owl-password-changing.diff

commit 3a8819102c2f77a93706bd1fb5e4b500bc7bf506
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Jul 20 19:05:40 2002 +0000

     - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng().

commit f028f1e460f60b233b99e73ad9aa88eabdc5dafd
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Jul 19 12:41:10 2002 -0700

    [configure.ac]  test for libxnet on HP. Patch by dtucker@zip.com.au

commit f1a1001f0ea4ffee74baf733d390f2fd1b98fa51
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Jul 19 11:57:57 2002 -0700

     [contrib/solaris/buildpkg.sh] create privsep user/group if needed.
     Patch by dtucker@zip.com.au

commit eae876e8ae41aedb992f26317f0262464bbaa5f5
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jul 18 11:49:32 2002 -0700

     [includes.h] Bug 267 add stdint.h

commit 907881ec8e6077a57c9b9f01c8a30db13cf52b69
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jul 18 11:44:50 2002 -0700

     [configure.ac] Bug 267 rework int64_t test.

commit 76645849d3c73b974a44393e9b0bbec46e0ab4c4
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jul 18 11:34:29 2002 -0700

     [monitor_mm.c] add missing declaration for xmmap(). Reported
     by ayamura@ayamura.org

commit b8b23047f84094815d93febb41454c34666f9dd0
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jul 18 09:31:51 2002 -0700

     [defines.h] Bug 313 patch by dirk.meyer@dinoex.sub.org

commit e22be3b11ea1e5cb349665a3cbc57bc564f39ad7
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jul 17 19:20:07 2002 -0700

     [configure.ac] change how we do paths in AC_PATH_PROGS tests
     for autoconf 2.53. Based on a patch by jrj@purdue.edu

commit 2faabf3d798a8bab6d6b6a13c40e4c0d51bbf826
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 18 01:04:50 2002 +0000

     - (bal) aixbff package updated by dtucker@zip.com.au

commit ffaf4453712ac7b47b0157ba2c7201e77a54c369
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jul 16 14:24:38 2002 -0700

     [contrib/solaris/opensshd.in] Only kill sshd if .pid file found

commit 104c3feb6999556db85283a8ba7ac1f8c38b5609
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jul 15 18:49:20 2002 +0000

     - (bal) Privsep user creation support in Solaris buildpkg.sh by
       dtucker@zip.com.au

commit 938b8285661f56181405b8c1637b31bf7b618de0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jul 15 17:58:34 2002 +0000

     - (bal) Remove unused tty defined in do_setusercontext() pointed out by
       dtucker@zip.com.au plus a a more KNF since I am near it.

commit c491b0def1ac7b468bc6ce3ceffc3493b102ca1d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jul 15 17:52:49 2002 +0000

       - markus@cvs.openbsd.org 2002/07/12 15:50:17
         [cipher.c]
         EVP_CIPH_CUSTOM_IV for our own rijndael

commit 728aa7e18c378ce990aa3419917c665181904ba8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jul 15 17:48:11 2002 +0000

       - itojun@cvs.openbsd.org 2002/07/12 13:29:09
         [sshconnect.c]
         print connect failure during debugging mode.

commit 370e0bac16cd71417e45af489a60b1621e20f041
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jul 14 15:50:51 2002 -0700

     [loginrec.c] Bug 348: add missing found = 1; to wtmpx_islogin()
     report by rodney@bond.net

commit cdb82946b67dc29c6ed49fbcc7fde8c570642c6c
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jul 14 15:33:20 2002 -0700

     [loginrec.c] Bug 347: Fix typo (WTMPX_FILE) report by rodney@bond.net

commit a091159884e4e368747883f88ab3a68b8c7e1907
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jul 14 14:43:57 2002 -0700

     [ssh_prng_cmds.in] Bug 323 arp -n flag doesn't exist under Solaris.
     report by chris@by-design.net

commit 40017b0e7aa236ca1144563dea986a95684f1599
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jul 14 13:36:49 2002 -0700

     (bal/tim) [acconfig.h configure.ac monitor_mm.c servconf.c
      openbsd-compat/Makefile.in] support compression on platforms that
      have no/broken MAP_ANON. Moved code to openbsd-compat/xmmap.c
      Based on patch from nalin@redhat.com of code extracted from Owl's package

commit 952101952f204e5a85698a01469612d6518fc99a
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jul 14 10:02:20 2002 -0700

    [Makefile.in] replace "id sshd" with "sshd -t"

commit 4796a291f1d1ce781f6f840ff1fa7f28d19963b1
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Jul 12 18:11:24 2002 -0700

     [configure.ac] remove unused filepriv line

commit 1363b3c9870a08e55d228b166d66d8f3b8f45005
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Jul 12 09:04:06 2002 -0700

    [Makefile.in] quiet down install-files: and check-user:

commit 6f893880ccc7b489e15493ae9e2d18507f6bd78a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 11 04:01:29 2002 +0000

       - deraadt@cvs.openbsd.org 2002/07/10 17:53:54
         [rijndael.c]
         use right sizeof in memcpy; markus ok

commit a6cd75c49ed90186bb400c08b8878c2c711b9f58
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 11 04:00:19 2002 +0000

       - itojun@cvs.openbsd.org 2002/07/10 10:28:15
         [sshconnect.c]
         bark if all connection attempt fails.

commit 9c44554a41cbefdd4898511607d997072aed2811
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 11 03:59:18 2002 +0000

       - stevesk@cvs.openbsd.org 2002/07/09 17:46:25
         [sshd_config.5]
         clarify no preference ordering in protocol list; ok markus@

commit ba8df7d76d980e3c3cb3a0af79a87312cfaf5840
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 11 03:58:11 2002 +0000

       - itojun@cvs.openbsd.org 2002/07/09 12:04:02
         [sshconnect.c]
         ed static function (less warnings)

commit e982773d2aa4f5fdc5e9f42838fc3d06c1f12d0b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 11 03:56:46 2002 +0000

       - itojun@cvs.openbsd.org 2002/07/09 11:56:27
         [canohost.c]
         suppress log on reverse lookup failiure, as there's no real value in
         doing so.
         markus ok

commit efee05958cc5ef649fde971a307b70eee2941871
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 11 03:54:43 2002 +0000

       - itojun@cvs.openbsd.org 2002/07/09 11:56:50
         [sshconnect.c]
         silently try next address on connect(2).  markus ok

commit 6827395b07f8a74161ba12fa82b0a7617cad27ba
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jul 10 07:40:11 2002 -0700

    [contrib/cygwin/ssh-host-config] explicitely sets the permissions
    on /var/empty to 755    Patch by vinschen@redhat.com

commit 99a4e14fe0615c0f8a404aec0db42feb98451eb9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 9 14:06:40 2002 +0000

     - (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms
       lacking that concept can share it. Patch by vinschen@redhat.com

commit cbb9066d2d697e51f5e6df6681827f17756d154a
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Jul 8 19:17:10 2002 -0700

    [configure.ac] fix libc89 utimes test. Mention default path for
       --with-privsep-path=

commit 2d0bf3dcfdab65d1627b9612b5558a38a0eb000d
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Jul 8 19:10:05 2002 -0700

    [Makefile.in] workaround for broken pakadd on some systems.
    With "ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin" you wild end up with
       lrwxrwxrwx    1 root     sys            4 Jul  8 18:43 slogin -> /ssh
    after the package was installed.

commit 88177245cb5c1b16a2fa6ef5f151cc8b963112ef
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Jul 8 19:02:10 2002 -0700

    [openssh/contrib/solaris/buildpkg.sh] add PKG_INSTALL_ROOT to
    work in a jumpstart environment. patch by kbrint@rufus.net

commit 100d586df2b5a5aadfc52cca5bb29682eac1b9b6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jul 8 21:09:41 2002 +0000

     - (bal) Correction to utimes() again.

commit 5c98db50bfa18767693421aa0beaed8ac733f19f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 7 22:25:29 2002 +0000

     - (bal) Minor KNF on ssh-keyscan.c
    
    This is really from Theo's patch.  I missed it by looking at the wrong
    function call.

commit 6a9fbc96c09ead1355743ecf77eef0421d25c592
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 7 22:19:13 2002 +0000

       - stevesk@cvs.openbsd.org 2002/07/06 17:47:58
         [ssh-keyscan.c]
         unused variable

commit 965710f66e05f970a107a7636bc7a6b437736d0d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 7 22:17:22 2002 +0000

       - deraadt@cvs.openbsd.org 2002/07/06 01:01:26
         [ssh-keyscan.c]
         KNF, realloc fix, and clean usage

commit 8e8ef2a3ffb03d48bb9d6b894152497810f19044
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 7 22:14:55 2002 +0000

       - deraadt@cvs.openbsd.org 2002/07/06 01:00:49
         [log.c]
         KNF

commit 2bf759cba5f24c09e450bb8fcabfd9e6e32c137d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 7 22:13:31 2002 +0000

       - markus@cvs.openbsd.org 2002/07/04 10:41:47
         [key.c monitor_wrap.c ssh-dss.c ssh-rsa.c]
         don't allocate, copy, and discard if there is not interested in the data;
         ok deraadt@

commit 8b2eecdf9f6769520e2601d5de58991d5810873d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 7 22:11:51 2002 +0000

       - deraadt@cvs.openbsd.org 2002/07/04 08:12:15
         [channels.c packet.c]
         blah blah minor nothing as i read and re-read and re-read...

commit c51b924a80a17d6cf47c25c2c118385d4ecc87c8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 7 22:10:15 2002 +0000

       - deraadt@cvs.openbsd.org 2002/07/04 04:15:33
         [key.c monitor_wrap.c sftp-glob.c ssh-dss.c ssh-rsa.c]
         patch memory leaks; grendel@zeitbombe.org

commit 8abe736dd7a27e4c2a42351287bacfd80ec42a7c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 7 22:07:10 2002 +0000

     - (bal) [realpath.c] Updated with OpenBSD tree.

commit e475a3cf3b18ce1c22529fdf2d531beee5ea8f25
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jul 7 14:07:46 2002 -0700

    [contrib/cygwin/ssh-host-config] sshd account creation fixes
    patch from vinschen@redhat.com

commit 9dd30817ef4314bd2fdc688c0d40fd6ca7208acc
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jul 7 13:43:36 2002 -0700

    [acconfig.h configure.ac sshd.c] s/BROKEN_FD_PASSING/DISABLE_FD_PASSING/

commit cc25206d31a783c9c0834f59904d97bc1cba3f07
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jul 7 13:30:45 2002 -0700

    [Makefile.in] use umask instead of chmod on $(PRIVSEP_PATH)

commit 024f08f3f68060d65cdfe083fe30ef53524c56c0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 7 02:17:36 2002 +0000

    Added author to ports-aix.[ch].

commit b66e292912933f1de8e5ca22df705e5d5dae6b00
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Jul 5 16:22:32 2002 -0700

    [contrib/cygwin/ssh-host-config] double slash corrction
    from vinschen@redhat.com

commit e958ed3624deeca53519b8a870e6d545d6a8fd3d
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Jul 5 07:12:33 2002 -0700

     [configure.ac] AIX 4.2.1 has authenticate() in libs.
     Reported by Darren Tucker <dtucker@zip.com.au>

commit d00a1a1a03e03a5abcd5a9fcfaa6dbcef8cdc56c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 19:33:49 2002 +0000

     - (bal) One too many nulls in ports-aix.c

commit 604de560099cb57534a90d4ff451f9ab3f221ee7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 18:20:51 2002 +0000

     - (bal) glob.c defines TILDE and AIX also defines it.  #undef it first.
       bug #265

commit 92ea0eadbe247a6b5c1893ae2a94358cca3be994
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 18:11:09 2002 +0000

     - (bal) Limit data to TTY for AIX only (Newer versions can't handle the
       faster data rate)  Bug #124

commit 51b2488aad8b5387a8107e90b2f97dbe27ca850a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 03:08:40 2002 +0000

     - (bal) Clean up aix_usrinfo().  Ignore TTY= period I guess.

commit ee3a8e4abc63a525cb137bb9a233feabed184c8f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 03:07:15 2002 +0000

     - (bal) Missed Makefile.in change.  keysign needs readconf.o

commit e06eb68226061e1b6e369f4aebe3b3c07ce1f2c7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:27:21 2002 +0000

     - (bal) Failed password attempts don't increment counter on AIX. Bug #145

commit 5d35a2f5828cfb0a8579228d80e8bec60c8f8c64
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:19:40 2002 +0000

       - markus@cvs.openbsd.org 2002/07/03 14:21:05
         [ssh-keysign.8 ssh-keysign.c ssh.c ssh_config]
         re-enable ssh-keysign's sbit, but make ssh-keysign read
         /etc/ssh/ssh_config and exit if HostbasedAuthentication is disabled
         globally. based on discussions with deraadt, itojun and sommerfeld;
         ok itojun@

commit 43ce2c86a89a512e3c9361b40155db8bbef3f441
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:17:33 2002 +0000

       - markus@cvs.openbsd.org 2002/07/03 09:55:38
         [ssh-keysign.c]
         use RSA_blinding_on() for rsa hostkeys (suggested by Bill Sommerfeld)
         in order to avoid a possible Kocher timing attack pointed out by Charles
         Hannum; ok provos@

commit 343010ad503ee040528d95b10d6cc4d0bde6c303
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:16:25 2002 +0000

       - markus@cvs.openbsd.org 2002/07/01 19:48:46
         [sshconnect2.c]
         for compression=yes, we fallback to no-compression if the server does
         not support compression, vice versa for compression=no. ok mouring@

commit fd2aacedabade08a5a3af613a6aca2c299776dd8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:15:22 2002 +0000

       - deraadt@cvs.openbsd.org 2002/07/01 16:15:25
         [msg.c]
         %u

commit a962c2fb35b909a361b3ce0f9eaa670b72e15ece
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:14:17 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/30 21:59:45
         [auth-bsdauth.c auth-skey.c auth2-chall.c clientloop.c key.c
          monitor_wrap.c monitor_wrap.h scard.h session.h sftp-glob.c ssh.c
          sshconnect2.c sshd.c]
         minor KNF

commit 5a9d0eaba699968ae29bf560e4546d09edcb440d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:12:53 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/30 21:54:16
         [auth2.c session.c sshd.c]
         lint asks that we use names that do not overlap

commit 810af968b8c36cb5fb960483d051ba0c7805296a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:11:40 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/28 23:05:06
         [sshd.c]
         gidset[2] -> gidset[1]; markus ok

commit fbbfa8422f8317bcac829e1673dced62f49d59ba
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:10:34 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/28 10:08:25
         [sshd.c]
         range check -u option at invocation

commit b1bdc5a6adae8f5e4d4a4f67c5aba488b5993d5e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:09:26 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/28 01:50:37
         [monitor_wrap.c]
         use ssize_t

commit a79616278e15a61eb899bc5b582094c063214238
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:08:23 2002 +0000

       - millert@cvs.openbsd.org 2002/06/28 01:49:31
         [monitor_mm.c]
         tree(3) wants an int return value for its compare functions and
         the difference between two pointers is not an int.  Just do the
         safest thing and store the result in a long and then return 0,
         -1, or 1 based on that result.

commit edd098b1967fa267d4246a1780d49b18a6c58560
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:07:13 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/27 19:49:08
         [ssh-keyscan.c]
         use convtime(); ok markus@

commit eec16fcb2787921144474bfad70a11908b103e84
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:06:15 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/27 10:35:47
         [auth2-none.c monitor.c sftp-client.c]
         use xfree()

commit 35a2cb9b41c2828ad2585b01689281bb22e29596
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:05:06 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/27 09:08:00
         [monitor.c]
         improve mm_zalloc check; markus ok

commit 04f9af7dfcac6a2230bbb574ea8ddaa5e39baa04
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jul 4 00:03:56 2002 +0000

       - markus@cvs.openbsd.org 2002/06/27 08:49:44
         [dh.c ssh-keyscan.c sshconnect.c]
         more checks for NULL pointers; from grendel@zeitbombe.org; ok deraadt@

commit 723e29aa20cdd59c12ff02c4a7d7d7f45bc07a08
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 3 23:50:00 2002 +0000

     - (bal) minor correction to utimes() replacement.  Patch by
       onoe@sm.sony.co.jp

commit 6dbf3001ece375d603b50d7e4b49c72ba80f5930
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 3 23:33:19 2002 +0000

     - (bal) Updated contrib/cygwin/  patch by vinschen@redhat.com

commit 23fe57c51caeacf58c24cc4efc8d701db3cb0fdc
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 2 17:08:23 2002 +1000

     - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc &
       friends consistently. Spotted by Solar Designer <solar@openwall.com>

commit de07cbf1edd4bd1b012905c5c54aea37c6db80eb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 28 16:48:11 2002 +0000

     - (bal) fix to auth2-pam.c to swap fatal() arguments,  A bit of style
       clean up while I'm near it.

commit 68e831132128d8987462b44808fcd078ea7d83bb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 28 00:37:33 2002 +0000

     - (bal) FreeBSD needs <sys/types.h> to detect if mmap() is supported.
       Bug #303

commit dd21fe9ca0293264924d9045e7a9aab1e7f31f28
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 27 18:23:20 2002 +0000

     - (bal) s/config.h/includes.h/ in openbsd-compat/ for *.c.  Otherwise wise
       have issues of our fixes not propogating right (ie bcopy instead of
       memmove).  OK tim

commit 596273516c67cfded71acee848de6db4daa41a1a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 27 18:02:21 2002 +0000

     - (bal) Cygwin uid0 fix by vinschen@redhat.com

commit bdf3e89f1a6d9697c627660cb5ae9828c89ce8f7
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Jun 27 16:59:50 2002 +0000

    20020628
     - (stevesk) [sshd_config] PAMAuthenticationViaKbdInt no; commented
       options should contain default value.  from solar.

commit fe275982e376cf21d74fa911520a104ef19a43ae
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 27 00:25:07 2002 +0000

       - markus@cvs.openbsd.org 2002/06/26 22:27:32
         [ssh-keysign.c]
         bug #304, xfree(data) called to early; openssh@sigint.cs.purdue.edu

commit 085124998d4662d40e9d45165831a4c5203b91cc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 27 00:23:02 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/26 15:00:32
         [monitor_wrap.c]
         more %u

commit 3390749e4b3499126ab4298c203610e745a4ec5d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 27 00:21:59 2002 +0000

       - markus@cvs.openbsd.org 2002/06/26 14:51:33
         [ssh-add.c]
         fix exit code for -X/-x

commit d5bf46e4c08f09fdac235ab7f9066949dd8e1496
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 27 00:21:03 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/26 14:50:04
         [monitor_fdpass.c]
         use ssize_t for recvmsg() and sendmsg() return

commit d5502180cddd0c53e27b7d423156d5ebd11f6f25
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 27 00:12:57 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/26 14:49:36
         [monitor.c]
         correct %u

commit a8959ae2b79ba64abe40949c299569ec0a8b6faa
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jun 26 11:05:32 2002 -0700

    [contrib/caldera/openssh.spec] remove 2 configure options I put in by mistake

commit 3e36f9f4fff8f5b573f163eecd12a677ce66fe89
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 23:59:10 2002 +1000

     - (djm) Release 3.4p1

commit fb7fd9580ca8ff02d857e05c55670f3b6fed024e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 23:58:39 2002 +1000

       - markus@cvs.openbsd.org 2002/06/26 13:55:37
         [auth2-chall.c]
         make sure # of response matches # of queries, fixes int overflow;
         from ISS

commit 7868202d56f72b5f833b454f0756b301bcf58190
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 23:57:59 2002 +1000

     - (djm) Fix int overflow in auth2-pam.c, similar to one discovered by ISS

commit d4b11d62e9de29bbadd09c26c2d2a4d05fb56305
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 23:57:12 2002 +1000

     - (djm) Update spec files for release

commit 990070a8c5dead1fcfc270ec797af1f05dba058a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 23:51:06 2002 +1000

       - deraadt@cvs.openbsd.org 2002/06/26 13:49:26
         [session.c]
         disclose less information from environment files; based on input
         from djm, and dschultz@uclink.Berkeley.EDU

commit 530a754d389723a5617dc5ce103a9057e6293708
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 23:27:11 2002 +1000

       - deraadt@cvs.openbsd.org 2002/06/26 13:20:57
         [monitor.c]
         be careful in mm_zalloc

commit 136d4418e3366bae92e5f1472a0251efc5e2804c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 23:05:16 2002 +1000

     - (djm) Improve PAMAuthenticationViaKbdInt text from Nalin Dahyabhai
       <nalin@redhat.com>

commit f49035a0bbd87a89ded6f029f379f7d655135a66
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 19:42:52 2002 +1000

     - (djm) Require krb5 devel for RPM build w/ KrbV

commit f6ccc14ad8becc4a2d98547cb8450ff3b1ed414e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 19:24:56 2002 +1000

    ssh-keysign

commit a0796cad4aab647d9c357bc7c03d4b0dc8d7fb27
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 19:15:07 2002 +1000

       - markus@cvs.openbsd.org 2002/06/26 08:58:26
         [session.c]
         limit # of env vars to 1000; ok deraadt/djm

commit 9403aa2f79cac6e1565324d5d33d572f62932187
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 19:14:43 2002 +1000

       - markus@cvs.openbsd.org 2002/06/26 08:55:02
         [channels.c]
         limit # of channels to 10000

commit 468cd716a54ac1fb85d24e6d270d824e460267b2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 19:14:25 2002 +1000

       - markus@cvs.openbsd.org 2002/06/26 08:54:18
         [buffer.c]
         limit append to 1MB and buffers to 10MB

commit aa15137c15d2fe6ca4d802c02c6f844072648936
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 19:14:08 2002 +1000

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2002/06/26 08:53:12
         [bufaux.c]
         limit size of BNs to 8KB; ok provos/deraadt

commit f18cd162d310bbd69f272337e8adb57742d322c1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 26 19:12:59 2002 +1000

     - (djm) setlogin needs pgid==pid on BSD/OS; from itojun@

commit 6de3dfd929adaa1d0a05c98cd9df4a48ed534205
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jun 25 19:28:55 2002 -0700

     [contrib/caldera/openssh.spec] add support for privsep

commit 40b011c7fe2aede4e43be7049f074ab7c2347b2c
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jun 26 00:43:57 2002 +0000

     - (stevesk) [README.privsep] more for sshd pseudo-account.

commit 4e3c631b709d178c7df1634f401f087dcd604071
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 26 00:29:02 2002 +0000

     - (bal) fixed NeXTStep missing munmap() issue. It defines HAVE_MMAP,
       but it all damned lies.

commit e04ee923d950f76132fa137f5e33ff42b94126be
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jun 25 17:25:47 2002 -0700

    UnixWare tip is no longer needed.

commit a95fd3f8ad53d2ac2fb26558e033bd5180131c77
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 26 00:22:57 2002 +0000

     - (bal) added back in error check for mmap().  I screwed up, Pointed
       out by stevesk@

commit 2b3897c3ccbe028c99b1b3b79603845899d5c644
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jun 25 16:45:42 2002 -0700

    [Makefile.in] fix test on installing ssh-rand-helper.8

commit 5223727672deba1236c5d5f43c1c363ae85bb94b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 23:38:47 2002 +0000

     - (bal) Updated AIX package build.  Patch by dtucker@zip.com.au

commit fbcc3f71f24cf92fecc0bd51ec70271e5488e908
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 23:24:18 2002 +0000

       - markus@cvs.openbsd.org 2002/06/25 18:51:04
         [sshd.c]
         lightweight do_setusercontext after chroot()

commit 6398a0ef12139ad40a63a6dda82a7847919f8c34
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 23:22:54 2002 +0000

       - markus@cvs.openbsd.org 2002/06/25 16:22:42
         [authfd.c]
         unnecessary cast

commit c2df3ec0c03f303caadf3f04d9bc72a0783b8030
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 23:21:41 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/24 17:57:20
         [sftp-server.c sshpty.c]
         explicit (u_int) for uid and gid

commit 9b4139742f146f6048af147da136e8d71c52605e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 23:20:18 2002 +0000

       - itojun@cvs.openbsd.org 2002/06/24 15:49:22
         [msg.c]
         printf type pedant

commit c5a7f4fdf98ec9067166f1643408a64acf308ff5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 23:19:13 2002 +0000

       - markus@cvs.openbsd.org 2002/06/24 14:55:38
         [authfile.c kex.c ssh-agent.c]
         cat to (void) when output from buffer_get_X is ignored

commit 4fed2be856c2677c4b92825dfcfcbb178c241a8c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 23:17:36 2002 +0000

       - markus@cvs.openbsd.org 2002/06/24 14:33:27
         [channels.c channels.h clientloop.c serverloop.c]
         move channel counter to u_int

commit b48057b7dca215efab35ab5a273ae7834f24953a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 23:16:31 2002 +0000

       - markus@cvs.openbsd.org 2002/06/24 13:12:23
         [ssh-agent.1]
         the socket name contains ssh-agent's ppid; via mpech@ from form@

commit daa2179bd0ea772be09b92ebce092d4d03ede4c2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 23:15:30 2002 +0000

       - markus@cvs.openbsd.org 2002/06/23 21:34:07
         [channels.c]
         tcode is u_int

commit 7039653b7bd4aede504611eb8db875163daeda03
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Jun 25 23:01:37 2002 +0000

    whitespace sync

commit cfae58c059f998e638c08f747e8e722d53d3993e
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Jun 25 22:43:19 2002 +0000

     - (stevesk) [monitor.c] remove duplicate proto15 dispatch entry for PAM

commit 8eff319298d980ed50b9ec681a2f97d3ed5fb6d1
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jun 25 15:35:15 2002 -0700

    [acconfig.h configure.ac sshd.c] BROKEN_FD_PASSING fix from Markus
    for Cygwin, Cray, & SCO

commit b129be657c17c2a861f6c9e2c1f2d9fdf2770615
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 17:12:26 2002 +0000

    20020626
     - (bal) moved aix_usrinfo() and noted not setting real TTY.  Patch by
       dtucker@zip.com.au

commit 78688d7a4517e22748cc8f69a70cf92a97c8eacd
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Jun 25 10:07:25 2002 -0700

    Sync with Caldera

commit acfef05161620ddb31af1a512be40c5e12f076db
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 14:14:30 2002 +0000

    More privsep notes

commit 2f0de48681cd80dcd116833a06cbb84d098f9fd2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 14:01:55 2002 +0000

    More notes for Privsep issues.

commit 6b0c96ab590be0af4b04421666a3b465737c16cb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 03:22:03 2002 +0000

     - (bal) if mmap() is substandard, don't allow compression on server side.
       Post 'event' we will add more options.

commit aa83b984ca60f59aff8eb32da7dfe210c8a55d82
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 25 02:28:22 2002 +0000

     - (bal) Started list of PrivSep issues in TODO

commit d3f6ad2cc01a08ad3f1b32a069afae9fb0aae8f7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 25 10:24:47 2002 +1000

     - (djm) Create privsep directory and warn if privsep user is missing
       during make install

commit d48663602d55d324aa4c5964b9782a876de0ff5b
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Jun 24 16:49:22 2002 +0000

     - (stevesk) [README.privsep] minor updates

commit 34f0d8f4040c3fe55e3a69aa92d18482077dd202
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Jun 24 16:26:49 2002 +0000

     - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh

commit 3f58474214de8411e75f28c34511df7ac81d8279
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 21:49:25 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/23 21:10:02
         [packet.c]
         packet_get_int() returns unsigned for reason & seqnr

commit a9d2c89fc5e9feb9da7326e2fdaf3281184620ab
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 21:48:28 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/23 21:06:41
         [channels.c channels.h session.c session.h]
         display, screen, row, col, xpixel, ypixel are u_int; markus ok
      - (bal) Also fixed IPADDR_IN_DISPLAY case where display, screen, row, col,
        xpixel are u_int.

commit 8ada5d0d0daabc238b86dab64066353937ff22e8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 21:42:50 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/23 21:06:13
         [sshpty.c]
         KNF

commit e23f4a3d28b8d788faca546e7b52e37aaad99c32
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 21:40:16 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/23 20:39:45
         [session.c]
         compression_level is u_int

commit 822b6340999b061c96ccd64093f608d8ab63e836
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 21:38:49 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/23 10:29:52
         [ssh-agent.c sshd.c]
         some minor KNF and %u

commit e135363422c0e48901fa0b4927ef3f1c12614287
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 21:29:23 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/23 09:46:51
         [bufaux.c servconf.c]
         minor KNF.  things the fingers do while you read

commit 58d3b7224fd49bf4d470f9f3ad6bdfc5dbcc1e0a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 21:28:13 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/23 09:39:55
         [ssh-keygen.c]
         u_int stuff

commit b1f483f472da5fd2dbcb009d9988088f43c21579
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 21:27:18 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/23 09:30:14
         [sftp-client.c sftp-client.h sftp-common.c sftp-int.c sftp-server.c
          sftp.c]
         bunch of u_int vs int stuff

commit 5c3855210ef20be5931d4b58f641d71bc3b203e8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 21:23:20 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/23 03:30:58
         [scard.c ssh-dss.c ssh-rsa.c sshconnect.c sshconnect2.c sshd.c sshlogin.c
          sshpty.c]
         various KNF and %d for unsigned

commit 836f0e9d9a847ad0510ff50b2bedc58e295e0913
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 21:21:30 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/23 03:26:19
         [cipher.c key.c]
         KNF

commit 2953d0fb4eda727762c52eaa005ca56c621d0d25
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 21:20:34 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/23 03:25:50
         [tildexpand.c]
         KNF

commit e1c0912cb6af1d7ca8d260f9a3e21efdbe867050
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 00:38:24 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/22 23:09:51
         [monitor.c]
         save auth method before monitor_reset_key_state(); bugzilla bug #284;
         ok provos@

commit 57f08005d3626a4f96a1af18ad47d55f2241f6c3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 00:37:10 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/22 20:05:27
         [sshd.c]
         don't call setsid() if debugging or run from inetd; no "Operation not
         permitted" errors now; ok millert@ markus@

commit 959de99aa0efdb6cd1c02294c3890f8bf7eab86e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 00:35:25 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/22 16:45:29
         [ssh-agent.1 sshd.8 sshd_config.5]
         use process ID vs. pid/PID/process identifier

commit c06bf70b41dfe4ec263371b19e22bc86e7fd66ff
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 00:34:37 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/22 16:41:57
         [scp.1]
         typo

commit 2dfacb3d401c0b15140e23710eead071bd60f82e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 00:33:47 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/22 16:40:19
         [sshd.c]
         check /var/empty owner mode; ok provos@

commit 624e3f2065690308adfeb8eaa88b3ee943f9eaad
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 00:32:57 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/22 16:32:54
         [sshd.8]
         add /var/empty in FILES section

commit c001cd35778d2e64b5464846f648b5a1c04c2947
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 00:32:11 2002 +0000

       - naddy@cvs.openbsd.org 2002/06/22 11:51:39
         [ssh.1]
         typo

commit bf69e3b95d1b15353e6bc55deaee88c7a0db50df
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 00:31:24 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/22 02:40:23
         [ssh.1]
         section 5 not 4 for ssh_config

commit 5590aa5b1ffe03f884741e45208eed645dd6ac1c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 00:30:30 2002 +0000

     - OpenBSD CVS Sync
       - stevesk@cvs.openbsd.org 2002/06/22 02:00:29
         [ssh.h]
         correct comment

commit 883844dc078ecd09f9b186059fca0e0ee836be06
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 00:20:50 2002 +0000

     - (bal) add extern char *getopt.  Based on report by dtucker@zip.com.au

commit 1a1b85177580970e99095b7a3af67c06c6476caa
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 23 00:18:15 2002 +0000

     - (bal) removed GNUism for getops in ssh-agent since glibc lacks optreset.

commit 90d5de76701b51cef2dafb8e9cf7afe724d020c5
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Jun 22 18:51:48 2002 +0000

     - (stevesk) [configure.ac] bug #255 LOGIN_NEEDS_UTMPX for AIX.

commit ee9ac35fc20294e2950f811f1998a72b1aa20254
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 22 00:26:59 2002 +0000

     - (bal) getopt now can be staticly compiled on those platforms missing
       optreset.  Patch by binder@arago.de

commit f102bf6e50325f9c94143569c4f0241de08424f8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 22 01:44:45 2002 +1000

     - (djm) Release 3.3p1

commit 828b1962141114df191013abe18e425e10df868d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 22 00:48:02 2002 +1000

    mention systems without mmap or MAP_ANON

commit 263d68fc567c831e1e16d5c49efb4964ed144f64
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 22 00:45:50 2002 +1000

    - (djm) Update README.privsep; spotted by fries@

commit c7d6d5552160c657cb173105216cbfa5853c1eba
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 21 17:12:24 2002 +1000

    unbreak

commit 04d062850af6be4d4eecbc4d0f2810ae0b0bfa1e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 21 17:11:02 2002 +1000

    unbreak

commit 53baddb775fe836d2994d290c18e1d6b87fcfb9f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 21 16:42:41 2002 +1000

     - (djm) contrib/redhat/openssh.spec hacking:
       - Merge in spec changes from seba@iq.pl (Sebastian Pachuta)
       - Add new {ssh,sshd}_config.5 manpages
       - Add new ssh-keysign program and remove setuid from ssh client

commit 43cecc1392ff3ec4a01458f3ca1869bebd79e59d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 21 16:21:11 2002 +1000

    some xxx's for future privsep cleanup

commit 4903eb4b7461081c9a55cff3a4075fa3311e5e23
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 21 16:20:44 2002 +1000

     - (djm) Warn and disable compression on platforms which can't handle both
       useprivilegeseparation=yes and compression=yes

commit 444f9fca60cb9f331e5add08bf398aaa47dd3ed6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 21 16:05:12 2002 +1000

      - ID sync for auth-passwd.c

commit 2d6b83353b3ec804e24bbb48ab5c7dd54b1690bf
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 21 15:59:49 2002 +1000

       - djm@cvs.openbsd.org 2002/06/21 05:50:51
         [monitor.c]
         Don't initialise compression buffers when compression=no in sshd_config;
         ok Niels@

commit 90ac0b5945bc280ad86ae51fbd96875baac0f55b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 01:38:53 2002 +0000

     - (bal) Still more Makefile.in updates for ssh{d}_config.5

commit 900464e45469cb3974442cd788ec744b2e11b299
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 01:24:01 2002 +0000

     - (bal) Missed integrating ssh_config.5 and sshd_config.5

commit 47e1b40c08f1f29fc22a188577db5f2bd557d736
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 01:19:12 2002 +0000

       - stevesk@cvs.openbsd.org 2002/05/25 20:40:08
         [LICENCE]
         missed Per Allansson (auth2-chall.c)

commit 1b8d730b7d45f847f0f440b92b3c6b37cc53e22d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 01:11:36 2002 +0000

       - markus@cvs.openbsd.org 2002/06/20 23:37:12
         [sshd_config]
         add Compression

commit 23e0f667f88fabb38fd22cedf50e81e78fb99e3e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 01:09:47 2002 +0000

       - markus@cvs.openbsd.org 2002/06/20 23:05:56
         [servconf.c servconf.h session.c sshd.c]
         allow Compression=yes/no in sshd_config

commit 9721e92ba8ec5e1c1c3926ce94260605b73243b3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 01:06:03 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/20 20:03:34
         [ssh_config sshd_config]
         refer to config file man page

commit 3072aae53a6dd2543d867f26e771eefb87f3adbd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 01:02:39 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/20 20:00:05
         [scp.1 sftp.1]
         ssh_config(5)

commit ba8e0dd7a075bd929b03015c719c06c4af41e602
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 01:00:40 2002 +0000

    tevesk@cvs.openbsd.org 2002/06/20 20:00:05
         [scp.1 sftp.1]
         ssh_config(5)

commit 9f04903c50089acde55ef3ea7edd35161c5eac0c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 00:59:05 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/20 19:56:07
         [ssh.1 sshd.8]
         move configuration file options from ssh.1/sshd.8 to
         ssh_config.5/sshd_config.5; ok deraadt@ millert@

commit 402c6cc68170ee63d07c5ff4a081e113b1628445
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 00:43:42 2002 +0000

       - markus@cvs.openbsd.org 2002/06/19 18:01:00
         [cipher.c monitor.c monitor_wrap.c packet.c packet.h]
         make the monitor sync the transfer ssh1 session key;
         transfer keycontext only for RC4 (this is still depends on EVP
         implementation details and is broken).

commit cb72e4f6d2cf63cda22484ec90142689fed288f6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 00:41:51 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/19 00:27:55
         [auth-bsdauth.c auth-skey.c auth1.c auth2-chall.c auth2-none.c authfd.c
          authfd.h monitor_wrap.c msg.c nchan.c radix.c readconf.c scp.c sftp.1
          ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c
          ssh-keysign.c ssh.1 sshconnect.c sshconnect.h sshconnect2.c ttymodes.c
          xmalloc.h]
         KNF done automatically while reading....

commit 115422f918d86e007cb3c050e9c4d09102580089
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 00:26:22 2002 +0000

     - (bal) Cygwin special handling of empty passwords wrong.  Patch by
       vinschen@redhat.com

commit 45933dd9aa7e7e8c9258001d67f2c118c3e026f4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 00:10:58 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/17 06:05:56
         [scp.c]
         make usage like man page

commit 61c183bea34f06a14458d9102a6365132c0396db
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 00:09:54 2002 +0000

       - itojun@cvs.openbsd.org 2002/06/16 21:30:58
         [ssh-keyscan.c]
         use TAILQ_xx macro.  from lukem@netbsd.  markus ok

commit 2b266b7f083e969cba04a035eba46a6d96c0c1e3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 00:08:39 2002 +0000

      - markus@cvs.openbsd.org 2002/06/15 01:27:48
         [authfd.c authfd.h ssh-add.c ssh-agent.c]
         remove the CONSTRAIN_IDENTITY messages and introduce a new
         ADD_ID message with contraints instead. contraints can be
         only added together with the private key.

commit c90f8a98eaffccb8248111206416e1c9ed206da9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 00:06:54 2002 +0000

       - markus@cvs.openbsd.org 2002/06/15 00:07:38
         [authfd.c authfd.h ssh-add.c ssh-agent.c]
         fix stupid typo

commit 4eb4c4e1ef39906056e282d6e160350dcd3fa533
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 00:04:48 2002 +0000

       - markus@cvs.openbsd.org 2002/06/15 00:01:36
         [authfd.c authfd.h ssh-add.c ssh-agent.c]
         break agent key lifetime protocol and allow other contraints for key
         usage.

commit f0bfa839bda8309c45b807e55bb2b2dfac7a6f9a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 21 00:01:18 2002 +0000

     - (bal) Fixed AIX environment handling, use setpcred() instead of existing
       code.  (Bugzilla Bug 261)

commit 3c73dfe55ebe0f302cc5a9bc590b96427eefb0a6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 20 23:53:53 2002 +0000

       - todd@cvs.openbsd.org 2002/06/14 21:35:00
         [monitor_wrap.c]
         spelling; from Brian Poole <raj@cerias.purdue.edu>

commit 0e23ebcc8b022710a266982694f3e10e3f19e20b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 13 21:34:57 2002 +0000

     - (bal) typo of setgroup for cygwin.  Patch by vinschen@redhat.com

commit b7ae94dd0b90d126a5be2dd4362e6148980529aa
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 12 17:32:30 2002 +0000

     - (bal) Some platforms don't have ONLCR (Notable Mint)

commit 837461bf9a8f71b96a522bf6f51d6fdcb5b2a8cd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 12 16:57:14 2002 +0000

     - (bal) Build noop setgroups() for cygwin to clean up code (For other
       platforms without the setgroups() requirement, you MUST define
       SETGROUPS_NOOP in the configure.ac) Based on patch by vinschen@redhat.com

commit da394cae048e9106ad4f280c91e37ab0df2f1f97
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 12 16:11:12 2002 +0000

       - markus@cvs.openbsd.org 2002/06/12 01:09:52
         [ssh.c]
         ssh_connect returns 0 on success

commit 2415757253b34b747eecf2f94498b72ca7b331c5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 12 16:09:39 2002 +0000

       - markus@cvs.openbsd.org 2002/06/11 23:03:54
         [ssh.c]
         remove unused cruft.

commit 1aa6427c0f0385fde48e3457a9ebf37b8de77d06
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 11 20:28:05 2002 +0000

     - (bal) Cygwin fix up from swap uid clean up in ssh.c patch by
       vinschen@redhat.com

commit 9a17c9a568904d08b3d1e01ff5fc78ebd060101c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 11 16:47:22 2002 +0000

       - itojun@cvs.openbsd.org 2002/06/11 08:11:45
         [canohost.c]
         use "ntop" only after initialized

commit ce0f6342702a660f97b57cbdeb671feb02bae382
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 11 16:42:49 2002 +0000

       - mpech@cvs.openbsd.org 2002/06/11 05:46:20
         [auth-krb4.c monitor.h serverloop.c session.c ssh-agent.c sshd.c]
         pid_t cleanup. Markus need this now to keep hacking.
         markus@, millert@ ok

commit f9c4884c8effe6dd78ab3ed4e42ed69c4a8652d0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 11 16:37:51 2002 +0000

       - markus@cvs.openbsd.org 2002/06/11 04:14:26
         [ssh.c sshconnect.c sshconnect.h]
         no longer use uidswap.[ch] from the ssh client
         run less code with euid==0 if ssh is installed setuid root
         just switch the euid, don't switch the complete set of groups
         (this is only needed by sshd). ok provos@

commit 8bb6f36c8fab33f7ca59b9c56e11d54caf36f965
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 11 15:59:02 2002 +0000

       - markus@cvs.openbsd.org 2002/06/10 22:28:41
         [channels.c channels.h session.c]
         move creation of agent socket to session.c; no need for uidswapping
         in channel.c.

commit 914d03758be46488705950cf6d476855a702a13e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 11 15:55:01 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/10 21:21:10
         [ssh_config]
         update defaults for RhostsRSAAuthentication and RhostsAuthentication
         here too (all options commented out with default value).

commit 2bf82763935991dd151eac3bc378eebbbaea3fdc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 11 15:53:05 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/10 17:45:20
         [readconf.c ssh.1]
         change RhostsRSAAuthentication and RhostsAuthentication default to no
         since ssh is no longer setuid root by default; ok markus@

commit 1775c9c97af0559f7b6df766ce79d66a1e883379
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 11 15:51:54 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/10 17:36:23
         [ssh-add.1 ssh-add.c]
         use convtime() to parse and validate key lifetime.  can now
         use '-t 2h' etc.  ok markus@ provos@

commit 11d470de348beb5e9f6a2dcc27fdeb1ad8257acd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 11 15:50:13 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/10 16:56:30
         [ssh-keysign.8]
         merge in stuff from my man page; ok markus@

commit 2779d28a0f96fc4675638d85869dcc4448e83453
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 11 15:47:42 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/10 16:53:06
         [auth-rsa.c ssh-rsa.c]
         display minimum RSA modulus in error(); ok markus@

commit 18a32a7efa9ca967bf1ca2b55a6543c180aceaeb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 11 15:46:34 2002 +0000

       - itojun@cvs.openbsd.org 2002/06/09 22:17:21
         [sshconnect.c]
         pass salen to sockaddr_ntop so that we are happy on linux/solaris

commit 5cac423871b406a474149c5a0c3b1085ef1fd0f4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 11 15:45:02 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/09 22:15:15
         [ssh.1]
         update for no setuid root and ssh-keysign; ok deraadt@

commit 494709decba82070ac7094d09a93685d5f038fee
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 11 15:42:53 2002 +0000

     - (bal) ssh-agent.c RCSD fix (|unexpand already done)

commit 05efee10926847635578ec1854b471ddc0dcec87
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 9 20:20:58 2002 +0000

     - (bal) RCSID tag updates on channels.c, clientloop.c, nchan.c,
       sftp-client.c, ssh-agenet.c, ssh-keygen.c and connect.h (we did unexpand
       independant of them)

commit 2749e1c8f55f947673a6591b1a6698a75f143b80
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 9 20:16:22 2002 +0000

       - markus@cvs.openbsd.org 2002/06/09 04:33:27
         [sshconnect.c]
         abort() - > fatal()

commit 159ac2e8cd9fb69c21916bdf5f742eccbb4f2695
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 9 20:14:54 2002 +0000

      - itojun@cvs.openbsd.org 2002/06/08 21:15:27
         [sshconnect.c]
         always use getnameinfo.  (diag message only)

commit 2e17b08e482024de21aaf7d4517e1594e7fb7a62
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 9 20:13:27 2002 +0000

       - markus@cvs.openbsd.org 2002/06/08 12:46:14
         [readconf.c]
         silently ignore deprecated options, since FallBackToRsh might be passed
         by remote scp commands.

commit af0c6d6a8c9333459454484697f493c993b843dc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 9 20:06:29 2002 +0000

       - markus@cvs.openbsd.org 2002/06/08 12:36:53
         [scp.c]
         remove FallBackToRsh

commit 7a7483d72e9a94229c5f88c5bc35f80f5fd28e36
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 9 20:05:35 2002 +0000

       - markus@cvs.openbsd.org 2002/06/08 05:41:18
         [ssh_config]
         remove FallBackToRsh/UseRsh

commit 1c2bafebb3237625fd8ecdbfde7f7bf0842824e0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 9 20:04:50 2002 +0000

       - markus@cvs.openbsd.org 2002/06/08 05:40:01
         [readconf.c]
         just warn about Deprecated options for now

commit 4daea86fd45a588acdb1036f8458e88dccffcdd3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 9 20:04:02 2002 +0000

       - markus@cvs.openbsd.org 2002/06/08 05:17:01
         [readconf.c readconf.h ssh.1 ssh.c]
         deprecate FallBackToRsh and UseRsh; patch from djm@

commit a20715788dc44ed629e4320d7e9af4e285a559ab
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 9 20:01:48 2002 +0000

       - markus@cvs.openbsd.org 2002/06/08 05:07:09
         [ssh-keysign.c]
         only accept 20 byte session ids

commit ece420413bbcc272300bc14f8944bb2679e4afd2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 9 20:00:09 2002 +0000

       - markus@cvs.openbsd.org 2002/06/08 05:07:56
         [ssh.c]
         nuke ptrace comment

commit 5a6abdae0f6f2312d8bfd60b8bf2420a3393428d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 9 19:41:48 2002 +0000

    unexpand

commit 2ab1968da288e0b32f639d5e7d79ab0b61d42bc3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 7 16:49:11 2002 +0000

     - (bal) Removed --{enable/disable}-suid-ssh
    
    this was mistakenly commited with the __progname fix to ssh-keysign.

commit 378a417389beef8a2e312bbbb0269b9f2ab379f6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 7 14:49:56 2002 +0000

     - (bal) use 'LOGIN_PROGRAM'  not '/usr/bin/login' in session.c patch by
       Bertrand.Velle@apogee-com.fr

commit 3545352dc4ae245ebadc3e11ca250248ce2b99e3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 7 14:37:00 2002 +0000

     - (bal) Missed __progname in ssh-keysign.c  patch by dtucker@zip.com.au

commit 03bab2861e1f601aac06ada43277c26509c8886b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 7 03:19:35 2002 +0000

     - (bal) Reverse logic, use __func__ first since it's C99

commit db41d2390c0f3f47541330b79e45566e3f743535
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 7 03:11:38 2002 +0000

     - (bal) ssh-keysign should build and install correctly now.  Phase two
       would be to clean out any dead wood and disable ssh setuid on install.

commit b85ab30a6e02800b1a74c493868c80081a3cfb53
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 7 02:05:25 2002 +0000

     - (bal) Refixed auth2.c.  It was never fully commited while spliting out
            authentication to different files.

commit 4eeccc79f6c7fe15df0b5cbe7eec0e5ea37e4f49
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 7 01:57:25 2002 +0000

     - (bal) monitor_mm.c typos.

commit 88d26ed408126c01eef4c78d9358b6b58687d9b3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 7 01:53:59 2002 +0000

    - (bal) Forgot to add msg.c Makefile.in.

commit a93f12f3966371c2cf5da5e2c698227a3ef905f0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 7 01:51:06 2002 +0000

     - (bal) Missed msg.[ch] in merge.  Required for ssh-keysign.

commit 937df1d630fc6ef1e62b47e94cd5b665e7470a47
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 21:58:35 2002 +0000

       - markus@cvs.openbsd.org 2002/06/06 17:30:11
         [sftp-server.c]
         use get_int() macro (hide iqueue)

commit 2c14047ada68b35d877cafc93455d99c0749698b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 21:57:54 2002 +0000

       - markus@cvs.openbsd.org 2002/06/06 17:12:44
         [sftp-server.c]
         discard remaining bytes of current request; ok provos@

commit d9d6ab6372542d8064ef28528abcb7835730d2b3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 21:57:01 2002 +0000

       - stevesk@cvs.openbsd.org 2002/06/06 01:09:41
         [monitor.h]
         no trailing comma in enum; china@thewrittenword.com

commit 61d328acf9d0adcb10a254d072dafa84fb14b78f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 21:54:57 2002 +0000

       - markus@cvs.openbsd.org 2002/06/05 21:55:44
         [authfd.c authfd.h ssh-add.1 ssh-add.c ssh-agent.c]
         ssh-add -t life,  Set lifetime (in seconds) when adding identities;
         ok provos@

commit 163f3b8f6be475e4fc28358846d0bed7bf0587e4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 21:53:11 2002 +0000

       - markus@cvs.openbsd.org 2002/06/05 20:56:39
         [ssh-add.c]
         add -x/-X to usage

commit 2f71704b42891fbb486b1925e522ea95739fa8ca
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 21:52:03 2002 +0000

       - markus@cvs.openbsd.org 2002/06/05 19:57:12
         [authfd.c authfd.h ssh-add.1 ssh-add.c ssh-agent.c]
         ssh-add -x for lock and -X for unlocking the agent.
         todo: encrypt private keys with locked...

commit 21d1ed8303c0d766b5bb1b3f0e54a7e28ae3c577
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 21:48:57 2002 +0000

       - markus@cvs.openbsd.org 2002/06/05 16:48:54
         [ssh-agent.c]
         copy current request into an extra buffer and just flush this
         request on errors, ok provos@

commit b7788f3ebee920d6b14b37034f7f769788b6dff6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 21:46:08 2002 +0000

       - markus@cvs.openbsd.org 2002/06/05 16:08:07
         [ssh-agent.1 ssh-agent.c]
         '-a bind_address' binds the agent to user-specified unix-domain
         socket instead of /tmp/ssh-XXXXXXXX/agent.<pid>; ok djm@ (some time ago).

commit 22fa01cdea7d8fa159113a9148d523a3b8a46278
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 21:46:07 2002 +0000

       - markus@cvs.openbsd.org 2002/06/05 16:08:07
         [ssh-agent.1 ssh-agent.c]
         '-a bind_address' binds the agent to user-specified unix-domain
         socket instead of /tmp/ssh-XXXXXXXX/agent.<pid>; ok djm@ (some time ago).

commit 7d9c38f37ae608265c3f7fa2f87795419afe6069
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 21:40:51 2002 +0000

       - markus@cvs.openbsd.org 2002/06/04 23:05:49
         [cipher.c monitor.c monitor_fdpass.c monitor_mm.c monitor_wrap.c]
         __FUNCTION__ -> __func__
    
    NOTE: This includes all portable references also.

commit 3dca4f55f20cb62c8cfc5d050027a49bf3590b55
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:59:25 2002 +0000

       - markus@cvs.openbsd.org 2002/06/04 23:02:06
         [packet.c]
         remove __FUNCTION__

commit f67e07711f16a64f75c476e3f5873e76170a81ba
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:58:19 2002 +0000

       - markus@cvs.openbsd.org 2002/06/04 19:53:40
         [monitor.c]
         save the session id (hash) for ssh2 (it will be passed with the
         initial sign request) and verify that this value is used during
         authentication; ok provos@

commit dcf6bfbfbdf1d201b9b9c2b0ceb0bba1ff3c8c1e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:57:17 2002 +0000

       - markus@cvs.openbsd.org 2002/06/04 19:42:35
         [monitor.c]
         only allow enabled authentication methods; ok provos@

commit 2e14bc71e6f9b2235ea0f9aa4d5ae560acddfaea
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:56:07 2002 +0000

       - deraadt@cvs.openbsd.org 2002/06/03 12:04:07
         [ssh.h]
         compatiblity -> compatibility
         decriptor -> descriptor
         authentciated -> authenticated
         transmition -> transmission

commit ceae9d1c333c24894cccddc861c1b9b6d208a8bc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:55:04 2002 +0000

       - markus@cvs.openbsd.org 2002/05/31 13:20:50
         [ssh-rsa.c]
         pad received signature with leading zeros, because RSA_verify expects
         a signature of RSA_size. the drafts says the signature is transmitted
         unpadded (e.g. putty does not pad), reported by anakin@pobox.com

commit 01fff0c9d4f64d13e02ea6d516b5a335a35d00dd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:54:07 2002 +0000

       - markus@cvs.openbsd.org 2002/05/31 13:16:48
         [key.c]
         add comment:
         key_verify returns 1 for a correct signature, 0 for an incorrect signature
         and -1 on error.

commit 511bb24c5b4c11c2930464ff02bff9f4577566cb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:52:37 2002 +0000

       - markus@cvs.openbsd.org 2002/05/31 11:35:15
         [auth.h auth2.c]
         move Authmethod definitons to per-method file.
    
    NOTE: The rest of this patch is with the import of the auth2-*.c files.

commit cec2ea8d020bc2fe0ee6de1a6cf0230b529ce05c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:51:04 2002 +0000

       - markus@cvs.openbsd.org 2002/05/31 10:30:33
         [sshconnect2.c]
         extent ssh-keysign protocol:
         pass # of socket-fd to ssh-keysign, keysign verfies locally used
         ip-address using this socket-fd, restricts fake local hostnames
         to actual local hostnames; ok stevesk@

commit f088f4374a04f9abd1dc91cb387f75e3bf0c5c56
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:50:07 2002 +0000

       - markus@cvs.openbsd.org 2002/05/30 08:07:31
         [cipher.c]
         use rijndael/aes from libcrypto (openssl >= 0.9.7) instead of
         our own implementation. allow use of AES hardware via libcrypto,
         ok deraadt@

commit a26ea63f8acd883603de9f780f1ff05775e51f78
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:46:25 2002 +0000

       - markus@cvs.openbsd.org 2002/05/29 11:21:57
         [sshd.c]
         don't start if privsep is enabled and SSH_PRIVSEP_USER or
         _PATH_PRIVSEP_CHROOT_DIR are missing; ok deraadt@

commit 20abb75f53d64718827cf2c0547fc3db443fa1b9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:45:33 2002 +0000

       - stevesk@cvs.openbsd.org 2002/05/29 03:06:30
         [ssh.1 sshd.8]
         spelling

commit 10d9936413b8af27ee8a345cbcc02b732e9ffc52
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:44:06 2002 +0000

       - stevesk@cvs.openbsd.org 2002/05/28 21:24:00
         [uidswap.c]
         use correct function name in fatal()
    
    [See the patch above, I saw it before apply the next patch. <sigh>]

commit ca8943e6deefa16a3fc5c4d3b93d13b23d9dfc59
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:42:04 2002 +0000

     - (bal) Corrected debug() in uidswap.c to match upstream.

commit abff1dd050ef0a275a67718b80bfae235f0264eb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:38:49 2002 +0000

       - stevesk@cvs.openbsd.org 2002/05/28 17:28:02
         [uidswap.c]
         format spec change/casts and some KNF; ok markus@

commit 105ccbe192391735f499d31207618757c37426e2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:33:06 2002 +0000

       - stevesk@cvs.openbsd.org 2002/05/28 16:45:27
         [monitor_mm.c]
         print strerror(errno) on mmap/munmap error; ok markus@

commit 033a49c7cc0de8ec659110ab6cfb3a06e306d5b4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:30:28 2002 +0000

       - stevesk@cvs.openbsd.org 2002/05/26 20:35:10
         [ssh.1]
         sort ChallengeResponseAuthentication; ok markus@

commit 855bf3ac3cf395b282600700c1fd792af1f3fdcb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:27:55 2002 +0000

       - markus@cvs.openbsd.org 2002/05/25 18:51:07
         [auth.h auth2.c auth2-hostbased.c auth2-kbdint.c auth2-none.c
          auth2-passwd.c auth2-pubkey.c Makefile.in]
         split auth2.c into one file per method; ok provos@/deraadt@
    
    NOTE: Merged back noticable cygwin and pam stuff.  May need review to
    ensure I did not miss anything.

commit 4887da222b5dec4e36f85f724d836dfbb6d434c7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 20:05:57 2002 +0000

       - markus@cvs.openbsd.org 2002/05/25 08:50:39
         [sshconnect2.c]
         execlp->execl; from stevesk

commit 5206b951c6db0f337f15515c1857993ab2a1c7b1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 19:59:29 2002 +0000

       - markus@cvs.openbsd.org 2002/05/24 08:45:14
         [sshconnect2.c]
         stat ssh-keysign first, print error if stat fails;
         some debug->error; fix comment

commit 9e5bb579f9ce4a6154c9e4123ecf075cea192f9f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 19:58:27 2002 +0000

       - markus@cvs.openbsd.org 2002/05/23 19:39:34
         [ssh.c]
         add comment about ssh-keysign

commit 1bad256822046e2cc9e3a85a1c622e4ebaa2b97e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 19:57:33 2002 +0000

       - markus@cvs.openbsd.org 2002/05/23 19:24:30
         [authfile.c authfile.h pathnames.h ssh.c sshconnect.c sshconnect.h
          sshconnect1.c sshconnect2.c ssh-keysign.8 ssh-keysign.c Makefile.in]
         add /usr/libexec/ssh-keysign: a setuid helper program for hostbased
         authentication in protocol v2 (needs to access the hostkeys).
    
    Note: Makefile.in untested.  Will test after merge is finished.

commit f666fec2d553955c26c999cb687877454eeca3ee
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 19:51:58 2002 +0000

       - deraadt@cvs.openbsd.org 2002/05/22 23:18:25
         [ssh.c sshd.c]
         spelling; abishoff@arc.nasa.gov

commit 38ed63d75907d0f4380f7c44350c17cc9f76f764
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 19:51:06 2002 +0000

       - deraadt@cvs.openbsd.org 2002/05/19 20:54:52
         [log.h]
         extra commas in enum not 100% portable

commit fac7769f64b3c5873d3d34f82364a353b1fec864
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 19:49:54 2002 +0000

       - stevesk@cvs.openbsd.org 2002/05/16 22:09:59
         [session.c ssh.c]
         don't limit xauth pathlen on client side and longer print length on
         server when debug; ok markus@

commit 6a2464136520a36be29fc64ebcf39ab59a599fad
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 19:48:16 2002 +0000

       - markus@cvs.openbsd.org 2002/05/16 22:02:50
         [cipher.c kex.h mac.c]
         fix warnings (openssl 0.9.7 requires const)

commit fb62a6948834281fd5628e5566f17c1767a17763
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 6 19:47:11 2002 +0000

       - markus@cvs.openbsd.org 2002/05/15 21:56:38
         [servconf.c sshd.8 sshd_config]
         re-enable privsep and disable setuid for post-3.2.2

commit df75dd21f53829f97eff225c87a71e43c8ec4064
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Jun 4 20:52:19 2002 +0000

     - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed
       setsockopt from debug to error for now).

commit 28bbb0c458c1f6cee5c3de1cec1f9dfea14d7196
Author: Tim Rice <tim@multitalents.net>
Date:   Mon May 27 17:37:32 2002 -0700

    [configure.ac.orig monitor_fdpass.c] Enahnce msghdr tests to address
    build problem on Irix reported by Dave Love <d.love@dl.ac.uk>. Back out
    last monitor_fdpass.c changes that are no longer needed with new tests.
    Patch tested on Irix by Jan-Frode Myklebust <janfrode@parallab.uib.no>

commit 116e6dfaad3543c381ef48e0c42a3a86cebe644c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 22 15:06:28 2002 +1000

    unbreak (aaarrrgggh - stupid vi)

commit 8ce8296fd0c9d8b39467873952ac6c8e058d402a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 22 14:24:01 2002 +1000

    sync scard/

commit 23dc10ddaca953544d24360a0ad6e3f29a685d98
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 22 14:14:54 2002 +1000

    crank rpm spec versions

commit 667fb25f47b5eb6fcf7e5a0035c2251938614ba3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 22 14:14:00 2002 +1000

    Crank version
    
    (also missed changelog message)

commit 13e35a0ea2e1844d9c74a82983df2788070e92b0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 22 14:04:11 2002 +1000

    rcsid sync

commit 74cc5bb8511428b5c1cda3138fca355bfed3b96d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 22 11:02:15 2002 +1000

     fix spelling mistakes spotted by Solar Designer <solar@openwall.com>

commit bc5bb55755aba69746d22cb9c79873e76e34f0bc
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue May 21 17:59:13 2002 +0000

     - (stevesk) [sshd.c] #ifndef HAVE_CYGWIN for setgroups()

commit c5041acef392b489d11cbb1793f72f01acc229b8
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue May 21 17:50:21 2002 +0000

     - (stevesk) [sshd.c] bug 245; disable setsid() for now

commit 9de793cc6c83a2e116dd73530bb4020e4b40d9d5
Author: Tim Rice <tim@multitalents.net>
Date:   Fri May 17 08:59:22 2002 -0700

    [configure.ac] remove extra MD5_MSG="no" line.

commit 8ae0d8c1858e5a87c2da3784bbd98f7d74c08471
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 16 09:25:38 2002 +1000

    p1

commit 4e67d38a7eda0c261d7c6d0826ec35f34117beed
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 21:50:14 2002 +0000

     - (bal) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2002/05/15 21:05:29
         [version.h]
         enter OpenSSH_3.2.2
     - (bal) Caldara, Suse, and Redhat openssh.specs updated.

commit c5c15dde328e364b28d2aa815f31a51207fd6622
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 21:37:34 2002 +0000

       - markus@cvs.openbsd.org 2002/05/15 21:02:53
         [servconf.c sshd.8 sshd_config]
         disable privsep and enable setuid for the 3.2.2 release

commit c57bbf158d9698b3ebac56d63e0d197a2169bd73
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 21:36:45 2002 +0000

       - millert@cvs.openbsd.org 2002/05/06 23:34:33
         [ssh.1 sshd.8]
         Kill/adjust r(login|exec)d? references now that those are no longer in
         the tree.

commit bb2ce36d4d706800a6b672f07cd7989497663160
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 21:35:43 2002 +0000

       - deraadt@cvs.openbsd.org 2002/05/04 02:39:35
         [servconf.c sshd.8 sshd_config]
         enable privsep by default; provos ok
    (historical)

commit 2b70e5603f708d2acdfa2b81b7a021fc1551e08a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 16:39:51 2002 +0000

     - (bal) Clarified openbsd-compat/*-cray.* Licence provided by Wendy.

commit 7339b2a27868557ffcfea6cd7908323bca4f7a3a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 16:25:01 2002 +0000

       - mouring@cvs.openbsd.org 2002/05/15 15:47:49
         [kex.c monitor.c monitor_wrap.c sshd.c]
         'monitor' variable clashes with at least one lame platform (NeXT).  i
         Renamed to 'pmonitor'.  provos@
     - (bal) Fixed up PAM case.  I think.

commit bdde330d2fb2a2ccc50659a592da5241f673b6d1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 16:19:37 2002 +0000

       - markus@cvs.openbsd.org 2002/05/13 21:26:49
         [auth-rhosts.c]
         handle debug messages during rhosts-rsa and hostbased authentication;
         ok provos@

commit 17401b6b772213ae466cb3ac287b4980ff9f7d0d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 16:17:56 2002 +0000

       - millert@cvs.openbsd.org 2002/05/13 15:53:19
         [sshd.c]
         Call setsid() in the child after sshd accepts the connection and forks.
         This is needed for privsep which calls setlogin() when it changes uids.
         Without this, there is a race where the login name of an existing
         connection, as returned by getlogin(), may be changed to the privsep
         user (sshd).  markus@ OK

commit a574cda45b5d3c3363520ef9e4aa3aaa5888c078
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 16:16:14 2002 +0000

       - markus@cvs.openbsd.org 2002/05/13 20:44:58
         [auth-options.c auth.c auth.h]
         move the packet_send_debug handling from auth-options.c to auth.c;
         ok provos@

commit 58d4dafeb1159cebd03a2b32cb87a1970606a441
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 16:14:36 2002 +0000

       - itojun@cvs.openbsd.org 2002/05/13 02:37:39
         [auth-skey.c auth2.c]
         less warnings.  skey_{respond,query} are public (in auth.h)

commit 966bfdae6bbe4ce2d57e381715e39109bb3f0d79
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 16:09:57 2002 +0000

       - stevesk@cvs.openbsd.org 2002/05/11 20:24:48
         [ssh.h]
         typo in comment

commit 973be0083bc9661abaa733ebefd6b603caf7aad1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 16:08:48 2002 +0000

       - deraadt@cvs.openbsd.org 2002/05/08 21:06:34
         [ssh.h]
         move to sshd.sshd instead

commit 1650ba3f571b034dfa7025a2f0b60c8a0c132116
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 16:07:11 2002 +0000

       - deraadt@cvs.openbsd.org 2002/05/07 19:54:36
         [ssh.h]
         use ssh uid

commit beecf74e2b3a8cc4dcf00f38b223d5368ca1e0bc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 15 15:59:17 2002 +0000

     - (bal) CVS ID fix up on auth-passwd.c

commit 860e929fa2c804d66aa9a0586cd097b00bd2cac2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 15 10:12:29 2002 +1000

    wrap

commit ee5e3b2d8a9d99d7d254f7a6c715ed541810edeb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 15 10:08:17 2002 +1000

    wrap

commit 8dd6febf73cd67109e0c3fb10b77663683dbd019
Author: Tim Rice <tim@multitalents.net>
Date:   Tue May 14 09:03:46 2002 -0700

    update version.

commit fd6fd24a7187af28df60801c4299116a03abe795
Author: Tim Rice <tim@multitalents.net>
Date:   Mon May 13 20:50:38 2002 -0700

     remove reference to UnixWare 7 and OpenUNIX 8
     from PAM-enabled pragraph. UnixWare has no PAM.

commit 1e28c9e6bad1bd601606b6a6a3d6aa4ca441d21d
Author: Tim Rice <tim@multitalents.net>
Date:   Mon May 13 17:07:18 2002 -0700

    20020514
    [sshpty.c] set tty modes when allocating old style bsd ptys to
    match what newer style ptys have when allocated. Based on a patch by
    Roger Cornelius <rac@tenzing.org>
    [README.privsep] UnixWare 7 and OpenUNIX 8 work.

commit f8defa2327a1ff265e7b4229e3adc97fc9f82594
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon May 13 23:31:09 2002 +0000

     - (stevesk) [README.privsep] PAM+privsep works with Solaris 8.

commit 05720356d6f24a4fedf05a4762d037d3a4ce8adf
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 13 15:22:21 2002 +1000

     - (djm) Add INSTALL warning about SSH protocol 1 blowfish w/ OpenSSL < 0.9.6

commit f71d2a5d44a942b0794d8574f84b311d82bf4e29
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 13 15:14:08 2002 +1000

     - (djm) Bug #234: missing readpassphrase declaration and defines

commit 903e115698bc5338907093177537da7cd572204f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 13 14:41:31 2002 +1000

    align summary

commit 4c9541741541d70e9e3088e97ccbdab4467da256
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 13 14:12:05 2002 +1000

    unbreak

commit 0228155f06232da7bff622b761dd0c70592fc561
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon May 13 03:57:04 2002 +0000

     - (stevesk) add initial README.privsep

commit c81e12976e57b8d85d1ba8ced991f372aeb6a050
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon May 13 03:51:40 2002 +0000

     - (stevesk) [configure.ac] nicer message: --with-privsep-user=user

commit d81c02d65358510a85f5481a90dab34af4d9c6de
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 13 13:30:17 2002 +1000

    unbreak

commit b7cb96934e527032fa06dfbbf5bfefc48b84cab6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 13 13:26:57 2002 +1000

     - (djm) Update RPM spec file: different superuser path, use
       /var/empty/sshd for privsep

commit f58c672f0ed61507f0d4b56e7c31478bd580b809
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 13 13:15:42 2002 +1000

     - (djm) Add --with-privsep-path configure option

commit 5ad9fd982037e512355cfd5fe060a554934be243
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 13 11:07:41 2002 +1000

     - (djm) Bug #231: UsePrivilegeSeparation turns off Banner.

commit 80080753cd577bd670133660428821225304c361
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 13 10:56:51 2002 +1000

     - (djm) Add --with-superuser-path=xxx configure option to specify what $PATH
       the superuser receives.

commit a18bbd398e053acb58a79a2b4e0f13b4db8a0bae
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 13 10:48:57 2002 +1000

     - (djm) Add --with-superuser-path=xxx configure option to specify what $PATH
       the superuser receives.

commit 802b9568686032c81e4a998dc282df6ed63d4090
Author: Tim Rice <tim@multitalents.net>
Date:   Sat May 11 15:30:04 2002 -0700

     fix for systems that have both HAVE_ACCRIGHTS_IN_MSGHDR and
    HAVE_CONTROL_IN_MSGHDR. Ie. sys/socket.h has #define msg_accrights msg_control

commit aef7371fe45f8df19c166daa0e72a81d121a9c2f
Author: Tim Rice <tim@multitalents.net>
Date:   Sat May 11 13:17:42 2002 -0700

     applied a rework of djm's OpenSSL search cleanup patch.
     Now only searches system and /usr/local/ssl (OpenSSL's default install path)
     Others must use --with-ssl-dir=....

commit f98fb721a0880f63b96544b23fbdd2566be01be3
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri May 10 15:48:52 2002 +0000

     - (stevesk) [auth.c] Shadow account and expiration cleanup.  Now
       check for root forced expire.  Still don't check for inactive.

commit 0b47814b43460fc94668f69b7cd24081e0190fc9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri May 10 02:40:15 2002 +0000

     - (bal) Back all the way out of auth-passwd.c changes.  Breaks too many
       things that don't set pw->pw_passwd.

commit 87aea25f1ac7caf3a788f17c62164c0103ec3d35
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 10 12:20:24 2002 +1000

     - (djm) Try to drop supplemental groups at daemon startup. Patch from
       RedHat

commit cfe4a89eef91939ef865d6d25ecdc39fb87e8b5f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 10 12:19:23 2002 +1000

     - (djm) Rework RedHat RPM files. Based on spec from Nalin
       Dahyabhai <nalin@redhat.com> and patches from
       Pekka Savola <pekkas@netcore.fi>

commit a7a5d6d1b54e5c6f4827d7b6545b59787fe61e71
Author: Tim Rice <tim@multitalents.net>
Date:   Thu May 9 07:05:59 2002 -0700

     Unbreak make -f Makefile.in distprep

commit ffc868ff836100ad41fe18a0e48e2705a211c417
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 9 15:59:13 2002 +1000

     - (djm) Disable PAM kbd-int auth if privsep is turned on (it doesn't work)

commit 0502a471e02b1b6e8ec5b0134766b28694b760a8
Author: Tim Rice <tim@multitalents.net>
Date:   Wed May 8 16:04:14 2002 -0700

    set SHELL in Makefile in case someone makes from a non bourne compatable shell

commit 63cf84199df312830144db03f8defd88168335a0
Author: Tim Rice <tim@multitalents.net>
Date:   Wed May 8 15:57:18 2002 -0700

    fix logic on when seed_rng() is called.
    Report by Chris Maxwell <maxwell@cs.dal.ca>

commit 4bd2a1989073dcf353e8e4801029f9b6873158df
Author: Tim Rice <tim@multitalents.net>
Date:   Tue May 7 19:51:31 2002 -0700

       Add truncate() emulation to address Bug 208

commit f762a4bea554a9ff4dc59b9456c7e1a2379310b3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 8 12:27:55 2002 +1000

     - (djm) Don't reinitialise PAM credentials before we have started PAM.
       Report from Pekka Savola <pekkas@netcore.fi>

commit a33501bb5f8a7057dc56fd49a8a40c57468d86d4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 8 12:24:42 2002 +1000

     - (djm) Unbreak PAM auth for protocol 1. Report from Pekka Savola
       <pekkas@netcore.fi>

commit 52910ddc664ec7ae8148cff1b796d9b27ac6924f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 8 12:18:26 2002 +1000

     - (djm) Unbreak auth-passwd.c for PAM and SIA

commit 532bbdb99b23e8ff05faff3eeee7345dae2a541b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon May 6 23:06:08 2002 +0000

     - (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue

commit 804357ace9afe63c402bb4bfc09d974b82a42d70
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 1 22:00:22 2002 +1000

     - (djm) Fix readpassphase compilation for systems which have it

commit 38cd4358921bd674cace17d6bae71143b716027d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 1 13:17:33 2002 +1000

     - (djm) Import OpenBSD regression tests. Requires BSD make to run

commit 2f09289e741582871ff068f8697b924a257fb703
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Apr 29 20:53:12 2002 -0700

    [contrib/caldera/openssh.spec] update fixUP to reflect changes in sshd_config.
    [contrib/cygwin/README] remove reference to regex.
    patch from Corinna Vinschen <vinschen@redhat.com>

commit aa100c546c110c9d9f06ec67c8f28771a30f014b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 26 16:54:34 2002 +1000

     - (djm) Bug #180: Set ToS bits on IPv4-in-IPv6 mapped addresses. Based on
       patch from openssh@misc.tecq.org

commit ae9d5af0dee1381afd17c757674b31afef1564ca
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 26 11:27:24 2002 +1000

     - (djm) Disable PAM password expiry until a complete fix for bug #188 exists

commit 13ce922cc6edd189056b278c4f0f67511449c821
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 26 11:25:40 2002 +1000

     - (djm) Bug #137, #209: fix make problems for scard/Ssh.bin, do uudecode
       during distprep only

commit 0ea1d9d1f26cf2aa9871fd2050037d5f6407a6b9
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Apr 25 18:17:04 2002 +0000

     - (stevesk) [acconfig.h auth-passwd.c configure.ac sshd.c] HP-UX 10.26
       support.  bug #184.  most from dcole@keysoftsys.com.

commit 30e494fbca1714ace893b80258af85839f99bc4d
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Apr 25 17:56:07 2002 +0000

     - (stevesk) [defines.h] remove USE_TIMEVAL; unused

commit 0150c658302729a7e9e87ad101b72db47090f3f0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 24 09:49:09 2002 +1000

       - djm@cvs.openbsd.org 2002/04/23 22:16:29
         [sshd.c]
         Improve error message; ok markus@ stevesk@

commit 11ec28176e2eff06af7cc0b811b51cbb2792996b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 24 09:48:14 2002 +1000

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2002/04/23 12:54:10
         [version.h]
         3.2.1

commit 5feaaefaf26167feb180bf3531cb3f700e473e2a
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Apr 23 20:45:55 2002 +0000

     - (stevesk) [acconfig.h configure.ac session.c] LOGIN_NO_ENDOPT for HP-UX

commit 03df6cd83c6392d43e4d9f8dce4e15c8239c0872
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Apr 23 20:11:13 2002 +0000

     - (stevesk) [acconfig.h] NEED_IN_SYSTM_H unused

commit 78cf8c377fdbd2c079a9ecf5c086e0be23d39c23
Author: Markus Friedl <mfriedl@gmail.com>
Date:   Tue Apr 23 16:41:12 2002 +0200

       - markus@cvs.openbsd.org 2002/04/23 12:58:26
         [radix.c]
         send complete ticket; semerad@ss1000.ms.mff.cuni.cz

commit 435673dd20747d849b3de1e8ba2da549ee92be66
Author: Markus Friedl <mfriedl@gmail.com>
Date:   Tue Apr 23 16:35:15 2002 +0200

       - markus@openbsd.org 2002/04/23 12:58:26
         [radix.c]
         send complete ticket; semerad@ss1000.ms.mff.cuni.cz

commit f75fcc61f4b87ee6568b720f1eadcd70aa7b2671
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 23:32:38 2002 +1000

    wrap an out of control line

commit fa2bb69d1659ea7a43dce4ce7bf25d3f0a6623d1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 23:22:25 2002 +1000

     - (djm) Bug #206 - blibpath isn't always needed for AIX ld, avoid
       sizeof(long long int) == 4 breakage. Patch from Matthew Clarke
       <Matthew_Clarke@mindlink.bc.ca>

commit f1b9d11a3e75576ac3ecdf18bc65124c56991bfa
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 23:09:19 2002 +1000

     - (djm) Bug #214: Fix utmp for Irix (don't strip "tty"). Patch from
       Kevin Taylor <no@nowhere.org> (??) via Philipp Grau
       <phgrau@zedat.fu-berlin.de>

commit d77facda1a3fa4e495761c9d02608edfd8f74f68
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 22:59:51 2002 +1000

     - (djm) Bug #213: Simplify CMSG_ALIGN macros to avoid symbol clashes.
       Reported by Doug Manton <dmanton@emea.att.com>

commit f5fea44ae33f033a9113ffe52b4e37317e293fc8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 22:52:45 2002 +1000

     - (djm) Define BROKEN_REALPATH for AIX, patch from
       Antti Tapaninen <aet@cc.hut.fi>

commit f6195f2be82cae07660db8f7c3039567f37ffa74
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 22:48:46 2002 +1000

     - (djm) Applied OpenSC smartcard updates from Markus &
       Antti Tapaninen <aet@cc.hut.fi>

commit 654a4ef9699c7e396626abd23d725e8534f953c1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 21:17:17 2002 +1000

     - (djm) Redhat spec enables KrbV by default

commit 0b3894d5b5d80ef9562a75a13c1e1c043d1ff21b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 21:15:31 2002 +1000

     - (djm) Update RPM spec file versions

commit ef7c11de6e7df70b84ac79a749988d1244ed8cad
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 21:13:32 2002 +1000

     - (djm) Trim ChangeLog to include only post-3.1 changes

commit 2797f7f03a6aecfaaf2dadb1284b4b51869339d6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 21:09:44 2002 +1000

       - markus@cvs.openbsd.org 2002/04/22 21:04:52
         [channels.c clientloop.c clientloop.h ssh.c]
         request reply (success/failure) for -R style fwd in protocol v2,
         depends on ordered replies.
         fixes http://bugzilla.mindrot.org/show_bug.cgi?id=215; ok provos@

commit d7de14b6ada79812cf3a1ceb8f921d92d4d180be
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 21:04:51 2002 +1000

       - markus@cvs.openbsd.org 2002/04/22 16:16:53
         [servconf.c sshd.8 sshd_config]
         do not auto-enable KerberosAuthentication; ok djm@, provos@, deraadt@

commit 635fe98a7f156688fc3182d597c88592823a3d22
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 21:00:33 2002 +1000

       - markus@cvs.openbsd.org 2002/04/22 06:15:47
         [radix.c]
         fix check for overflow

commit f61c01506f8f78ccaacb55ba750a847486da3e5e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 20:56:02 2002 +1000

       - stevesk@cvs.openbsd.org 2002/04/21 16:25:06
         [sshconnect1.c]
         spelling in error message; ok markus@

commit 7a8558d3ea81935888149c89ea9b4ee69ab8d458
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 20:51:15 2002 +1000

       - stevesk@cvs.openbsd.org 2002/04/21 16:19:27
         [sshd.8 sshd_config]
         document default AFSTokenPassing no; ok deraadt@

commit bad0e0162fb3e943498d66406784baee9de0ebcc
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 20:46:56 2002 +1000

       - markus@cvs.openbsd.org 2002/04/20 09:17:19
         [radix.c]
         rewrite using the buffer_* API, fixes overflow; ok deraadt@

commit 3b23566a5b266f4915697616b5a4e2ecc23b930a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 20:42:36 2002 +1000

       - markus@cvs.openbsd.org 2002/04/20 09:14:58
         [bufaux.c bufaux.h]
         add buffer_{get,put}_short

commit e4ccf100e05d24c3cfb20a18685d1c507670c7c3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 20:40:28 2002 +1000

     - (djm) OpenBSD CVS Sync
       - deraadt@cvs.openbsd.org 2002/04/20 09:02:03
         [servconf.c]
         No, afs requires explicit enabling

commit 7941855f09b067b639d72757ee3b1d5be1925d50
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 20:28:48 2002 +1000

     - (djm) Make privsep work with PAM (still experimental)

commit 594a71b9b92af786d34d8d961162374e5e4af72f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 23 20:22:59 2002 +1000

     - (djm) Bug #222: Fix tests for getaddrinfo on OSF/1. Spotted by
       Robert Urban <urban@spielwiese.de>

commit f02dccc0dc5711d5bdfb45f92a2f1bba41e365f0
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Apr 21 11:26:10 2002 -0700

    [entropy.c.] Portability fix for SCO Unix 3.2v4.x (SCO OSR 3.0).
    entropy.c needs seteuid(getuid()) for the setuid(original_uid) to succeed.
    Patch by gert@greenie.muc.de. This fixes one part of Bug 208

commit a370f4dcc6ae04c430ad97c28a2bd945c2350120
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 18 22:53:22 2002 +1000

     - (djm) Avoid SIGCHLD breakage when run from rsync. Fix from
       Sturle Sunde <sturle.sunde@usit.uio.no>

commit 43a1c13e0fd522cf31666931b66891d23bb3de6d
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Apr 17 21:19:14 2002 -0700

    [configure.ac] Issue warning on --with-default-path=/some_path
    if LOGIN_CAP is enabled. Report & testing by Tuc <tuc@ttsg.com>

commit 5efd71038d4207b576caea3ce148a8cffe268eae
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 17 12:30:45 2002 +1000

     - (djm) Fix .Nm in mdoc2man.pl from pspencer@fields.utoronto.ca

commit bd63874d4bc3048f5dfbba8dc5f02fd57e9bdc7b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 17 12:22:58 2002 +1000

     - (djm) Tell users to configure /dev/random support into OpenSSL in INSTALL

commit 66480f188ec4cb55006a32763b41cf07cc5da781
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Apr 15 21:10:09 2002 -0700

    [configure.ac] add tests for recvmsg and sendmsg.
    [monitor_fdpass.c] add checks for HAVE_SENDMSG and HAVE_RECVMSG for
    systems that HAVE_ACCRIGHTS_IN_MSGHDR but no recvmsg or sendmsg.

commit eb3630205aade22db04bc0e973cb9ad27c179af7
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Apr 15 22:00:51 2002 +0000

     - (stevesk) bsd-cygwin_util.[ch] BSD license from Corinna Vinschen

commit 8be24f3846c98826d07aba9b6d7d3d4e8e7208f6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 15 13:23:59 2002 +1000

     - (djm) Unbreak "make install". Fix from Darren Tucker <dtucker@zip.com.au>

commit 49411ff8a7fb1da93b938552f37230faf48a5c29
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 14 23:16:04 2002 +1000

     - (djm) Random number collection doc fixes from Ben

commit 32e48180154a9d03fab7288fc18080acee29c7a8
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 14 19:27:12 2002 +1000

     - (djm) ssh-rand-helper improvements
       - Add commandline debugging options
       - Don't write binary data if stdout is a tty (use hex instead)
       - Give it a manpage

commit fd4c9eee25e4e796b714477c3fbb0286ebe50fb7
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 13 11:04:40 2002 +1000

     - (djm) Add KrbV support patch from Simon Wilkinson <simon@sxw.org.uk>

commit 927dfd2d7eb8801e444a3bcff7fdf7a628a779f0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 12 18:51:22 2002 +0000

     - (bal) disable privsep if no MAP_ANON.  We can re-enable it
       after the release when we can do more testing.

commit c42f7cfd164509bca95ffd26c458f1b4b33d931d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 12 17:44:13 2002 +0000

     - (bal) Mistaken in Cygwin scripts for ssh starting.  Patch by
       Corinna Vinschen <vinschen@redhat.com>

commit ae49fe64ca7fe592f3c1cc6b5647c9cc60a4b49c
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Apr 12 10:26:21 2002 -0700

    [configure.ac] add <sys/types.h> to msghdr tests.
    Change -L to -h on testing for /bin being symbolic link

commit 19fa9b544f0b25603517b771f6c36b630021e932
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Apr 12 15:36:07 2002 +0000

     - (stevesk) [auth-sia.[ch]] add BSD license from Chris Adams

commit 813f0452edb4e6ac8bd07b1e8ea5b60ec46874e8
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Apr 11 20:35:39 2002 -0700

    [acconfig.h defines.h includes.h] put includes in includes.h and
    defines in defines.h [rijndael.c openbsd-compat/fake-socket.h
    openbsd-compat/inet_aton.c] include "includes.h" instead of "config.h"
    ok stevesk@

commit 0c283d8444cace9aad1793b9ebdbceb4726c6d9a
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Apr 11 20:39:40 2002 +0000

     - (stevesk) [auth-sia.c] cleanup

commit e0f2ca46518a1d4c48102b547b13aeee636e80a6
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Apr 10 23:17:05 2002 +0000

    oops.  time for beer i think.

commit fe6ca54ac2f3c97d3da74affaa9beadbf3fbd27d
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Apr 10 22:04:54 2002 +0000

     - (stevesk) [configure.ac monitor.c] HAVE_SOCKETPAIR

commit 027e4de24f3fdb92204e6940a701fc0c59feae97
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 10 16:26:20 2002 +0000

       - markus@cvs.openbsd.org 2002/04/10 08:56:01
         [version.h]
         OpenSSH_3.2
     - Added p1 to idenify Portable release version.

commit c8226387944156fdc609d31537bc2f196028d667
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 10 16:22:09 2002 +0000

       - markus@cvs.openbsd.org 2002/04/10 08:21:47
         [auth1.c compat.c compat.h]
         strip '@' from username only for KerbV and known broken clients, bug #204
    
    Don't mind me.. I just commited a changelog with no patch. <sigh>

commit b5115eaf804b6137da2ceb58a603b1ec9b93e9af
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 10 16:17:34 2002 +0000

       - markus@cvs.openbsd.org 2002/04/10 08:21:47
         [auth1.c compat.c compat.h]
         strip '@' from username only for KerbV and known broken clients, bug #204

commit 6939b233d03d59f9ead3469975f7bf72585c6ffa
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Apr 10 16:09:51 2002 +0000

     - (stevesk) [auth-sia.c] compile fix Chris Adams <cmadams@hiwaay.net>

commit 34b7320a9d426d09fed3b55a997955f69ba375fa
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 8 18:37:07 2002 +0000

     - (bal) Minor OpenSC updates.  Fix up header locations and update
       README.smartcard provided by Juha Yrjölä <jyrjola@cc.hut.fi>

commit 265c9d00c37fcce40376db1d553b618a620aa8b7
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Apr 7 22:36:49 2002 +0000

     - (stevesk) wrap munmap() with HAVE_MMAP also.

commit 4e0bb524a5a7e02d4defd219e2cd610d95651771
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Apr 7 19:44:14 2002 +0000

    oops, user should be a string constant

commit 7ff911216bbc288869c6b8ce99cd812ead66b886
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Apr 7 19:22:54 2002 +0000

     - (stevesk) --with-privsep-user; default sshd

commit b1184bbf2931f064b5b38c3a0fe9440d02c67610
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Apr 7 18:12:03 2002 +0000

     - (stevesk) remove configure support for poll.h; it was removed
       from sshd.c a long time ago.

commit 86b9fe6a77795fd5f086910912e7853fc1518afa
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Apr 7 17:08:53 2002 +0000

     - (stevesk) HAVE_MMAP and HAVE_SYS_MMAN_H and use them in
       monitor_mm.c

commit c3c825575cdae3fd42ceb7709525fe8c0ad43f43
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Apr 7 16:39:12 2002 +0000

     - (stevesk) [monitor_fdpass.c] fatal() for UsePrivilegeSeparation=yes
       and no fd passing support.

commit a44e0351ee8dd45435bf1c887f1aca4933a205b0
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Apr 7 16:18:03 2002 +0000

     - (stevesk) HAVE_CONTROL_IN_MSGHDR; not used right now.
       Future: we may want to test if fd passing works correctly.

commit fdee8ef0ac9965aab53c14a4ebf990a8592b9f94
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 6 23:52:02 2002 +0000

     - (bal) We no longer use atexit()/xatexit()/on_exit()

commit 0318801591e629a21b86b79eb13abde1dddcf92e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 6 20:30:07 2002 +0000

     - (bal) Quiet down configure.ac if /bin/test does not exist.

commit 8ff2a8d2c2cef0c446cf7ac9002f9045a15cbef5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 6 18:58:31 2002 +0000

     - (bal) Revered out of runtime IRIX runtime detection of joblimits.  Code is
       incomplete.

commit de3895d580cd9748d48f414a81f740451b34e850
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 6 18:29:59 2002 +0000

       - mouring@cvs.openbsd.org 2002/04/06 18:24:09
         [scp.c]
         Fixes potental double // within path.
         http://bugzilla.mindrot.org/show_bug.cgi?id=76

commit 8d6017566c99387fa52d6f5a09af2be5407acf29
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 6 18:19:38 2002 +0000

     - (bal) Slight update to OpenSC support.  Better version checking. patch
       by Juha Yrjölä <jyrjola@cc.hut.fi>

commit 06e9515eb898a335be246759b3059f2e7a4da698
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 6 04:16:45 2002 +0000

       - djm@cvs.openbsd.org 2002/04/06 00:30:08
         [sftp-client.c]
         Fix occasional corruption on upload due to bad reuse of request id, spotted
         by chombier@mac.com; ok markus@

commit dc0594cc54960a78c64e34c8ebb82f2ce52b687a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 6 04:11:28 2002 +0000

     - (bal) Added MAP_FAILED to allow AIX and Trusted HP to compile.

commit 12db56ba2f6bb0eeaec26d81683b4f4129fde573
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 6 11:12:52 2002 +1000

     - (djm) Typo in Suse SPEC file. Fix from Carsten Grohmann
       <carsten.grohmann@dr-baldeweg.de>

commit a11e270115e2d2ead1abfedf5ebe25ad7eda74aa
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 5 22:18:48 2002 +0000

       - stevesk@cvs.openbsd.org 2002/04/05 20:56:21
         [sshd.8]
         clarify sshrc some and handle X11UseLocalhost=yes; ok markus@

commit 924144e6508df8ab6d8338920b697e62d827b966
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 5 20:23:35 2002 +0000

     - (bal) Too many <sys/queue.h> issues.  Remove all workarounds and
       using internal version only.

commit a42694fa25683488b4dc44abc9dc8bb55414c99f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 5 16:11:45 2002 +0000

     - (bal) Patch for OpenSC SmartCard library; ok markus@; patch by
       Juha Yrjölä <jyrjola@cc.hut.fi>
     - (bal) Minor documentation update to reflect smartcard library
       support changes.

commit 8a725a843d51b4fe43e9653eea5442c368290fe2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 4 22:10:38 2002 +0000

       - markus@cvs.openbsd.org 2002/04/03 09:26:11
         [cipher.c myproposal.h]
         re-add rijndael-cbc@lysator.liu.se for MacSSH; ash@lab.poc.net

commit e683e7643997118ac51b18c073a6aba410c0cc3c
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Apr 4 19:02:28 2002 +0000

     - (stevesk) [auth-pam.c auth-pam.h auth-passwd.c auth-sia.c auth-sia.h
        auth1.c auth2.c] PAM, OSF_SIA password auth cleanup; from djm.

commit af40bc6a72013e9eec74ec99e21dab9342ac9880
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 3 03:36:54 2002 +0000

     - (bal) mispelling in uidswap.c (portable only)

commit 07739fe305472f6755a42d2ab4cd442adf44c8a0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 3 03:03:04 2002 +0000

       - markus@cvs.openbsd.org 2002/04/02 20:11:38
         [ssh-rsa.c]
         ignore SSH_BUG_SIGBLOB for ssh-rsa; #187

commit 2f3d52a2d67b547c5f06676c52396fd8133df32b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 2 21:06:18 2002 +0000

       - markus@cvs.openbsd.org 2002/04/02 17:37:48
         [sftp.c]
         always call log_init()

commit eecdf235310bd3088acc547607452b657dd09f5a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 2 21:03:51 2002 +0000

       - markus@cvs.openbsd.org 2002/04/02 11:49:39
         [ssh-agent.c]
         check $SHELL for -k and -d, too;
         http://bugzilla.mindrot.org/show_bug.cgi?id=199

commit f26ff5b9d86e77596ee1c049c58b0aac394876f3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 2 21:00:31 2002 +0000

       - markus@cvs.openbsd.org 2002/04/01 22:07:17
         [sftp-client.c]
         fallback to stat if server does not support lstat

commit a1d8114044835b1cab463bbcd5752efdedb26675
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 2 20:58:11 2002 +0000

       - markus@cvs.openbsd.org 2002/04/01 22:02:16
         [sftp-client.c]
         20480 is an upper limit for older server

commit 1e259bb0bf07db3b14b534d74641d374f7db54e7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 2 20:53:39 2002 +0000

     - (bal) CVS ID sync of uidswap.c

commit 47fd8112b5ad0e83d895e5be9342b70832ea3075
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 2 20:48:19 2002 +0000

       - markus@cvs.openbsd.org 2002/03/30 18:51:15
         [monitor.c serverloop.c sftp-int.c sftp.c sshd.c]
         check waitpid for EINTR; based on patch from peter@ifm.liu.se

commit 03f3932829d5246d41c26b3d9f9482c618356430
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 2 20:43:11 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/29 19:18:33
         [auth-rsa.c ssh-rsa.c ssh.h]
         make RSA modulus minimum #define; ok markus@

commit 0d0be02a2963db5b4d850bd42c6db1fd2347bb5d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 2 20:39:29 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/29 19:16:22
         [sshd.8]
         RSA key modulus size minimum 768; ok markus@

commit c447fee9f1e45e35bc8ca6d25fba26ad2a098f0d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 2 20:35:35 2002 +0000

       - markus@cvs.openbsd.org 2002/03/29 18:59:32
         [session.c session.h]
         retrieve last login time before the pty is allocated, store per session

commit 2bf56e2dba10e640ad11011c28eb79089443fa92
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 2 20:32:46 2002 +0000

       - markus@cvs.openbsd.org 2002/03/28 15:34:51
         [session.c]
         do not call record_login twice (for use_privsep)

commit 155b981494967883796473c09cce5060fa26abbd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 2 20:26:26 2002 +0000

       - markus@cvs.openbsd.org 2002/03/27 22:21:45
         [ssh-keygen.c]
         try to import keys with extra trailing === (seen with ssh.com < 2.0.12)

commit cdb66e0e82a3c5d80f8445a3074ee77f356dbda8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 2 20:17:43 2002 +0000

     - (bal) Hand Sync of scp.c (reverted to upstream code)
       - deraadt@cvs.openbsd.org 2002/03/30 17:45:46
         [scp.c]
         stretch banners

commit 38c4a28a7e9911b9e3b38a6ad6c9db9cb57cc9f2
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Apr 2 03:24:56 2002 +0000

     - (stevesk) [auth1.c] fix password auth for protocol 1 when
       !USE_PAM && !HAVE_OSF_SIA; merge issue.

commit bd1901b7dc7ba80aae9aa3d6e6be3fb5e8aedb61
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Apr 1 18:04:35 2002 +0000

     - (stevesk) [monitor.c] PAM should work again; will *not* work with
       UsePrivilegeSeparation=yes.

commit c85496222b42d3c30fea50434efbd42c11361427
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Mar 31 12:49:38 2002 -0800

    [sshconnect2.c] change uint32_t to u_int32_t

commit 49e457c43b1c882d7313ae29b843b374b61e61d4
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Mar 31 11:23:06 2002 -0800

    [configure.ac] use /bin/test -L to work around broken builtin on Solaris 8

commit d760f451a457fa3b6255eabf5139f31de391ce54
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Mar 30 20:01:48 2002 +0000

    remove blank line at end of file

commit 117b06dec909c882f57cb553060627048bce4e0d
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Mar 30 17:55:21 2002 +0000

     - (stevesk) [configure.ac] remove header check for sys/ttcompat.h
       bug 167

commit b57a4bf93f02d4012ca28f170938fb7a66e0219b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 27 18:00:59 2002 +0000

       - mouring@cvs.openbsd.org 2002/03/27 11:45:42
         [monitor.c]
         monitor_allowed_key() returns int instead of pointer.  ok markus@

commit 599717246c9c57e6ff895d25d6508de66963f2a3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 27 17:42:57 2002 +0000

       - markus@cvs.openbsd.org 2002/03/26 23:14:51
         [kex.c]
         generate a new cookie for each SSH2_MSG_KEXINIT message we send out

commit e1f9e324e975af50e44ab373e3fa3b1104ffb30f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 27 17:38:43 2002 +0000

       - markus@cvs.openbsd.org 2002/03/26 23:13:03
         [auth-rsa.c]
         disallow RSA keys < 768 for protocol 1, too (rhosts-rsa and rsa auth)

commit 57686a82a5a055f53f3ae351bce21a7a93d38304
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 27 17:36:41 2002 +0000

       - markus@cvs.openbsd.org 2002/03/26 22:50:39
         [channels.h]
         CHANNEL_EFD_OUTPUT_ACTIVE is false for CHAN_CLOSE_RCVD, too

commit 43a5e2f70e3fc38de55b45f580e92b7be84cfa34
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 27 17:33:17 2002 +0000

       - rees@cvs.openbsd.org 2002/03/26 18:46:59
         [scard.c]
         try_AUT0 in read_pubkey too, for those paranoid few who want to acl 'sh'

commit 38a69e6b53ad05b39081f8531104be6d21970d79
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 27 17:28:46 2002 +0000

       - markus@cvs.openbsd.org 2002/03/26 15:58:46
         [readpass.c readpass.h sshconnect2.c]
         client side support for PASSWD_CHANGEREQ

commit cd8bbce80beaea59996d79d3ad91d6f9922257f1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 27 17:23:44 2002 +0000

       - markus@cvs.openbsd.org 2002/03/26 15:23:40
         [bufaux.c]
         do not talk about packets in bufaux

commit eb041dca1f313a1d80952210453058de15761234
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 27 17:20:38 2002 +0000

       - markus@cvs.openbsd.org 2002/03/26 11:37:05
         [ssh.c]
         update Copyright

commit f181384a6b6af9c94c036578674ad7d706cf9579
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 27 17:18:31 2002 +0000

       - markus@cvs.openbsd.org 2002/03/26 11:34:49
         [ssh.1 sshd.8]
         update to recent drafts

commit 53f1830d6a31f646a2476ef5e1d3a7f9c5706d0b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 27 16:50:03 2002 +0000

     - (bal) 'pw' should be 'authctxt->pw' in auth1.c spotted by
       kent@lysator.liu.se

commit 28364ecf4536bbeb1f1d3564de61489ec80f4b93
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 03:42:20 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/26 03:24:01
         [monitor.h monitor_fdpass.h monitor_mm.h monitor_wrap.h]
         $OpenBSD$

commit cf15944c2355f61116d7fb5e793c097dd347284f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 03:26:24 2002 +0000

       - markus@cvs.openbsd.org 2002/03/25 21:13:51
         [channels.c channels.h compat.c compat.h nchan.c]
         don't send stderr data after EOF, accept this from older known (broken)
         sshd servers only, fixes http://bugzilla.mindrot.org/show_bug.cgi?id=179

commit 4f054607f05f18a705579a2475f490ed47e31028
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 03:23:00 2002 +0000

       - markus@cvs.openbsd.org 2002/03/25 21:04:02
         [ssh.c]
         simplify num_identity_files handling

commit c861547f34615e2ae24d42b61279faa6271d37fd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 03:20:45 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/25 20:12:10
         [monitor_mm.c monitor_wrap.c]
         ssize_t args use "%ld" and cast to (long)
         size_t args use "%lu" and cast to (u_long)
         ok markus@ and thanks millert@

commit 0936a5bb7267b0c0d688c2692224ba571caa8a0d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 03:17:42 2002 +0000

       - markus@cvs.openbsd.org 2002/03/25 17:34:27
         [scard.c scard.h ssh-agent.c ssh-keygen.c ssh.c]
         change sc_get_key to sc_get_keys and hide smartcard details in scard.c

commit 5facb2bbc44db97f9a9cb8bf0643b29fede3e151
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 03:08:47 2002 +0000

       - markus@cvs.openbsd.org 2002/03/25 09:25:06
         [auth-rh-rsa.c]
         rm bogus comment

commit f6d367b91a78f91bc876a4c444e185e315244fdb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 02:59:31 2002 +0000

       - markus@cvs.openbsd.org 2002/03/25 09:21:13
         [auth-rsa.c]
         return 0 (not NULL); tomh@po.crl.go.jp

commit 2e9d866608e807bb05f835bbe2b6bdb87cfa7299
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 02:49:34 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/24 23:20:00
         [monitor.c]
         remove "\n" from fatal()

commit c2c6cbc527d86eff97f5f2897f16b5100b340d13
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 02:44:44 2002 +0000

       - markus@cvs.openbsd.org 2002/03/24 18:05:29
         [scard.c]
         we need to figure out AUT0 for sc_private_encrypt, too

commit 31ee7aeb1590431230ccdbb8060c56bd1b32dd1e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 02:36:29 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/24 17:53:16
         [monitor_fdpass.c]
         minor cleanup and more error checking; ok markus@

commit fcad1c92c97de782ab8132e7b6174cc64ef48a89
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 02:20:06 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/24 17:27:03
         [kexgex.c]
         typo; ok markus@

commit 8b08d8115dea89e37f8d12be107fa1c774afbc5a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 02:09:41 2002 +0000

       - markus@cvs.openbsd.org 2002/03/24 16:01:13
         [packet.c]
         debug->debug3 for extra padding

commit 3dc40f997b562dbe48d3a004e85e57068015794a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 02:01:30 2002 +0000

       - markus@cvs.openbsd.org 2002/03/24 16:00:27
         [serverloop.c]
         remove unused debug

commit f90f58d8466de33761e7aec3fca845e83c1d1b43
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 26 01:53:03 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/23 20:57:26
         [sshd.c]
         setproctitle() after preauth child; ok markus@

commit 6205a18f5565845f5b612d1b7bf06e807c900f3c
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Mar 26 00:12:49 2002 +0000

     - (stevesk) import OpenBSD <sys/tree.h> as "openbsd-compat/tree.h"

commit b4799a31a53bcff9d12caa2e366b98c02ddb362d
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Mar 24 23:19:54 2002 +0000

     - (stevesk) [session.c] disable LOGIN_NEEDS_TERM until we are sure
       it can be removed. only used on solaris. will no longer compile with
       privsep shuffling.

commit 4408c2098f41730971dbb723c57bc659443d2c0c
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Mar 23 02:20:07 2002 +0000

     - (stevesk) [LICENCE] OpenBSD sync

commit f29a6539c06a7fb60da79eba861fc61b13d6e793
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Mar 22 13:27:40 2002 -0800

    [cipher.c] fix problem with OpenBSD sync

commit 4435a55a4ba0faa25f39aa883aac9d7d964a1858
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Mar 22 21:08:03 2002 +0000

     - (stevesk) [defines.h] #define MAP_ANON MAP_ANONYMOUS for HP-UX; other
       platforms may need this--I'm not sure.  mmap() issues will need to be
       addressed further.

commit 219bef12c6fcfd0542d261c463eae0124efad93a
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Mar 22 20:53:32 2002 +0000

     - (stevesk) [defines.h] hp-ux 11 has ancillary data style fd passing, but
       is missing CMSG_LEN() and CMSG_SPACE() macros.

commit 205cc1ef461d0c6996dc3757e52e229b5053274b
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Mar 22 20:43:05 2002 +0000

     - (stevesk) [auth2.c] merge cleanup/sync

commit 1adb12077974ba849984df5fd81e3c1bca327a25
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Mar 22 19:32:53 2002 +0000

     - (stevesk) [monitor_fdpass.c] support for access rights style file
       descriptor passing

commit 4846f4ab6989c20db4375440948266b742fa7a1f
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Mar 22 18:19:53 2002 +0000

    - (stevesk) configure and cpp __FUNCTION__ gymnastics to handle nielsisms

commit 7e147607f56648e19a856fd1a1f905635e1f359e
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Mar 22 18:07:17 2002 +0000

     - (stevesk) [monitor.c monitor_wrap.c] #ifdef HAVE_PW_CLASS_IN_PASSWD

commit 939c9db9b1e71fed79edc6d77a2d89ca991f4b2e
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Mar 22 17:23:25 2002 +0000

     - (stevesk) HAVE_ACCRIGHTS_IN_MSGHDR configure support

commit 681d932634983e610421680af6f9759af0f47d06
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:53:00 2002 +0000

       - markus@cvs.openbsd.org 2002/03/21 23:07:37
         [clientloop.c]
         remove unused, sync w/ cmdline patch in my tree.

commit ba72d30aa541015c4e17c21cc1328c7db399d26a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:51:06 2002 +0000

       - rees@cvs.openbsd.org 2002/03/21 22:44:05
         [authfd.c authfd.h ssh-add.c ssh-agent.c ssh.c]
         Add PIN-protection for secret key.

commit 266ec63eb36e2d3154ead355ce67cdee5c9394a3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:47:38 2002 +0000

       - rees@cvs.openbsd.org 2002/03/21 21:54:34
         [scard.c scard.h ssh-keygen.c]
         Add PIN-protection for secret key.

commit 943481cc774d31f5de75c16efbe8f3394e9470ab
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:43:46 2002 +0000

       - markus@cvs.openbsd.org 2002/03/21 21:23:34
         [sshd.c]
         add privsep_preauth() and remove 1 goto; ok provos@

commit fa1336ff47f406c7f705899993a6003405d92975
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:40:58 2002 +0000

       - markus@cvs.openbsd.org 2002/03/21 20:51:12
         [sshd_config]
         add privsep (off)

commit 818659a163197153d511dad9fa524266df5bb86e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:38:35 2002 +0000

       - rees@cvs.openbsd.org 2002/03/21 18:08:15
         [scard.c]
         In sc_put_key(), sc_reader_id should be id.

commit eda98a728dd6fc3a9632cade7711317e9ce97e3d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:35:48 2002 +0000

       - markus@cvs.openbsd.org 2002/03/21 16:58:13
         [clientloop.c]
         remove unused

commit 70e3ad8231c4b93933bd2c9b05cc705c20013186
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:33:43 2002 +0000

       - markus@cvs.openbsd.org 2002/03/21 16:57:15
         [scard.c]
         remove const

commit 0b675b16595b6b84631ab9ebcccb3ecaa311d14e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:28:11 2002 +0000

       - markus@cvs.openbsd.org 2002/03/21 16:38:06
         [scard.c]
         make compile w/ openssl 0.9.7

commit 5589f4b55f6f739acb8a2ff616d54e919e01dba9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:24:32 2002 +0000

       - jakob@cvs.openbsd.org 2002/03/21 15:17:26
         [clientloop.c ssh.1]
         add built-in command line for adding new port forwardings on the fly.
         based on a patch from brian wellington. ok markus@.

commit 58b391b1bdaaea1dc7d8e65e1d3549d16bc323f4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:21:16 2002 +0000

       - markus@cvs.openbsd.org 2002/03/21 10:21:20
         [ssh-add.c]
         ignore errors for nonexisting default keys in ssh-add,
         fixes http://bugzilla.mindrot.org/show_bug.cgi?id=158
    
    Last patch was SUPPOSE to be:
       - stevesk@cvs.openbsd.org 2002/03/20 21:08:08
         [sshd.c]
         strerror() on chdir() fail; ok provos@
    
    But it got co-mingled.  <sigh>  Flog me at will.

commit 1ee9ec32a36e6692dd619e784248768bdd5f853e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:14:45 2002 +0000

       - markus@cvs.openbsd.org 2002/03/21 10:21:20
         [ssh-add.c]
         ignore errors for nonexisting default keys in ssh-add,
         fixes http://bugzilla.mindrot.org/show_bug.cgi?id=158

commit c7431341911e911993776c357ca57d1fb7ed1b23
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:11:49 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/20 19:12:25
         [servconf.c servconf.h ssh.h sshd.c]
         for unprivileged user, group do:
         pw=getpwnam(SSH_PRIVSEP_USER); do_setusercontext(pw).  ok provos@

commit f34e4eb6c730fa38640aeef5f6801035caaba460
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:08:30 2002 +0000

       - markus@cvs.openbsd.org 2002/03/19 15:31:47
         [auth.c]
         check for NULL; from provos@

commit 7ebb635d812d68772ce3fb0b64d798c54fbfab71
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 03:04:08 2002 +0000

       - markus@cvs.openbsd.org 2002/03/19 14:27:39
         [auth.c auth1.c auth2.c]
         make getpwnamallow() allways call pwcopy()

commit 6328ab39891ea64ccd5c91e9be2ec5c4f843bbd0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 02:54:23 2002 +0000

       - markus@cvs.openbsd.org 2002/03/19 10:49:35
         [auth-krb5.c auth-rh-rsa.c auth.c cipher.c key.c misc.h packet.c session.c
          sftp-client.c sftp-glob.h sftp.c ssh-add.c ssh.c sshconnect2.c sshd.c
          ttymodes.c]
         KNF whitespace

commit 08105192fdb9441284ac37e309f6359d74aee596
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 02:50:06 2002 +0000

       - markus@cvs.openbsd.org 2002/03/19 10:35:39
         [auth-options.c auth.h session.c session.h sshd.c]
         clean up prototypes

commit cb1f60efb552d1f12e4a92fdf4939faa18394f27
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 02:47:28 2002 +0000

       - mpech@cvs.openbsd.org 2002/03/19 06:32:56
         [sftp-int.c]
         use xfree() after xstrdup().
    
         markus@ ok

commit 85520a67051b02a8c9975f048227c0531d25b243
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 02:44:40 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/19 05:23:08
         [sshd.8]
         Banner has no default.

commit 7a7edf77ed9e9c982beedb84f2bd384acb7cfcdb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 02:42:37 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/19 03:03:43
         [pathnames.h servconf.c servconf.h sshd.c]
         _PATH_PRIVSEP_CHROOT_DIR; ok provos@

commit 01426a67c86850a06af757c2661409f87ed05414
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 02:40:03 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/18 23:52:51
         [servconf.c]
         UnprivUser/UnprivGroup usable now--specify numeric user/group; ok
         provos@

commit 191c8e5eb92bd482ad7444a4287fea0bae57af25
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 02:37:50 2002 +0000

       - provos@cvs.openbsd.org 2002/03/18 17:59:09
         [sshd.8]
         document UsePrivilegeSeparation

commit 000dda537329dc06e00d28a5c0bd5234d69e1863
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 02:33:12 2002 +0000

       - provos@cvs.openbsd.org 2002/03/18 17:53:08
         [sshd.8]
         credits for privsep

commit 7a2073c50b92c053594d48a651ebafae052a71ed
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 02:30:41 2002 +0000

       - provos@cvs.openbsd.org 2002/03/18 17:50:31
         [auth-bsdauth.c auth-options.c auth-rh-rsa.c auth-rsa.c auth-skey.c auth.h
          auth1.c auth2-chall.c auth2.c kex.c kex.h kexdh.c kexgex.c servconf.c
          session.h servconf.h serverloop.c session.c sshd.c]
         integrate privilege separated openssh; its turned off by default for now.
         work done by me and markus@
    
    applied, but outside of ensure that smaller code bits migrated with
    their owners.. no work was tried to 'fix' it to work. =)  Later project!

commit 0f345f5ee1e71e1e9f8780ec13b2da23b6a9f7f8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:51:24 2002 +0000

       - provos@cvs.openbsd.org 2002/03/18 17:31:54
         [compress.c]
         export compression streams for ssh-privsep

commit 88aa1b45273168af3722b41c45882c6f02445255
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:47:52 2002 +0000

       - provos@cvs.openbsd.org 2002/03/18 17:25:29
         [bufaux.c bufaux.h]
         buffer_skip_string and extra sanity checking; needed by ssh-privsep

commit a674e8df809e0b746cd6ae0490709aad3850bbb8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:45:53 2002 +0000

       - markus@cvs.openbsd.org 2002/03/18 17:23:31
         [key.c key.h]
         add key_demote() for ssh-privsep

commit f6027d3407f8665cc64321bcee8786311a58fa0c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:42:04 2002 +0000

       - markus@cvs.openbsd.org 2002/03/18 17:16:38
         [packet.c packet.h]
         export/import cipher state, iv and ssh2 seqnr; needed by ssh-privsep

commit 212facacdeae1b5c004860500b03ee33dc5a2240
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:39:44 2002 +0000

       - markus@cvs.openbsd.org 2002/03/18 17:13:15
         [cipher.c cipher.h]
         export/import cipher states; needed by ssh-privsep

commit b481e1323e305a0de4934b3341b4f0d5fe759cea
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:35:47 2002 +0000

       - provos@cvs.openbsd.org 2002/03/18 03:41:08
         [auth.c session.c]
         move auth_approval into getpwnamallow with help from millert@

commit abf314406499e53661079f4cb25a74ef1f0a2182
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:30:40 2002 +0000

       - dugsong@cvs.openbsd.org 2002/03/18 01:30:10
         [auth-krb4.c]
         set client to NULL after xfree(), from Rolf Braun
         <rbraun+ssh@andrew.cmu.edu>

commit 73ab9ba45d369ef35b0e81590d5d46cc376466c9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:27:35 2002 +0000

       - provos@cvs.openbsd.org 2002/03/18 01:12:14
         [auth.h auth1.c auth2.c sshd.c]
         have the authentication functions return the authentication context
         and then do_authenticated; okay millert@

commit 2ae18f40a70632eb87eca114980649dae8c476ff
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:24:38 2002 +0000

       - provos@cvs.openbsd.org 2002/03/17 20:25:56
         [auth.c auth.h auth1.c auth2.c]
         getpwnamallow returns struct passwd * only if user valid; okay markus@

commit eacc71b558d29c243ea540c3d6acd2cf6ca15552
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:22:27 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/16 17:41:25
         [auth-krb5.c]
         BSD license.  from Daniel Kouril via Dug Song.  ok markus@

commit 186b7da2d796051dfe2c1fc3acb172aca1f06a82
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:20:32 2002 +0000

       - markus@cvs.openbsd.org 2002/03/16 17:22:09
         [auth-rh-rsa.c auth.h]
         split auth_rhosts_rsa(), ok provos@

commit ce398b2278d345707ad20b76cf2ec770188eecce
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:17:52 2002 +0000

       - markus@cvs.openbsd.org 2002/03/16 11:24:53
         [compress.c]
         skip inflateEnd if inflate fails; ok provos@

commit b61e6df9f3ef2617af9cb81f32ec5256a1185d35
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:15:33 2002 +0000

       - itojun@cvs.openbsd.org 2002/03/15 11:00:38
         [auth.c]
         fix file type checking (use S_ISREG).  ok by markus

commit 9c8aefe7500dad8f78300b2a015c624b9935e372
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:12:58 2002 +0000

       - markus@cvs.openbsd.org 2002/03/14 16:56:33
         [auth-rh-rsa.c auth-rsa.c auth.h]
         split auth_rsa() for better readability and privsep; ok provos@

commit abcb145b38db4996205078d41061ffb2d7c3c017
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:10:21 2002 +0000

       - markus@cvs.openbsd.org 2002/03/14 16:38:26
         [sshd.c]
         split out ssh1 session key decryption; ok provos@

commit 5c15958230492f1f42fedb72337485f908d86a98
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:08:07 2002 +0000

       - markus@cvs.openbsd.org 2002/03/14 15:24:27
         [sshconnect1.c]
         don't trust size sent by (rogue) server; noted by s.esser@e-matters.de

commit 83b79e48dfd954463f8f6d6cdc62b2b63fdcb653
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:05:27 2002 +0000

       - itojun@cvs.openbsd.org 2002/03/11 03:19:53
         [sftp-client.c]
         indent

commit eb50545365a3ec253b61dad4e3f7833a58ec6f16
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:03:15 2002 +0000

       - itojun@cvs.openbsd.org 2002/03/11 03:18:49
         [sftp-client.c]
         correct type mismatches (u_int64_t != unsigned long long)

commit d45f28c11638632c087b125f3c3edb99d723d634
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 22 01:00:57 2002 +0000

       - itojun@cvs.openbsd.org 2002/03/08 06:10:16
         [sftp-client.c]
         printf type mismatch

commit 3a4234699e662e1e611b31829ea898029b66a6f4
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Mar 17 14:05:24 2002 -0800

    [contrib/aix/buildbff.sh contrib/aix/inventory.sh] AIX package
    build fixes.  Patch by Darren Tucker <dtucker@zip.com.au>
    [contrib/solaris/buildpkg.sh] add missing dirs to SYSTEM_DIR. Have
    postinstall check for $piddir and add if necessary.

commit 88f2ab5efb73cdce241b15cf2bf7ae477f8dd3ed
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Mar 17 12:17:34 2002 -0800

    [configure.ac] Assume path given with --with-pid-dir=PATH is wanted,
    warn if directory doesn not exist. Put system directories in front of
    PATH for finding entorpy commands.

commit f831f761250f28ff5537f7bd66c2f6816d67503d
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 13 13:21:54 2002 +1100

    revert more of my stupidity

commit 3a5b0233306a3db3a5db5b9ddc187c55e9b251f4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 13 13:19:42 2002 +1100

    Stupid djm commits experimental code to head instead of branch
    
    revert

commit 3225fb454d0e79cf6f824dd00ff478749620277b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 13 13:11:48 2002 +1100

    That shouldn't be here yet

commit 646e7cf3d7e7d4231c2d97d27c09fe5fe1d749e2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 13 12:47:54 2002 +1100

    Import of Niels Provos' 20020312 ssh-complete.diff
    
    PAM, Cygwin and OSF SIA will not work for sure

commit 29bdd2c9bca2737e7a246ed50fd827a6ccba0c61
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Mar 11 20:55:53 2002 -0800

    [contrib/solaris/buildpkg.sh, contrib/solaris/README] Updated to
    build on all platforms that support SVR4 style package tools. Now runs
    from build dir. Parts are based on patches from Antonio Navarro, and
    Darren Tucker.

commit 4a10d2e90b510dcbb96eb9b86b1122c0c1f72163
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 11 22:53:29 2002 +1100

     - (djm) ssh-keygen -i needs seeded RNG; report from markus@

commit 581930735aa20f9bcff64f0e22f1ee5d409c18af
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Mar 11 00:16:34 2002 +0000

     - (stevesk) entropy.c: typo in debug message

commit c7375ac4668ffb44dc62030dcc508ea1d1012021
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 11 10:51:17 2002 +1100

     - (djm) Add Markus' patch for compat wih OpenSSL < 0.9.6.
       Known issue: Blowfish for SSH1 does not work

commit ff8f94c3e6e6b78036b5f2718f956384987626ed
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 11 10:48:53 2002 +1100

     - (djm) Revert bits of Markus' OpenSSL compat patch which was accidentally
       committed.

commit 784e234c19fc474af3ac3b7f96fa2dcc9f6443be
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 8 03:50:57 2002 +0000

     - (bal) Test for IRIX JOBS support at runtime.  Patch provided
       by David Kaelbling <drk@sgi.com>

commit 7577fd83c16ef3415b61ca1bea1b14e1ab8e4228
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 8 03:11:07 2002 +0000

     - (bal) Add in check for rpc/types.h since it is needed on
       some platforms for INADDR_LOOPBACK.  We should retest
       SCO 3 to see if this fixes their problem also.

commit dc16354aaaba0391b3feb465dba2a5c27ffce9ba
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 7 17:49:39 2002 +0000

     - (bal) Updated INSTALL to reflect 0.9.6 OpenSSL requirement

commit 6e96c88c16f2c3e42f89c1539e528e41d1429067
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 7 13:04:37 2002 +1100

     - (djm) Update RPM spec files with new version number

commit 3fd287240729b3c5a41e24a9d4ac311899cc320a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 7 13:02:19 2002 +1100

       - markus@cvs.openbsd.org 2002/03/06 00:25:55
         [version.h]
         OpenSSH_3.1

commit 4e431d4b8eb6f013c73e9c06c8d9b111507692c4
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 7 12:59:02 2002 +1100

       - markus@cvs.openbsd.org 2002/03/06 00:24:39
         [compat.c]
         compat.c

commit 6d6c5d202f28608c4962c9c50b394b2a37fc1343
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 7 12:58:42 2002 +1100

       - markus@cvs.openbsd.org 2002/03/06 00:23:27
         [compat.c dh.c]
         undo

commit 6ba693f70e3f5b69b5b8a9b43bf4323c601cc097
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 7 12:58:24 2002 +1100

     - OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2002/03/06 00:20:54
         [compat.c dh.c]
         compat.c

commit 399ec97bc2861148dd38708bf7747d59918fb8b2
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Mar 5 18:59:45 2002 +0000

    whitespace sync

commit 664b243ae44c1cb9c9da182e32f8e7254a932cb8
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Mar 5 18:03:10 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/02 09:34:42
         [LICENCE]
         correct copyright dates for scp license; ok markus@

commit 01e7fa13b4b447d1fdf674ad5fbdde1f1cdb9eaa
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 03:38:35 2002 +0000

     - (bal) Added contrib/aix/ to support BFF package generation provided
       by Darren Tucker <dtucker@zip.com.au>

commit 795488785e1e1273c628e25fb91a45e048984bb3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:57:44 2002 +0000

       - markus@cvs.openbsd.org 2002/03/04 19:37:58
         [channels.c]
         off by one; thanks to joost@pine.nl

commit 6b28c35a04069c5b19e541c86e767da5841422d0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:54:52 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/04 18:30:23
         [ssh-keyscan.c]
         handle connection close during read of protocol version string.
         fixes erroneous "bad greeting".  ok markus@

commit 05764b9286940cacd16c3fc585ea082c2ace5ec2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:53:02 2002 +0000

       - stevesk@cvs.openbsd.org 2002/03/04 17:27:39
         [auth-krb5.c auth-options.h auth.h authfd.h authfile.h bufaux.h buffer.h
          channels.h cipher.h compat.h compress.h crc32.h deattack.c getput.h
          groupaccess.c misc.c mpaux.h packet.h readconf.h rsa.h scard.h
          servconf.h ssh-agent.c ssh.h ssh2.h sshpty.h sshtty.c ttymodes.h
          uuencode.c xmalloc.h]
         $OpenBSD$ and RCSID() cleanup: don't use RCSID() in .h files; add
         missing RCSID() to .c files and remove dup /*$OpenBSD$*/ from .c
         files.  ok markus@

commit 84fcb312ffeb80aaee75336bc8ec0bc7551528bb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:48:09 2002 +0000

       - markus@cvs.openbsd.org 2002/03/04 13:10:46
         [misc.c]
         error-> debug, because O_NONBLOCK for /dev/null causes too many different
         errnos; ok stevesk@, deraadt@
         unused include

commit d96c8b3b56364e2e4c69ea05bfb7dbc55e1d763d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:45:56 2002 +0000

       - markus@cvs.openbsd.org 2002/03/04 12:43:06
         [auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
         unused include

commit 3fb5d00ffdaa93a99466858c667e2721cd2b39cb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:42:42 2002 +0000

       - markus@cvs.openbsd.org 2002/03/01 13:12:10
         [auth.c match.c match.h]
         undo the 'delay hostname lookup' change
         match.c must not use compress.c (via canonhost.c/packet.c)
         thanks to wilfried@

commit 6ef9ec6b6ba6d52a16a4e63a75b042f321bcb6fa
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:40:37 2002 +0000

       - stevesk@cvs.openbsd.org 2002/02/28 20:56:00
         [auth.c]
         log user not allowed details, from dwd@bell-labs.com; ok markus@

commit ea03db9dbb019622752c1b4dd141eef1a0462b3d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:38:57 2002 +0000

       - stevesk@cvs.openbsd.org 2002/02/28 20:46:10
         [sshd.8]
         -u0 DNS for user@host

commit 778bf55d89b2b4a5246e805cf38a19f028a038b1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:37:12 2002 +0000

       - stevesk@cvs.openbsd.org 2002/02/28 20:36:42
         [sshd.8]
         DenyUsers allows user@host pattern also

commit 916d83d208d751b9a3605165893370c8d429bba5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:35:23 2002 +0000

       - stevesk@cvs.openbsd.org 2002/02/28 19:36:28
         [auth.c match.c match.h]
         delay hostname lookup until we see a ``@'' in DenyUsers and AllowUsers
         for sshd -u0; ok markus@

commit 80cb27dd7c7caa07615bf375a3bd090085f2d33d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:33:36 2002 +0000

       - markus@cvs.openbsd.org 2002/02/28 15:46:33
         [authfile.c kex.c kexdh.c kexgex.c key.c ssh-dss.c]
         add some const EVP_MD for openssl-0.9.7

commit 733a2351f52f8c8451a61f0ae636081f55b019f7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:31:28 2002 +0000

       - stevesk@cvs.openbsd.org 2002/02/27 21:23:13
         [canohost.c channels.c packet.c sshd.c]
         remove unneeded casts in [gs]etsockopt(); ok markus@

commit e86de51afb891a21b9d5c0a3596b946741876c55
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:28:14 2002 +0000

       - stevesk@cvs.openbsd.org 2002/02/26 20:03:51
         [misc.c]
         use socklen_t

commit 3612bda7fde36d4b5c343ba852d9a627989b7857
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:26:38 2002 +0000

       - deraadt@cvs.openbsd.org 2002/02/26 19:06:43
         [sftp.1]
         no, look closely.  the comma was highlighted. split .Ic even more

commit a48f3681f419d246bb2490fbc3e081791937b8a6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:24:52 2002 +0000

       - mouring@cvs.openbsd.org 2002/02/26 19:04:37
         [sftp.1]
         > Ic cannot have that many arguments; spotted by mouring@etoh.eviladmin.org
         Last Ic on the first line should not have a space between it and the final
         comma.

commit a54f61c1c0e177faaa297fd0f3265b71e18d7f3e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 5 01:23:13 2002 +0000

       - deraadt@cvs.openbsd.org 2002/02/26 18:52:32
         [sftp.1]
         Ic cannot have that many arguments; spotted by mouring@etoh.eviladmin.org

commit 200a5c0581687aa9d8eac2f682121d9965123bb8
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 26 22:12:34 2002 -0800

    correction to sig_atomic_t test

commit 7d2d1f1e67bd021110c9c62c0ffb7a35c54478fc
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 26 22:05:11 2002 -0800

    correction to Bug 123 fix

commit 88c0cd8596148cc7fd6eb5aeaee815604fb234bd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 26 19:24:21 2002 +0000

     - (bal) Imported missing fatal.c and fixed up Makefile.in

commit c58ab02e45216521133703c8c1167af7dcf50f99
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 26 18:15:09 2002 +0000

       - markus@cvs.openbsd.org 2002/02/25 16:33:27
         [ssh-keygen.c sshconnect2.c uuencode.c uuencode.h]
         more u_* fixes

commit 1ebd7a5342a91f8aaa3eabd6c86c7afe8d663cd6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 26 18:12:51 2002 +0000

       - stevesk@cvs.openbsd.org 2002/02/24 19:59:42
         [channels.c misc.c]
         disable Nagle in connect_to() and channel_post_port_listener() (port
         forwarding endpoints).  the intention is to preserve the on-the-wire
         appearance to applications at either end; the applications can then
         enable TCP_NODELAY according to their requirements. ok markus@

commit 90fd814f90a5733584d8c2d877924469ac39d819
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 26 18:09:42 2002 +0000

       - markus@cvs.openbsd.org 2002/02/24 19:14:59
         [auth2.c authfd.c authfd.h authfile.c kexdh.c kexgex.c key.c key.h
          ssh-dss.c ssh-dss.h ssh-keygen.c ssh-rsa.c ssh-rsa.h sshconnect2.c]
         signed vs. unsigned: make size arguments u_int, ok stevesk@

commit e45a2cb2b7da40f81d4dced5dcbd12a23fefd833
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 26 18:07:26 2002 +0000

       - markus@cvs.openbsd.org 2002/02/24 18:31:09
         [uuencode.c]
         typo in comment

commit 4a7714a43a213d2282c2871f24b9b1cbd76f1184
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 26 18:04:38 2002 +0000

       - markus@cvs.openbsd.org 2002/02/24 16:58:32
         [packet.c]
         make 'cp' unsigned and merge with 'ucp'; ok stevesk@

commit 021fcd3a36169ae53b53e9fc7bd2340ee9a5b535
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 26 18:02:43 2002 +0000

      - markus@cvs.openbsd.org 2002/02/24 16:57:19
         [sftp-client.c]
         early close(), missing free; ok stevesk@

commit 13c5d3b37095a990e6ab836ebe6facddc0ac9cff
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 26 18:00:48 2002 +0000

       - stevesk@cvs.openbsd.org 2002/02/24 16:09:52
         [sshd.c]
         use u_char* here; ok markus@

commit 14519086e4d04acec0e0f83e1d31ffdce4419d52
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 26 17:58:29 2002 +0000

       - markus@cvs.openbsd.org 2002/02/23 17:59:02
         [kex.c kexdh.c kexgex.c]
         don't allow garbage after payload.

commit 9c8edc96fcb30cb8a9b0bd87fc1903c6fb618c31
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 26 17:52:14 2002 +0000

       - markus@cvs.openbsd.org 2002/02/22 12:20:34
         [log.c log.h ssh-keyscan.c]
         overwrite fatal() in ssh-keyscan.c; fixes pr 2354; ok provos@

commit 351e9196904bdef86d61d51b8890853b219e5d22
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 26 17:49:55 2002 +0000

     - (bal) Update sshd_config CVSID

commit b855028ff63f81a91e3d97a61701e24c7ea3497e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 26 17:46:11 2002 +0000

       - markus@cvs.openbsd.org 2002/02/15 23:54:10
         [auth-krb5.c]
         krb5_get_err_text() does not like context==NULL; he@nordu.net via google;
         ok provos@

commit a2b9607a86d716f6e0f388825ef1c205ab1f9a75
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Feb 26 16:59:58 2002 +0000

     - (stevesk) openbsd-compat/base64.h: typo in comment

commit 4cec93faed6586dd48b02030b77c094e0730b62e
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Feb 26 08:40:48 2002 -0800

    Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests
    based on patch by mooney@dogbert.cc.ndsu.nodak.edu (Tim Mooney)
    Bug 45 [configure.ac] modify skey test to work around conflict with autoconf
    reported by nolan@naic.edu (Michael Nolan)
    patch by  Pekka Savola <pekkas@netcore.fi>
    Bug 74 [configure.ac defines.h] add sig_atomic_t test
    reported by dwd@bell-labs.com (Dave Dykstra)
    Bug 102 [defines.h] UNICOS fixes. patch by wendyp@cray.com
    [configure.ac Makefile.in] link libwrap only with sshd
    based on patch by Maciej W. Rozycki <macro@ds2.pg.gda.pl>
    Bug 123 link libpam only with sshd
    reported by peak@argo.troja.mff.cuni.cz (Pavel Kankovsky)
    [configure.ac defines.h] modify previous SCO3 fix to not break Solaris 7
    [acconfig.h] remove unused HAVE_REGCOMP

commit c004135b72ff934c2576f8dec4d35d53019bf239
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Feb 25 15:48:02 2002 +0000

     - (bal) Last AIX patch.  Moved aix_usrinfo() outside of do_setuserconext()
       since we need more session information than provided by that function.

commit e06ae4a4bcdb637911a1be6657e2dfa592fd49c8
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Feb 24 17:56:46 2002 -0800

    [loginrec.c session.c sshlogin.c sshlogin.h] Bug 84
    patch by wknox@mitre.org (William Knox).
    [sshlogin.h] declare record_utmp_only for session.c

commit 839ac4f8aaf044e87539d65969163e11f4114461
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Feb 24 20:42:46 2002 +0000

     - (bal) Part two.. Drop unused AIX header, fix up missing char *cp.  All
       that is left is handling aix_usrinfo().

commit 127398c6ec7b306839488df3a8a681dfa711dddd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Feb 24 20:25:46 2002 +0000

     - (bal) Drop Session *s usage in ports-aix.[ch] and pass just what we
       need to do the jobs (AIX still does not fully compile, but that is
       coming).

commit 3107efc12a83e8ae189cc00d92baa4a93424df45
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 21 15:37:02 2002 +0000

    - (bal) Minor session.c for cygwin.  mispelt 'is_winnt' variable.

commit e37f63ffa0610021e8cd8f4fc523e405618c356d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 19 21:58:19 2002 +0000

       - markus@cvs.openbsd.org 2002/02/16 00:51:44
         [session.c]
         typo
     - (bal) CVS ID sync since the last two patches were merged mistakenly

commit 4e97e85c03c893a7f853eccb81f1ed8733355bd4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 19 21:50:43 2002 +0000

     - (bal) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2002/02/15 23:11:26
         [session.c]
         split do_child(), ok mouring@
    
    Compiles under Redhat 7.2.. I cannot give any promises.. but I spent a
    good hour and half ensure all the right bits are in the right spots.. and
    it does seem to help out quite a bit for readiblity.

commit a9c039cf04291cbdb57d4c6200808de9ecb08569
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 19 20:27:55 2002 +0000

     - (bal) Migrated AIX getuserattr and usrinfo code to
       openbsd-compat/port-aix.[c] to improve readilbity of do_child() and
       simplify our diffs against upstream source.

commit f095a8588237010852a3a85f971197a3a5b1d9ae
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 19 20:02:48 2002 +0000

     - (bal) Migrate IRIX jobs/projects/audit/etc code to
       openbsd-compat/port-irix.[ch] to improve readiblity of do_child()

commit 95ca7e9f1f004a8b57183660d744d1433bf508eb
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 15:29:02 2002 +1100

       - deraadt@cvs.openbsd.org 2002/02/19 02:50:59
         [sshd_config]
         stategy is not an english word

commit 85221b281886467c0a647a78b5b744ebc89057ea
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 15:27:23 2002 +1100

       - markus@cvs.openbsd.org 2002/02/18 17:55:20
         [ssh.1]
         -q: Fatal errors are _not_ displayed.

commit 21cf4e0628bc5b372e002916f8b2020d98524a35
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 15:26:42 2002 +1100

       - markus@cvs.openbsd.org 2002/02/18 13:05:32
         [cipher.c cipher.h]
         switch to EVP, ok djm@ deraadt@

commit a93c6d87ef75a23cfbdb30f0a5821ae54300895f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 15:25:29 2002 +1100

       - millert@cvs.openbsd.org 2002/02/17 19:42:32
         [auth.h]
         Manual cleanup of remaining userland __P use (excluding packages
         maintained outside the tree)

commit b0462114834f6673f5bb767cbdafe48dafa8a1e4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 15:24:43 2002 +1100

       - millert@cvs.openbsd.org 2002/02/16 21:27:53
         [auth.h]
         Part one of userland __P removal.  Done with a simple regexp with
         some minor hand editing to make comments line up correctly.  Another
         pass is forthcoming that handles the cases that could not be done
         automatically.

commit 993dd5509408c026f50bc09dc1acd105c84649a8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 15:22:47 2002 +1100

       - stevesk@cvs.openbsd.org 2002/02/16 20:40:08
         [ssh-keygen.c]
         default to rsa keyfile path for non key generation operations where
         keyfile not specified.  fixes core dump in those cases.  ok markus@

commit 55fafa09f2a480e979499e7f5d47572cbbcd70bf
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 15:22:07 2002 +1100

       - stevesk@cvs.openbsd.org 2002/02/16 14:53:37
         [ssh-keygen.1]
         -t required now for key generation

commit 963f6b25e28ff55290ae45f540b7f7148a3622a9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 15:21:23 2002 +1100

       - markus@cvs.openbsd.org 2002/02/14 23:41:01
         [authfile.c cipher.c cipher.h kex.c kex.h packet.c]
         hide some more implementation details of cipher.[ch] and prepares for move
         to EVP, ok deraadt@

commit 19a59451050446bb8656d1b72a8787e97cd1c99b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 15:20:57 2002 +1100

       - markus@cvs.openbsd.org 2002/02/14 23:28:00
         [channels.h session.c ssh.c]
         increase the SSH v2 window size to 4 packets. comsumes a little
         bit more memory for slow receivers but increases througput.

commit 2aa0c1995c1a4c138b7a03fe90e75d6f73eab1f3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 15:20:08 2002 +1100

       - markus@cvs.openbsd.org 2002/02/14 23:27:59
         [channels.c]
         increase the SSH v2 window size to 4 packets. comsumes a little
         bit more memory for slow receivers but increases througput.

commit 7af3d10588830daeb31f1d53663df95bad26356c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 19 15:19:42 2002 +1100

       - mpech@cvs.openbsd.org 2002/02/13 08:33:47
         [ssh-keyscan.1]
         When you give command examples and etc., in a manual page prefix them with:     $ command
         or
         # command

commit 92c1fc41fec1b40bcac3f7da025bd919004bc195
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Feb 18 15:18:56 2002 -0800

    newer config.guess from ftp://ftp.gnu.org/gnu/config/config.guess

commit 7217b3e69758624c37a155ac7d162fad7b58a2f9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 14 20:43:08 2002 +1100

    oops, remove some debugging junk that crept in

commit 72476d4b24afb0a03e99c75427cfbd63d243bc12
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 14 20:39:49 2002 +1100

     - (djm) Bug #114 - not starting PAM for SSH protocol 1 invalid users

commit d054b07cc9d01a8891a48877e236f5aad552f9da
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 14 08:44:04 2002 +1100

     - (djm) Don't use system sys/queue.h on AIX. Report from gert@greenie.muc.de

commit 57e3fa8c957fb2f991dbe90f38c6717870d5d5df
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Feb 13 10:14:52 2002 -0800

    Add rpc/rpc.h for INADDR_LOOPBACK on SCO OSR3

commit 150c8b557892f21ca87c5d36865d00724712c6a9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 23:06:56 2002 +1100

     - (djm) Bug #106: Add --without-rpath configure option. Patch from
       Nicolas.Williams@ubsw.com

commit db95e4e1078cf1a8468ed7c245978ebd2ee5a979
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 16:56:44 2002 +1100

    sync - don't know when this got out of sync

commit 6448ec6b1a4a91817d7aabb99174cb902b9d250c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 16:48:45 2002 +1100

    sync

commit 89a1b9f908dc75ba2176d716af8e8abc8f9a4742
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 16:43:52 2002 +1100

    unbreak

commit 8e3bdca1da7d30542e9028f35f2a1cef052c85e4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 16:00:15 2002 +1100

     - (djm) Sync openbsd-compat with OpenBSD CVS too

commit 3db5f530d0fdf8044d6014ab12940efe0bbecca7
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 14:10:32 2002 +1100

       - djm@cvs.openbsd.org 2002/02/13 00:59:23
         [sftp-client.c sftp-client.h sftp-glob.c sftp-glob.h sftp.h]
         [sftp-int.c sftp-int.h]
         API cleanup and backwards compat for filexfer v.0 servers; ok markus@

commit 3606ee29388781894e6374030d0e40fa46da4cf9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 14:05:23 2002 +1100

       - markus@cvs.openbsd.org 2002/02/13 00:39:15
         [readpass.c]
         readpass.c is not longer from UCB, since we now use readpassphrase(3)

commit 00c9217558c23bbde7567dd996c5686f473869c2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 14:05:00 2002 +1100

       - markus@cvs.openbsd.org 2002/02/13 00:28:13
         [sftp-server.c]
         handle SSH2_FILEXFER_ATTR_SIZE in SSH2_FXP_(F)SETSTAT; ok djm@

commit 5873dfd829558cd3fdeb56f22c893b3fdc8e87c9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 14:04:37 2002 +1100

       - djm@cvs.openbsd.org 2002/02/12 12:44:46
         [sftp-client.c]
         Let overlapped upload path handle servers which reorder ACKs. This may be
         permitted by the protocol spec; ok markus@

commit 16a133339a40396064effee3de55f6b2a887d3d2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 14:03:56 2002 +1100

       - djm@cvs.openbsd.org 2002/02/12 12:32:27
         [sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c]
         Perform multiple overlapping read/write requests in file transfer. Mostly
         done by Tobias Ringstrom <tori@ringstrom.mine.nu>; ok markus@

commit afc7a5d7741ad59a2efe2db6b928c89bf0928098
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 13:55:30 2002 +1100

       - markus@cvs.openbsd.org 2002/02/11 16:21:42
         [match.c]
         support up to 40 algorithms per proposal

commit 6a47f30c55ac5edc984f6c914379d1f0ff2c0cef
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 13:55:06 2002 +1100

       - markus@cvs.openbsd.org 2002/02/11 16:19:39
         [sshd.c]
         include md5.h not hmac.h

commit 654c03fd064618e3577d098837108263f4e5457a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 13:54:44 2002 +1100

       - markus@cvs.openbsd.org 2002/02/11 16:17:55
         [sshd.c]
         do not complain about port > 1024 if rhosts-auth is disabled

commit 2ce18dabf3fff6c83dd555b0f7b92d9e949e9b66
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 13:54:27 2002 +1100

       - markus@cvs.openbsd.org 2002/02/11 16:15:46
         [sshconnect1.c]
         include md5.h, not evp.h

commit bc27d4e987caa3a9d9bb965883f6f551317ddf02
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 13 13:54:06 2002 +1100

       - markus@cvs.openbsd.org 2002/02/11 16:10:15
         [kex.c]
         restore kexinit handler if we reset the dispatcher, this unbreaks rekeying
         s/kex_clear_dispatch/kex_reset_dispatch/

commit afcc22542e97b2a8893b11a8c3f799ef95db9319
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 18:32:55 2002 +1100

       - deraadt@cvs.openbsd.org 2002/02/10 01:07:05
         [readconf.h sshd.8]
         more /etc/ssh; openbsd@davidkrause.com

commit 05eda437a64020e8d8a824bb1ae102603f59efb9
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 10 18:32:28 2002 +1100

     - (djm) OpenBSD CVS Sync
       - deraadt@cvs.openbsd.org 2002/02/09 17:37:34
         [pathnames.h session.c ssh.1 sshd.8 sshd_config ssh-keyscan.1]
         move ssh config files to /etc/ssh
     - (djm) Adjust portable Makefile.in tnd ssh-rand-helper.c o match

commit 486065084237f5f8ea32d28832586c2dfa1d7307
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 8 22:07:33 2002 +1100

       - markus@cvs.openbsd.org 2002/02/07 09:35:39
         [ssh.c]
         remove bogus comments

commit 699d003e3a7cddaa1dddc4c1a35428066316748e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 8 22:07:16 2002 +1100

       - markus@cvs.openbsd.org 2002/02/06 14:55:16
         [channels.c clientloop.c serverloop.c ssh.c]
         channel_new never returns NULL, mouring@; ok djm@

commit f3dcf1fc88a55a916ace325e252c6f75ff53b71b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 8 22:06:48 2002 +1100

       - markus@cvs.openbsd.org 2002/02/06 14:37:22
         [session.c]
         minor KNF

commit 025e01c7f0afe5cb25a57c829137a55a9d1f4352
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 8 22:06:29 2002 +1100

       - mpech@cvs.openbsd.org 2002/02/06 14:27:23
         [sftp.c]
         sync usage() with manual.

commit 81b6e787a0e7f2cdef45f17f9237f02eb372bf57
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 8 22:06:03 2002 +1100

       - markus@cvs.openbsd.org 2002/02/06 14:22:42
         [sftp.1]
         sort options; ok mpech@, stevesk@

commit c653b89b5af165fd7560a3dbdead96415e7a8633
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 8 22:05:41 2002 +1100

       - stevesk@cvs.openbsd.org 2002/02/05 15:50:12
         [ssh-agent.c]
         use log interface and remove perror() in child.  use
         fatal_add_cleanup() vs. atexit().  ok mouring@ markus@

commit a500cd608eb505c41fca079433721d46a02e8e1a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 8 22:04:26 2002 +1100

       - markus@cvs.openbsd.org 2002/02/05 14:32:55
         [channels.c channels.h ssh.c]
         merge channel_request() into channel_request_start()

commit 8829d3669d154dbd06f9ee2cc779f14e2af8e15f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 8 22:04:05 2002 +1100

       - djm@cvs.openbsd.org 2002/02/05 00:00:46
         [sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c]
         Add "-B" option to specify copy buffer length (default 32k); ok markus@

commit e8c9ed436a23d0fdbad1881092a3f9d2e7d5f822
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 8 22:02:16 2002 +1100

       - stevesk@cvs.openbsd.org 2002/02/04 20:41:16
         [ssh-agent.1]
         more sync for default ssh-add identities; ok markus@

commit 5aa5d78e40da7a1f731082a6b3b1e0b97dbe4da0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 8 22:01:54 2002 +1100

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2002/02/04 12:15:25
         [sshd.c]
         add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1,
         fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@

commit f3451a21819fbcf7a598d202f19329e03e2e5286
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:40:46 2002 +1100

     - (djm) Cleanup after sync:
       - :%s/reverse_mapping_check/verify_reverse_mapping/g

commit cb8ea157b8cd234fff302b9f837b860790000d6f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:27:58 2002 +1100

       - djm@cvs.openbsd.org 2002/02/05 00:00:46
         [sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c]
         Add "-B" option to specify copy buffer length (default 32k); ok markus@

commit d14ee1e29c73c79a120f129c84a89158e8dff936
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:27:31 2002 +1100

       - djm@cvs.openbsd.org 2002/02/04 21:53:12
         [sftp.1 sftp.c]
         Add "-P" option to directly connect to a local sftp-server. Should be useful
         for regression testing; ok markus@

commit ab57f351147ff8c1fb1ca5320f11674bd918d66d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:26:58 2002 +1100

       - stevesk@cvs.openbsd.org 2002/02/04 20:41:16
         [ssh-add.1]
         more sync for default ssh-add identities; ok markus@

commit fcd9320440c7eb2758659ec2ac19b99054e43044
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:26:34 2002 +1100

       - markus@cvs.openbsd.org 2002/02/04 12:15:25
         [log.c log.h readconf.c servconf.c]
         add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1,
         fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@

commit 9b74bfc5be938d1bf5012c997c463b621c4fbffd
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:26:03 2002 +1100

       - markus@cvs.openbsd.org 2002/02/04 11:58:10
         [auth2.c]
         cross checking of announced vs actual pktype in pubkey/hostbaed auth; ok stevesk@

commit 4d4d53f39951373505b0b3be915860e621d18a9e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:25:28 2002 +1100

       - stevesk@cvs.openbsd.org 2002/02/04 00:53:39
         [ssh-agent.c]
         unneeded includes

commit d2b8f1657e3ef8d892bcc4fc3857f216c1ca4127
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:24:19 2002 +1100

       - stevesk@cvs.openbsd.org 2002/02/03 23:22:59
         [ssh-agent.1]
         ssh-add also adds $HOME/.ssh/id_rsa and $HOME/.ssh/id_dsa now.

commit 9749c0c97288c2fa92882754f5069ba7c741af1a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:23:58 2002 +1100

       - stevesk@cvs.openbsd.org 2002/02/03 22:35:57
         [ssh.1 sshd.8]
         some KeepAlive cleanup/clarify; ok markus@

commit 68f45983b29ea1bb70cfe0affd8806c93e2a02e7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:23:32 2002 +1100

       - markus@cvs.openbsd.org 2002/02/03 17:59:23
         [sshconnect2.c]
         more cross checking if announced vs. used key type; ok stevesk@

commit 67f0bc043c2d3b4edd1d0cabb10cf3f10f544fb5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:23:08 2002 +1100

       - markus@cvs.openbsd.org 2002/02/03 17:58:21
         [channels.c channels.h ssh.c]
         generic callbacks are not really used, remove and
         add a callback for msg of type SSH2_MSG_CHANNEL_OPEN_CONFIRMATION
         ok djm@

commit 50e884d12512ddb500c09ac3dbad67094fe93f09
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:22:08 2002 +1100

       - markus@cvs.openbsd.org 2002/02/03 17:55:55
         [channels.c channels.h]
         remove unused channel_input_channel_request

commit c7ef63dd41aa3880271c5ec5f61dc38e6d74f900
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:21:42 2002 +1100

       - markus@cvs.openbsd.org 2002/02/03 17:53:25
         [auth1.c serverloop.c session.c session.h]
         don't use channel_input_channel_request and callback
         use new server_input_channel_req() instead:
            server_input_channel_req does generic request parsing on server side
            session_input_channel_req handles just session specific things now
         ok djm@

commit 664d6b9a8eb4519f3a7f7658886f5745a943d3ef
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:20:16 2002 +1100

       - markus@cvs.openbsd.org 2002/01/31 15:00:05
         [serverloop.c]
         no need for WNOHANG; ok stevesk@

commit 9ab47eeb229761173ce5da5b4976d9ea9a7b75e4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:19:52 2002 +1100

       - markus@cvs.openbsd.org 2002/01/31 13:35:11
         [kexdh.c kexgex.c]
         cross check announced key type and type from key blob

commit 07a2d429b2aafe273056f71ab150456fe3ff31ef
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:16:15 2002 +1100

       - markus@cvs.openbsd.org 2002/01/29 23:50:37
         [scp.1 ssh.1]
         mention exit status; ok stevesk@

commit 5fab4b9b1d4f3ca90ebb0d9e521430201a706646
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:15:07 2002 +1100

       - markus@cvs.openbsd.org 2002/01/29 22:46:41
         [session.c]
         don't depend on servconf.c; ok djm@

commit c313be27565a06282f4f331d639b588881f7715c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:14:41 2002 +1100

       - markus@cvs.openbsd.org 2002/01/29 16:41:19
         [ssh-add.1]
         add DIAGNOSTICS; ok stevesk@

commit baa08708524a45fa45e3e0ad612fa1f4f4c5a4d3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:14:10 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/29 16:29:02
         [session.c]
         limit subsystem length in log; ok markus@

commit c5d8635d6a9425289bd0cbfa83b90a4e42e6a72a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:13:41 2002 +1100

       - markus@cvs.openbsd.org 2002/01/29 14:32:03
         [auth2.c auth.c auth-options.c auth-rhosts.c auth-rh-rsa.c canohost.c servconf.c servconf.h session.c sshd.8 sshd_config]
         s/ReverseMappingCheck/VerifyReverseMapping/ and avoid confusion; ok stevesk@

commit 43cba34b649a2df8c170e17a5655d060830a386e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:12:49 2002 +1100

       - markus@cvs.openbsd.org 2002/01/29 14:27:57
         [ssh-add.c]
         exit 2 if no agent, exit 1 if list fails; debian#61078; ok djm@

commit 35b13d633b542b38645f476440829cbabe6a3102
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:12:09 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/27 18:08:17
         [ssh.c]
         handle simple case to identify FamilyLocal display; ok markus@

commit 95c249ff475a9e0c15a4a8fcc9668f8dddb0a6c3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:11:34 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/27 14:57:46
         [channels.c servconf.c servconf.h session.c sshd.8 sshd_config]
         add X11UseLocalhost; ok markus@

commit 512bccbb5a7d4c2a8fc53dad17f4a6f7a07b0474
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 12:11:02 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/26 16:44:22
         [includes.h session.c]
         revert code to add x11 localhost display authorization entry for
         hostname/unix:d and uts.nodename/unix:d if nodename was different than
         hostname.  just add entry for unix:d instead.  ok markus@

commit 3672e4bc7ac19798f169ac7374c77a460d080e4a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 11:54:07 2002 +1100

       - markus@cvs.openbsd.org 2002/01/25 22:07:40
         [kex.c kexdh.c kexgex.c key.c mac.c]
         use EVP_MD_size(evp_md) and not evp_md->md_size; ok steveks@

commit c516e928cdaf2ea3dd666a79d4c89a942b242d68
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 11:53:43 2002 +1100

       - markus@cvs.openbsd.org 2002/01/25 21:42:11
         [ssh-dss.c ssh-rsa.c]
         use static EVP_MAX_MD_SIZE buffers for EVP_DigestFinal; ok stevesk@
         don't use evp_md->md_size, it's not public.

commit 3a8262ffcc04afca626d457da65fc1076681073c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 11:53:15 2002 +1100

       - markus@cvs.openbsd.org 2002/01/25 21:00:24
         [sshconnect2.c]
         unused include

commit 4d007769bfa3e77c4ce5f964220ea262e9a1e69a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 11:52:54 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/24 21:13:23
         [packet.c]
         need misc.h for set_nodelay()

commit 398e1cfa23843c8a54864b00384ea84e669dd6d9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 5 11:52:13 2002 +1100

     - (djm) OpenBSD CVS Sync
       - stevesk@cvs.openbsd.org 2002/01/24 21:09:25
         [channels.c misc.c misc.h packet.c]
         add set_nodelay() to set TCP_NODELAY on a socket (prep for nagle tuning).
         no nagle changes just yet; ok djm@ markus@

commit 1e2c600892c322e3c117bc111f0f8fbdce757a69
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jan 30 22:14:03 2002 -0800

    [configure.ac] fix logic on when ssh-rand-helper is installed.
    [sshd_config] put back in line that tells what PATH was compiled into sshd.

commit 8eb71417584914688f89a77170642c8ce58b1a3e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 30 09:37:06 2002 +1100

     - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@

commit f1cec392edfe74c434ea9c5ac6e95d0a472bd2ac
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 26 17:45:15 2002 +1100

    Fix spec file version numbers

commit 6677d419deafe76268aadb417a64db64edca73d7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 25 00:59:25 2002 +1100

     - (djm) Don't grab Xserver or pointer by default. x11-ssh-askpass doesn't
       and grabbing can cause deadlocks with kinput2.

commit 414642b26f2ab3b55786ce23da10166aae026211
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 25 00:46:04 2002 +1100

     - (djm) Don't grab Xserver by default. x11-ssh-askpass doesn't and grabbing
       can cause deadlocks with kinput2

commit 020daf437b97c4d55268353737861fac60e6a073
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jan 23 23:26:43 2002 +0000

     - (stevesk) Makefile.in: bug #61; delete commented line for now.

commit fa9b641eb069ec8a89315a4cee4c585b91474afe
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jan 23 06:54:30 2002 +0000

     - (bal) reverted out of 5/2001 change to atexit().  I assume I
       did it to handle SonyOS.  If that is the case than we will
       do a special case for them.

commit e996d72e025c7663df6fe985a9266eb45df08459
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 23 11:20:59 2002 +1100

     - (djm) Use case statements in autoconf to clean up some tests

commit 7dc8197f8bd6ad7989781604efee4536a271a29a
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Jan 22 21:59:31 2002 +0000

     - (stevesk) fix --with-zlib=

commit 6385ba0228516f937a0cd2322e9e064eeb68d856
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 23 08:12:36 2002 +1100

     - (djm) Fix non-standard shell syntax in autoconf. Patch from
       Dave Dykstra <dwd@bell-labs.com>

commit ec52d7c0939569a5fa1ce531643da66508434486
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:52:17 2002 +1100

     - (djm) Use local sys/queue.h if necessary in ssh-agent.c

commit 28e4d8f87b9bdee4c91187f6d959b4c0124cd30b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:51:42 2002 +1100

    - (djm) Recent Glibc includes an incompatible sys/queue.h. Treat it as
      bogus in configure

commit 1fc2343e3523f4e018d9fdf3ed9959b3c2983b9f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:43:12 2002 +1100

    - (djm) Make auth2-pam.c compile again after dispatch.h and packet.h
      changes

commit 4fbf08a8f0cf54a2e75cd003a32cf3c04c5642e6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:35:09 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/22 02:52:41
         [servconf.c]
         typo in error message; from djast@cs.toronto.edu

commit 73f1074272add17aeaaff10c5ec6ab310e513d9d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:34:52 2002 +1100

       - markus@cvs.openbsd.org 2002/01/21 23:27:10
         [channels.c nchan.c]
         cleanup channels faster if the are empty and we are in drain-state; ok deraadt@

commit 914bef437e7b80da027116e140e41746dafc45ee
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:34:35 2002 +1100

       - markus@cvs.openbsd.org 2002/01/21 22:30:12
         [cipher.c compat.c myproposal.h]
         remove "rijndael-*", just use "aes-" since this how rijndael is called
         in the drafts; ok stevesk@

commit 49d795c647fb4c0d2dcbb3a5fcfe109984cdac15
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:34:12 2002 +1100

       - markus@cvs.openbsd.org 2002/01/21 15:13:51
         [sshconnect.c]
         use read_passphrase+ECHO in confirm(), allows use of ssh-askpass
         for hostkey confirm.

commit df64a682f17fc12ca0ae80e6331cbb89b77bd35b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:33:45 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/18 20:46:34
         [sshd.8]
         clarify Allow(Groups|Users) and Deny(Groups|Users); suggestion from
         allard@oceanpark.com; ok markus@

commit 4a8ed543612c99700788d87fe18081d5df4b37c6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:33:31 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/18 18:14:17
         [authfd.c bufaux.c buffer.c cipher.c packet.c ssh-agent.c ssh-keygen.c]
         unneeded cast cleanup; ok markus@

commit 9c3f9505d9401a7af93098a59f3979e4608cde50
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:33:15 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/18 17:14:16
         [sshd.8]
         correct Ciphers default; paola.mannaro@ubs.com

commit 5488b7ec4edc06e344f899933cab615d7b925b70
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:32:57 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/17 04:27:37
         [log.c]
         casts to silence enum type warnings for bugzilla bug 37; ok markus@

commit c497e38ce626a35f68844c7667adae6434be7d6c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:32:39 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/16 17:55:33
         [ssh_config]
         correct some commented defaults.  add Ciphers default.  ok markus@

commit fae2386cc91673f4c387f58278b36ad952b7ad65
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:32:26 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/16 17:42:33
         [ssh.1]
         correct defaults for -i/IdentityFile; ok markus@

commit 2bec5c1543aa797faa5b8abfd995a05a2f52323d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:32:07 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/16 17:40:23
         [sshd_config]
         The stategy now used for options in the default sshd_config shipped
         with OpenSSH is to specify options with their default value where
         possible, but leave them commented.  Uncommented options change a
         default value.  Subsystem is currently the only default option
         changed.  ok markus@

commit b16461ce452a53f99b445fae0f935d16cdc104cb
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:29:22 2002 +1100

       - markus@cvs.openbsd.org 2002/01/16 13:17:51
         [channels.c channels.h serverloop.c ssh.c]
         wrapper for channel_setup_fwd_listener

commit b51ed391618d5c5ac5b7950a4743f45d5cf5898e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:29:03 2002 +1100

       - markus@cvs.openbsd.org 2002/01/14 13:57:03
         [channels.h nchan.c]
         (c) 2002

commit 5144df92616ff8ed4fa3aa709651333c09d850b4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:28:45 2002 +1100

       - markus@cvs.openbsd.org 2002/01/14 13:55:55
         [channels.c channels.h nchan.c]
         remove function pointers for events, remove chan_init*; ok provos@

commit 472d05716adc8e06076551febe5ead3b1e3a67dc
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:28:28 2002 +1100

       - markus@cvs.openbsd.org 2002/01/14 13:41:13
         [nchan.c]
         remove duplicated code; ok provos@

commit ebc11d30121c53316e5119ce3dfd0844dfcd0002
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:28:13 2002 +1100

       - markus@cvs.openbsd.org 2002/01/14 13:40:10
         [nchan.c]
         correct fn names for ssh2, do not switch from closed to closed; ok provos@

commit fcfc43b617e707a7f073c0241029341ed0ebe211
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:27:45 2002 +1100

       - markus@cvs.openbsd.org 2002/01/14 13:34:07
         [nchan.c]
         merge chan_[io]buf_empty[12]; ok provos@

commit 89a9232e414e7777d500a944a3fe7639d5e6c60f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:27:28 2002 +1100

       - markus@cvs.openbsd.org 2002/01/14 13:22:35
         [nchan.c]
         chan_send_oclose1() no longer calls chan_shutdown_write(); ok provos@

commit abea8ee1c3bd404fdab316f359061a1fd3292099
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:27:11 2002 +1100

       - markus@cvs.openbsd.org 2002/01/13 21:31:20
         [channels.h nchan.c]
         add chan_set_[io]state(), order states, state is now an u_int,
         simplifies debugging messages; ok provos@

commit 0e3b87279c3f20630e616b4de1be7cae815682dd
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:26:38 2002 +1100

       - markus@cvs.openbsd.org 2002/01/13 17:57:37
         [auth2.c auth2-chall.c compat.c sshconnect2.c sshd.c]
         use buffer API and avoid static strings of fixed size; ok provos@/mouring@

commit 1a534ae97fc1d9e75384d8df44fef7f788c3629d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:26:13 2002 +1100

       - provos@cvs.openbsd.org 2002/01/13 17:27:07
         [ssh-agent.c]
         change to use queue.h macros; okay markus@

commit df224031ca59175e021c9b0084060fb9a909f31e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:25:46 2002 +1100

       - markus@cvs.openbsd.org 2002/01/12 13:10:29
         [auth-skey.c]
         undo local change

commit 73f18346bc1d8ab6f069e8add07af7f6851765e4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:25:30 2002 +1100

       - markus@cvs.openbsd.org 2002/01/11 23:26:30
         [auth-skey.c]
         use snprintf; mouring@

commit 209ee4e3680d1a965cf42b0c13068536a4984fd0
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:25:08 2002 +1100

       - markus@cvs.openbsd.org 2002/01/11 23:02:51
         [auth2-chall.c]
         use snprintf; mouring@

commit 85830d1dc0b4728f26596ee1e1c901cd1ddd24e5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:24:51 2002 +1100

       - markus@cvs.openbsd.org 2002/01/11 23:02:18
         [readpass.c]
         use _PATH_TTY

commit a5ebe0c39d30ce6c22bf152c638ea753c531ecb2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:24:33 2002 +1100

       - markus@cvs.openbsd.org 2002/01/11 20:14:11
         [auth2-chall.c auth-skey.c]
         use strlcpy not strlcat; mouring@

commit 7d05339c709efbf699e0dae499308428174a0da4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:24:13 2002 +1100

       - markus@cvs.openbsd.org 2002/01/11 13:39:36
         [auth2.c dispatch.c dispatch.h kex.c]
         a single dispatch_protocol_error() that sends a message of type 'UNIMPLEMENTED'
         dispatch_range(): set handler for a ranges message types
         use dispatch_protocol_ignore() for authentication requests after
            successful authentication (the drafts requirement).
         serverloop/clientloop now send a 'UNIMPLEMENTED' message instead of exiting.

commit 84b8ab3eeef42818e20d2b46627245fe450082ab
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:23:41 2002 +1100

       - markus@cvs.openbsd.org 2002/01/11 13:36:43
         [ssh2.h]
         add defines for msg type ranges

commit 659811f7fca35260b97352b632e0c9ca4d5d7979
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:23:11 2002 +1100

       - markus@cvs.openbsd.org 2002/01/11 10:31:05
         [packet.c]
         handle received SSH2_MSG_UNIMPLEMENTED messages; ok djm@

commit 66ac6a43a8d73dd72da4639e79b37241b01b61bd
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:22:44 2002 +1100

       - markus@cvs.openbsd.org 2002/01/10 12:47:59
         [nchan.c]
         more unused code (with channels.c:1.156)

commit 4ce25952597aa5a6daabc5a1f55133b86e358fb2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:22:20 2002 +1100

       - markus@cvs.openbsd.org 2002/01/10 12:38:26
         [nchan.c]
         remove dead code (skip drain)

commit c3fa407073d92fe11efb0c07c4d9da4720289ce7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:21:58 2002 +1100

       - markus@cvs.openbsd.org 2002/01/10 11:24:04
         [clientloop.c]
         handle SSH2_MSG_GLOBAL_REQUEST (just reply with failure); ok djm@

commit 056cf73d35e36521f5d8c9e799f1d21c6976d99c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:21:39 2002 +1100

       - markus@cvs.openbsd.org 2002/01/10 11:13:29
         [serverloop.c]
         skip client_alive_check until there are channels; ok beck@

commit 76765c0b1ad147f747f088a37ae120413108356f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:21:15 2002 +1100

       - markus@cvs.openbsd.org 2002/01/09 17:26:35
         [channels.c nchan.c]
         replace buffer_consume(b, buffer_len(b)) with buffer_clear(b); ok provos@

commit de6987c2b935871fd93d502d8a36a6e734667824
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:20:40 2002 +1100

       - markus@cvs.openbsd.org 2002/01/09 17:16:00
         [channels.c]
         merge channel_pre_open_15/channel_pre_open_20; ok provos@

commit a1db12bac433cb4caaf12fac18d3ee7cdb78d18c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:20:15 2002 +1100

       - markus@cvs.openbsd.org 2002/01/09 13:49:27
         [ssh-keygen.c]
         append \n only for public keys

commit 70972eb388575578955a8f0e4d3f85e231d3fb7e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:19:55 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/05 21:51:56
         [ssh.1 sshd.8]
         some missing and misplaced periods

commit a90fc08b88eeb08f907d9e3ba2f9a03420af39ae
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:19:38 2002 +1100

       - markus@cvs.openbsd.org 2002/01/05 10:43:40
         [channels.c]
         fix hanging x11 channels for rejected cookies (e.g. XAUTHORITY=/dev/null xbiff)
         bug #36, based on patch from djast@cs.toronto.edu

commit 7fc2373f17b9a06e4ba43a7178ae6b5dbebe80e8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:19:11 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/04 18:14:16
         [servconf.c sshd.8]
         protocol 2 HostKey code default is now /etc/ssh_host_rsa_key and
         /etc/ssh_host_dsa_key like we have in sshd_config.  ok markus@

commit f51b0e1a3017bbd5ea06358e6e539bd71bfa65c8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:18:49 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/04 17:59:17
         [readconf.c servconf.c]
         remove #ifdef _PATH_XAUTH/#endif; ok markus@

commit 56ccf41de20249d84a67dc17b74e71e10fac8b3e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:18:32 2002 +1100

       - stevesk@cvs.openbsd.org 2002/01/03 04:11:08
         [ssh_config]
         grammar in comment

commit 708d21c8028ed2bf137a0c4ff75bf7c6bfeff6e9
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:18:15 2002 +1100

       - stevesk@cvs.openbsd.org 2001/12/29 21:56:01
         [authfile.c channels.c compress.c packet.c sftp-server.c ssh-agent.c ssh-keygen.c]
         remove unneeded casts and some char->u_char cleanup; ok markus@

commit dc9e067614947f2f2b0866cb1bc75e6ac620fb7f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:17:51 2002 +1100

       - stevesk@cvs.openbsd.org 2001/12/28 22:37:48
         [ssh.1 sshd.8]
         document LogLevel DEBUG[123]; ok markus@

commit 630d6f4479df4084ef05ce233c11e66c68a98a4f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:17:30 2002 +1100

       - markus@cvs.openbsd.org 2001/12/28 15:06:00
         [auth2.c auth2-chall.c channels.c channels.h clientloop.c dispatch.c dispatch.h kex.c kex.h serverloop.c ssh.c sshconnect2.c]
         remove plen from the dispatch fn. it's no longer used.

commit dff5099f13e2e679b93d3cfe7073c9cd92b19b06
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:16:32 2002 +1100

       - markus@cvs.openbsd.org 2001/12/28 14:50:54
         [auth1.c auth-rsa.c channels.c dispatch.c kex.c kexdh.c kexgex.c packet.c packet.h serverloop.c session.c ssh.c sshconnect1.c sshconnect2.c sshd.c]
         packet_read* no longer return the packet length, since it's not used.

commit 76e1e368b561cabeb55c21dc205c3f6805179ad5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:15:57 2002 +1100

       - markus@cvs.openbsd.org 2001/12/28 14:13:13
         [bufaux.c bufaux.h packet.c]
         buffer_get_bignum: int -> void

commit d432ccf7403b725fce590818a85804625b7cad20
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:14:44 2002 +1100

       - markus@cvs.openbsd.org 2001/12/28 13:57:33
         [auth1.c kexdh.c kexgex.c packet.c packet.h sshconnect1.c sshd.c]
         packet_get_bignum* no longer returns a size

commit 29f75f5c25b9645227fe851c46f54bc83c91a0af
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:14:10 2002 +1100

    oops, that last commit was really:
       - markus@cvs.openbsd.org 2001/12/28 12:14:27
         [auth1.c auth2.c auth2-chall.c auth-rsa.c channels.c clientloop.c kex.c kexdh.c kexgex.c packet.c packet.h serverloop.c session.c ssh.c sshconnect1.c sshconnect2.c sshd.c]
         s/packet_done/packet_check_eom/ (end-of-message); ok djm@
    
    with 47 more patchsets to go, I am not going to back out all the files for
    the sake of a commit message...

commit 48b03fc5460390318e94462707182b72dfaba91f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:11:40 2002 +1100

       - markus@cvs.openbsd.org 2001/12/27 20:39:58
         [auth1.c auth-rsa.c channels.c clientloop.c packet.c packet.h serverloop.c session.c ssh.c sshconnect1.c sshd.c ttymodes.c]
         get rid of packet_integrity_check, use packet_done() instead.

commit 66823cddbe80d1d22ac44d503b8c121f071e7105
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:11:38 2002 +1100

       - markus@cvs.openbsd.org 2001/12/27 20:39:58
         [auth1.c auth-rsa.c channels.c clientloop.c packet.c packet.h serverloop.c session.c ssh.c sshconnect1.c sshd.c ttymodes.c]
         get rid of packet_integrity_check, use packet_done() instead.

commit d221ca6cc96082a27ae9b4a7a0600d8ac8b1b2d7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:11:00 2002 +1100

       - markus@cvs.openbsd.org 2001/12/27 19:54:53
         [auth1.c auth.h auth-rh-rsa.c]
         auth_rhosts_rsa now accept generic keys.

commit 9ef95ddcaf41b2c66bc3c1efc1d71b2fe568e01a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:10:33 2002 +1100

       - markus@cvs.openbsd.org 2001/12/27 19:37:23
         [dh.c kexdh.c kexgex.c]
         always use BN_clear_free instead of BN_free

commit 040b64f60a4bbcc0da4521847e0526132b3aaac1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:10:04 2002 +1100

       - markus@cvs.openbsd.org 2001/12/27 18:26:13
         [authfile.c]
         missing include

commit 7d1ded4972b7143edf1cc4d051cb90b858da1531
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:09:41 2002 +1100

       - stevesk@cvs.openbsd.org 2001/12/27 18:22:53
         [sshd.8]
         clarify -p; ok markus@

commit da7551677b301c6fd063eb162c7d32b37723a360
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:09:22 2002 +1100

       - markus@cvs.openbsd.org 2001/12/27 18:22:16
         [auth1.c authfile.c auth-rsa.c dh.c kexdh.c kexgex.c key.c rsa.c scard.c ssh-agent.c sshconnect1.c sshd.c ssh-dss.c]
         call fatal() for openssl allocation failures

commit 154dda73a858a5924c2f5684dfec3e377cc3ab5d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:08:16 2002 +1100

       - markus@cvs.openbsd.org 2001/12/27 18:10:29
         [ssh-keygen.c]
         -t is only needed for key generation (unbreaks -i, -e, etc).

commit aef7a095c8d9ceba4d2595bf41902369272551a3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:07:52 2002 +1100

       - markus@cvs.openbsd.org 2001/12/25 18:53:00
         [auth1.c]
         be more carefull on allocation

commit 503761ac45c1546f211c3585f58f352f16400891
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:07:21 2002 +1100

       - markus@cvs.openbsd.org 2001/12/25 18:49:56
         [key.c]
         be more careful on allocation

commit a055c25d059ddb2dcfd200ee18d4007f1c573984
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:07:01 2002 +1100

       - deraadt@cvs.openbsd.org 2001/12/24 07:29:43
         [ssh-add.c]
         try all listed keys.. how did this get broken?
    
    (oops - that was me)

commit 7c31809c4ae41e03e0d393ee7f00667c6e728477
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:06:22 2002 +1100

       - markus@cvs.openbsd.org 2001/12/21 12:17:33
         [serverloop.c]
         remove ifdef for USE_PIPES since fdin != fdout; ok djm@

commit 6e1057c2d79de5382efc53ceb3e1213cc273ca12
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:05:59 2002 +1100

       - djm@cvs.openbsd.org 2001/12/21 10:06:43
         [ssh-add.1 ssh-add.c]
         Try all standard key files (id_rsa, id_dsa, identity) when invoked with
         no arguments; ok markus@

commit f451e22e2134463062f7134f3e3556ab78ea0661
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:05:31 2002 +1100

       - djm@cvs.openbsd.org 2001/12/21 08:53:45
         [readpass.c]
         Avoid interruptable passphrase read; ok markus@

commit a41c8b15bd2137f99e70d792ea66ee98e390726b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 23:05:08 2002 +1100

       - djm@cvs.openbsd.org 2001/12/21 08:52:22
         [ssh-keygen.1 ssh-keygen.c]
         Remove default (rsa1) key type; ok markus@

commit c68d43335f11c6d1659e39433c9c075a97d48f16
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 22:26:20 2002 +1100

    more

commit ec932376b7c8bf621bb93ee6ee1406332e1574e1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 22:16:03 2002 +1100

     - (djm) autoconf hacking:
       - Add OpenSSL sanity check: verify that header version matches version
         reported by library

commit c46cc5445dd9848c57318b3eb4fb7ca6a554839c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 21:58:27 2002 +1100

     - (djm) Fix some bugs I introduced into ssh-rand-helper yesterday

commit 6c21c51c487ec31ceb5b81b536c9516c5f20b5b0
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 22 21:57:53 2002 +1100

     - (djm) autoconf hacking:
       - We don't support --without-zlib currently, so don't allow it.
       - Rework cryptographic random number support detection. We now detect
         whether OpenSSL seeds itself. If it does, then we don't bother with
         the ssh-rand-helper program. You can force the use of ssh-rand-helper
         using the --with-rand-helper configure argument
       - Simplify and clean up ssh-rand-helper configuration

commit 7b10ef48771bc3649b6e5ea0b021a2270a5d62f8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 21 23:44:12 2002 +1100

     - (djm) Rework ssh-rand-helper:
       - Reduce quantity of ifdef code, in preparation for ssh_rand_conf
       - Always seed from system calls, even when doing PRNGd seeding
       - Tidy and comment #define knobs
       - Remove unused facility for multiple runs through command list
       - KNF, cleanup, update copyright

commit a234451a706f091e1f1f60203ade0dca3d7e99b6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 14 19:01:03 2002 +1100

     - (djm) Bug #50 - make autoconf entropy path checks more robust

commit 2f8f6e3b1c9b33dfb7caf9c67e041ba708d52536
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Jan 8 21:59:06 2002 +0000

     - (stevesk) defines.h: use "/var/spool/sockets/X11/%u" for HP-UX.  does
       not depend on transition links.  from Lutz Jaenicke.

commit bb9ffc18cad480504b59b6ad4ebaa23aab095c9a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 8 10:59:32 2002 +1100

     - (djm) Merge Cygwin copy_environment with do_pam_environment, removing
       fixed env var size limit in the process. Report from Corinna Vinschen
       <vinschen@redhat.com>

commit f49a1191c772673c5e90499c7c295da6630b1e96
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jan 6 02:32:57 2002 +0000

     - (stevesk) defines.h: determine _PATH_UNIX_X; currently "/tmp/.X11-unix/X%u"
       for all platforms except HP-UX, which is "/usr/spool/sockets/X11/%u".

commit 0bd4b34c9b76ed5a4cbff74dde09ae0112aefcce
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Jan 5 23:24:27 2002 +0000

     - (stevesk) fix spurious ; from NCR change.

commit 381d8d9d89d5e4da1853fc0b949fb66518780689
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jan 5 17:15:30 2002 +0000

     - (bal) NCR requies use_pipes to operate correctly.

commit f9661094e5e2854c37d24264b60a0da23ffd6deb
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 3 10:30:56 2002 +1100

     - (djm) Use bigcrypt() on systems with SCO_PROTECTED_PW. Patch from
       Roger Cornelius <rac@tenzing.org>

commit b65a93d3a637408c52df5ff2ec3cf751d1a7cb78
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 31 11:59:53 2001 +1100

    test openssh-commits list

commit bc5239bd62adc470ee67ecc6a578223bde836a67
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 31 11:55:59 2001 +1100

    testing again

commit 31a5302aa906bbee48c32165cf3da67a251fbf8b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 29 18:00:08 2001 +1100

    Tweak cvsignore files

commit 6a568f3ca9735452dc0df237950fc988e3ae4223
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 29 14:10:09 2001 +1100

     - (djm) Typo in contrib/cygwin/README Fix from Corinna Vinschen
       <vinschen@redhat.com>

commit 0dea79d6b6ea4699fa4dfd19b07adbff1d736d70
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 29 14:08:28 2001 +1100

     - (djm) Apply Cygwin pointer deref fix from Corinna Vinschen
       <vinschen@redhat.com> Could be abused to guess valid usernames

commit 6cb127fc14a32667571f843a8de5d8cf0cf10e29
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 28 09:57:33 2001 +1100

     - (djm) Remove recommendation to use GNU make, we should support most
       make programs.

commit 9443508b96e2d2682a221bc17110e87a38503dc5
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Dec 25 04:32:58 2001 +0000

     - (stevesk) [Makefile.in ssh-rand-helper.c]
       portable lib and __progname support for ssh-rand-helper; ok djm@

commit b063f01dd5410f30f075c2a6e84d68fc09b7755c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 24 14:17:21 2001 +1100

    HARUYAMA Seigo has changed address

commit 2ad31ee68a5281c32ac5d01966879e4f387d5da2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 24 02:59:19 2001 +0000

     - (bal) Removed contrib/chroot.diff and noted in contrib/README that it
       was not being maintained.

commit 62116dcc0a0a2ad4233691e73b7c2006b6849702
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 24 01:41:47 2001 +1100

     - (djm) Ignore fix & patchlevel in OpenSSL version check. Patch from
       solar@openwall.com
     - (djm) Rework entropy code. If the OpenSSL PRNG is has not been
       internally seeded, execute a subprogram "ssh-rand-helper" to obtain
       some entropy for us. Rewrite the old in-process entropy collecter as
       an example ssh-rand-helper.
     - (djm) Always perform ssh_prng_cmds path lookups in configure, even if
       we don't end up using ssh_prng_cmds (so we always get a valid file)

commit 278f907a2d6d00d6f52a11bf9577648aadbf0994
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 15:00:19 2001 +1100

       - djm@cvs.openbsd.org 2001/12/20 22:50:24
         [auth2.c auth2-chall.c channels.c channels.h clientloop.c dispatch.c]
         [dispatch.h kex.c kex.h packet.c packet.h serverloop.c ssh.c]
         [sshconnect2.c]
         Conformance fix: we should send failing packet sequence number when
         responding with a SSH_MSG_UNIMPLEMENTED message. Spotted by
         yakk@yakk.dot.net; ok markus@

commit e737856350287104a12f5a97c81fad1f7bcd7096
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 14:58:35 2001 +1100

       - markus@cvs.openbsd.org 2001/12/20 16:37:29
         [channels.c channels.h session.c]
         setup x11 listen socket for just one connect if the client requests so.
         (v2 only, but the openssh client does not support this feature).

commit 5a6b4fe22583394886092aad5787b5fa8355276e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 14:56:54 2001 +1100

       - stevesk@cvs.openbsd.org 2001/12/19 17:16:13
         [authfile.c bufaux.c bufaux.h buffer.c buffer.h packet.c packet.h ssh.c]
         change the buffer/packet interface to use void* vs. char*; ok markus@

commit f6681a3a96ae06d62db49594ba0dcf352f817801
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 14:53:11 2001 +1100

       - markus@cvs.openbsd.org 2001/12/19 16:09:39
         [serverloop.c]
         fix race between SIGCHLD and select with an additional pipe.  writing
         to the pipe on SIGCHLD wakes up select(). using pselect() is not
         portable and siglongjmp() ugly. W. R. Stevens suggests similar solution.
         initial idea by pmenage@ensim.com; ok deraadt@, djm@

commit 8db9a8431058974fe54b4a68684cb16ed70d1f9e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 14:51:28 2001 +1100

    Sync RCSIDs from Kevin's already committed patch

commit 9f0f5c64bc4b6144e3fed6a7f538f7c21819a492
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 14:45:46 2001 +1100

       - deraadt@cvs.openbsd.org 2001/12/19 07:18:56
         [auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h]
         [auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c]
         [cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c]
         [match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c]
         [servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c]
         [sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c]
         [sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config]
         [ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c]
         basic KNF done while i was looking for something else

commit 89681214ca2f50a1b1ed6164c3afe1ce14995ffc
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 12:52:39 2001 +1100

       - jakob@cvs.openbsd.org 2001/12/18 10:06:24
         [auth-rsa.c]
         log fingerprint on successful public key authentication, simplify usage of key structs; ok markus@

commit da9edcabf8b153ff5cb3b681e34a367404f0c0dc
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 12:48:54 2001 +1100

       - jakob@cvs.openbsd.org 2001/12/18 10:05:15
         [auth2.c]
         log fingerprint on successful public key authentication; ok markus@

commit 5b2aea949419fc5ca0dd79fdbf07d5af657b0e22
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 12:47:09 2001 +1100

       - jakob@cvs.openbsd.org 2001/12/18 10:04:21
         [auth.h hostfile.c hostfile.h]
         remove auth_rsa_read_key, make hostfile_ready_key non static; ok markus@

commit 83c02ef6239a763483b5f2dc7ffdb4b5f713052b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 12:45:43 2001 +1100

       - markus@cvs.openbsd.org 2001/12/10 20:34:31
         [ssh-keyscan.c]
         check that server supports v1 for -t rsa1, report from wirth@dfki.de

commit 72c336def6499559ec7069fc612b45c1c4957508
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 12:44:28 2001 +1100

       - stevesk@cvs.openbsd.org 2001/12/10 16:45:04
         [sshd.c]
         possible fd leak on error; ok markus@

commit ee11625d4309da4d4eb7a307a2a58f35354a001a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 12:42:34 2001 +1100

       - markus@cvs.openbsd.org 2001/12/09 18:45:56
         [auth2.c auth2-chall.c auth.h]
         add auth2_challenge_stop(), simplifies cleanup of kbd-int sessions,
         fixes memleak.

commit 3afe375fd288327716a4a6f1cfc05b1ff6535152
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 12:39:51 2001 +1100

       - stevesk@cvs.openbsd.org 2001/12/08 17:49:28
         [channels.c pathnames.h]
         use only one path to X11 UNIX domain socket vs. an array of paths
         to try.  report from djast@cs.toronto.edu.  ok markus@

commit faf2f6483a344a3f7d73181dd5f154a9c7fa0c7c
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 21 10:28:07 2001 +1100

     - (djm) Add option to gnome-ssh-askpass to stop it from grabbing the X
       server. I have found this necessary to avoid server hangs with X input
       extensions (e.g. kinput2). Enable by setting the environment variable
       "GNOME_SSH_ASKPASS_NOGRAB"

commit 366298c696e8c5b27bd27d683ea7b8bf30564362
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Dec 19 17:58:01 2001 +0000

     - (stevesk) OpenBSD CVS sync X11 localhost display
       - stevesk@cvs.openbsd.org 2001/11/29 14:10:51
         [channels.h channels.c session.c]
         sshd X11 fake server will now listen on localhost by default:
         $ echo $DISPLAY
         localhost:12.0
         $ netstat -an|grep 6012
         tcp        0      0  127.0.0.1.6012         *.*                    LISTEN
         tcp6       0      0  ::1.6012               *.*                    LISTEN
         sshd_config gatewayports=yes can be used to revert back to the old
         behavior.  will control this with another option later.  ok markus@
       - stevesk@cvs.openbsd.org 2001/12/19 08:43:11
         [includes.h session.c]
         handle utsname.nodename case for FamilyLocal X authorization; ok markus@

commit 73f57be5003c6c36d74c90a14156e2f88946ee6c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Dec 7 17:28:34 2001 +0000

       - stevesk@cvs.openbsd.org 2001/12/06 18:20:32
         [channels.c]
         disable nagle for X11 fake server and client TCPs.  from netbsd.
         ok markus@

commit ccd8d07b3cf35190b5fdbd8597e908c05e3e15b7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Dec 7 17:26:48 2001 +0000

       - stevesk@cvs.openbsd.org 2001/12/06 18:09:23
         [channels.c session.c]
         strncpy->strlcpy.  remaining strncpy's are necessary.  ok markus@

commit e181a4d2949d063a9417cf2691cb0ec2d3568e53
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Dec 7 17:24:49 2001 +0000

       - stevesk@cvs.openbsd.org 2001/12/06 18:02:32
         [channels.c sshconnect.c]
         shutdown(sock, SHUT_RDWR) not needed here; ok markus@

commit c97b1affc53cbe2c9a0777b7c9b9d400b09b2f89
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Dec 7 17:20:47 2001 +0000

     - (bal) PCRE no longer required.  Banished from the source along with
       fake-regex.h

commit ade03f6bad77faf80441396eb41134489454e1c1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 18:22:17 2001 +0000

       - markus@cvs.openbsd.org 2001/12/06 13:30:06
         [servconf.c servconf.h sshd.8 sshd.c]
         add -o to sshd, too. ok deraadt@
     - (bal) Minor white space fix up in servconf.c

commit 9eab262f1ce2e54f7e5d2b75477a606c33e8bc0a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 18:06:05 2001 +0000

       - markus@cvs.openbsd.org 2001/12/05 16:54:51
         [compat.c match.c match.h]
         make theo and djm happy: bye bye regexp

commit ff4a14f809fc581bed0cd0ff7dd1dc5d5508944c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 18:02:59 2001 +0000

       - markus@cvs.openbsd.org 2001/12/05 15:04:48
         [version.h]
         post 3.0.2

commit 1c37c6a51842f8bed3283ef18ec16cf6a0ae8640
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 18:00:18 2001 +0000

       - deraadt@cvs.openbsd.org 2001/12/05 10:06:12
         [authfd.c authfile.c bufaux.c channels.c compat.c kex.c kexgex.c
          key.c misc.c packet.c servconf.c ssh-agent.c sshconnect2.c
          sshconnect.c sshd.c ssh-dss.c ssh-keygen.c ssh-rsa.c]
         minor KNF

commit 3c36bb29ca67d459ef9d8c1961415d77efc20e55
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 17:55:26 2001 +0000

       - itojun@cvs.openbsd.org 2001/12/05 03:56:39
         [auth1.c auth2.c canohost.c channels.c deattack.c packet.c scp.c
          sshconnect2.c]
         make it compile with more strict prototype checking

commit f8f065bc752ca0a448eb90fc8d60516f486dc4ff
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 17:52:16 2001 +0000

       - itojun@cvs.openbsd.org 2001/12/05 03:50:01
         [clientloop.c serverloop.c sshd.c]
         deal with LP64 printf issue with sig_atomic_t.  from thorpej

commit d05487d1db230db5d55c217fac907a5694bd7dd5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 17:50:03 2001 +0000

       - deraadt@cvs.openbsd.org 2001/12/02 02:08:32
         [sftp-common.c]
         zap };

commit 38b951cdb22cde13e1c625a85769be03e7d35b4d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 17:47:47 2001 +0000

       - markus@cvs.openbsd.org 2001/12/01 21:41:48
         [session.c sshd.8]
         don't pass user defined variables to /usr/bin/login

commit 4a4bd719ea926739cea6ec8704b2ecc60553e8bc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 17:45:19 2001 +0000

       - stevesk@cvs.openbsd.org 2001/11/30 20:39:28
         [ssh.c]
         sscanf() length dependencies are clearer now; can also shrink proto
         and data if desired, but i have not done that.  ok markus@

commit 57fe5b592c5ab759af803737b8f9f50061924cb9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 17:41:25 2001 +0000

       - markus@cvs.openbsd.org 2001/11/29 22:08:48
         [auth-rsa.c]
         fix protocol error: send 'failed' message instead of a 2nd challenge
         (happens if the same key is in authorized_keys twice).
         reported Ralf_Meister@genua.de; ok djm@

commit 623e4a0b1ab149253d084267431daa022e61e14a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 16:49:57 2001 +0000

       - stevesk@cvs.openbsd.org 2001/11/29 19:06:39
         [channels.h]
         remove dead function prototype; ok markus@

commit 5e71c54b8c642f0aa5273dfcff75c8a8def820dd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 16:48:14 2001 +0000

       - markus@cvs.openbsd.org 2001/11/22 12:34:22
         [clientloop.c serverloop.c sshd.c]
         volatile sig_atomic_t

commit 28c603bf438eb44092490cfd8e2979987a846f06
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 16:45:10 2001 +0000

       - stevesk@cvs.openbsd.org 2001/11/22 05:27:29
         [ssh-keyscan.c]
         don't use "\n" in fatal()

commit 4e366d5048aeb92c190efa2102cc7ec59e0318fd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 16:43:21 2001 +0000

       - stevesk@cvs.openbsd.org 2001/11/21 18:49:14
         [ssh-keygen.1]
         more on passphrase construction; ok markus@

commit 4cbc181983731e5c2a7a3bca2654f6b64b35925d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 16:41:41 2001 +0000

       - markus@cvs.openbsd.org 2001/11/21 15:51:24
         [key.c]
         mem leak

commit 70a290c5f7a6ee9e24f5ddfee1c768550780e078
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 16:39:56 2001 +0000

       - mpech@cvs.openbsd.org 2001/11/19 19:02:16
         [deattack.c radix.c]
         kill more registers
         millert@ ok

commit 11f790bbb1fb286006aa04e78fb9965110a4af90
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 16:37:51 2001 +0000

       - stevesk@cvs.openbsd.org 2001/11/19 18:40:46
         [ssh-agent.1]
         clarify/state that private keys are not exposed to clients using the
         agent; ok markus@

commit d84df989db48f76be16c34f7795e6788ee7841bc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 16:35:40 2001 +0000

       - markus@cvs.openbsd.org 2001/11/19 11:20:21
         [sshd.c]
         fd leak on HUP; ok stevesk@

commit 65366a8c766c8a769d42aa6e66b70f4512b4b7c3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 16:32:47 2001 +0000

       - stevesk@cvs.openbsd.org 2001/11/17 19:14:34
         [auth2.c auth.c readconf.c servconf.c ssh-agent.c ssh-keygen.c]
         enum/int type cleanup where it made sense to do so; ok markus@

commit eaffb9d6b6daafdfba60e76f766ed0dbf69c3d60
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 16:28:19 2001 +0000

       - markus@cvs.openbsd.org 2001/11/16 12:46:13
         [ssh-keyscan.c]
         handle empty lines instead of dumping core; report from sha@sha-1.net

commit 0795848def0a66570eb724b93377bc839df33512
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 6 16:19:01 2001 +0000

       - deraadt@cvs.openbsd.org 2001/11/14 20:45:08
         [sshd.c]
         errno saving wrapping in a signal handler

commit fe1d100ffdf3595f3aaddc02efbf0b49a265d90c
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Nov 26 17:19:43 2001 -0800

    [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c,
    openbsd-compat/bsd-cygwin_util.h, openbsd-compat/daemon.c]
    Allow SSHD to install as service under WIndows 9x/Me
    [configure.ac] Fix to allow linking against PCRE on Cygwin
    Patches by Corinna Vinschen <vinschen@redhat.com>

commit f7c6f95682684856db063d104be88a6e3b22a828
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 15 23:16:50 2001 +1100

    Release

commit efdc1f179de4e2bbfa9b37353c42e04b0eb400c6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 15 08:40:45 2001 +1100

     - (djm) Fix IPv4 default in ssh-keyscan. Spotted by Dan Astoorian
       <djast@cs.toronto.edu> Fix from markus@

commit 353f60874037c5cd5ae8245c348b2665017fd850
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 14 00:05:57 2001 +1100

     - (djm) Bump RPM package versions

commit c3070c8fe0c8fe9d8a0de69c7575852d64e5211b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 14 00:05:29 2001 +1100

       - markus@cvs.openbsd.org  2001/11/13 02:03:57
         [version.h]
         enter 3.0.1

commit 527366ccbaebc89f0dd7cf9c1b1173327c2308b9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 14 00:03:14 2001 +1100

       - markus@cvs.openbsd.org  2001/11/12 11:17:07
         [servconf.c]
         enable authorized_keys2 again. tested by fries@

commit 61b05cfdda61737f2d8999e3849dfaea1127f19e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 14 00:02:10 2001 +1100

     - (djm) OpenBSD CVS Sync
       - dugsong@cvs.openbsd.org 2001/11/11 18:47:10
         [auth-krb5.c]
         fix krb5 authorization check. found by <jhawk@MIT.EDU>. from
         art@, deraadt@ ok

commit e49d0966b5e8e4ff4eb993f1b8511932dfcf7bf8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 13 23:46:18 2001 +1100

     - (djm) AIX login{success,failed} changes. Move loginsuccess call to
       do_authenticated. Call loginfailed for protocol 2 failures > MAX like
       we do for protocol 1. Reports from Ralf Wenk <wera0003@fh-karlsruhe.de>,
       K.Wolkersdorfer@fz-juelich.de and others

commit 056ca1eb473e2d4bd9fa867feb26f94a36f5d877
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 13 11:20:07 2001 +1100

     - (djm) Fix early (and double) free of remote user when using Kerberos.
       Patch from Simon Wilkinson <simon@sxw.org.uk>

commit 726273e129a1a450de9c839d4635871af23bfb5e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:40:11 2001 +1100

     - (djm) Reorder portable-specific server options so that they come first.
       This should help reduce diff collisions for new server options (as they
       will appear at the end)

commit 75413ac499087a000aa769046e6784800f0b56c4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:14:35 2001 +1100

       - markus@cvs.openbsd.org 2001/11/11 13:02:31
         [servconf.c]
         make AuthorizedKeysFile2 fallback to AuthorizedKeysFile if AuthorizedKeysFile is specified.

commit 084b8d4ed7296e3152a685d2df6b6aa30819d1c4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:07:58 2001 +1100

       - markus@cvs.openbsd.org 2001/11/10 13:37:20
         [packet.c]
         remove extra debug()

commit eacff8533e93a2df7a6b4f43ddb51a0d8be775cb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:07:35 2001 +1100

       - markus@cvs.openbsd.org 2001/11/10 13:22:42
         [ssh-rsa.c]
         KNF (unexpand)

commit 6a4a4b9290d49016f4410261575b6fbb7ee2543e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:07:11 2001 +1100

       - markus@cvs.openbsd.org 2001/11/10 13:19:45
         [sshd.c]
         cleanup libwrap support (remove bogus comment, bogus close(), add debug, etc).

commit e4a0ff4748faef9abd0244eef0321d466baf461c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:06:54 2001 +1100

       - markus@cvs.openbsd.org 2001/11/09 19:08:35
         [sshd.c]
         remove extra trailing dot from log message; pilot@naughty.monkey.org

commit 79faeff2c1e9e25a0d7d9b11f168a96ca02d46f7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:06:32 2001 +1100

       - markus@cvs.openbsd.org 2001/11/09 18:59:23
         [clientloop.c serverloop.c]
         don't memset too much memory, ok millert@
         original patch from jlk@kamens.brookline.ma.us via nalin@redhat.com

commit f655207a46fa4eeaa38f86e09cf6bca6537b50a8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:06:06 2001 +1100

       - markus@cvs.openbsd.org 2001/11/08 20:02:24
         [auth.c]
         don't print ROOT in CAPS for the authentication messages, i.e.
            Accepted publickey for ROOT from 127.0.0.1 port 42734 ssh2
         becomes
            Accepted publickey for root from 127.0.0.1 port 42734 ssh2

commit 705499b2483396a76a6e1a1f682b419ee828c242
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:05:38 2001 +1100

       - markus@cvs.openbsd.org 2001/11/08 17:49:53
         [ssh.1]
         mention setuid root requirements; noted by cnorris@csc.UVic.ca; ok stevesk@

commit 637b8ae2d491ee0f46997b4d93fade643874a67a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:05:20 2001 +1100

       - markus@cvs.openbsd.org 2001/11/08 10:51:08
         [readpass.c]
         don't strdup too much data; from gotoh@taiyo.co.jp; ok millert.

commit 36f8dd3ed66b71fe661ed0c7a5f292bbdc8f87e3
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:04:54 2001 +1100

       - markus@cvs.openbsd.org 2001/11/07 22:53:21
         [channels.h]
         crank c->path to 256 so they can hold a full hostname; dwd@bell-labs.com

commit 6fd5b391f0fdb81dcd80cf464774c7bb624f9afa
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:04:28 2001 +1100

       - markus@cvs.openbsd.org 2001/11/07 22:41:51
         [auth2.c auth-rh-rsa.c]
         unused includes

commit 60d8aafcb1640e5dbfa30b7940a98a484d57cbd7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:04:05 2001 +1100

       - markus@cvs.openbsd.org 2001/11/07 22:12:01
         [sshd.8]
         s/Keepalive/KeepAlive/; from openbsd@davidkrause.com

commit 36e603db86fbdc7a4f241efd7184dbfee263b701
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:03:35 2001 +1100

       - markus@cvs.openbsd.org 2001/11/07 22:10:28
         [ssh-dss.c ssh-rsa.c]
         missing free and sync dss/rsa code.

commit 9af8c3c226b591f6cbb93eefcf2d56c9ddb3a682
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:03:16 2001 +1100

       - markus@cvs.openbsd.org 2001/11/07 21:40:21
         [ssh-rsa.c]
         ssh_rsa_sign/verify: SSH_BUG_SIGBLOB not supported

commit 9f64390f414b1148822ce11c9493b9cdd9bf7b7a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:02:52 2001 +1100

       - markus@cvs.openbsd.org 2001/11/07 16:03:17
         [packet.c packet.h sshconnect2.c]
         pad using the padding field from the ssh2 packet instead of sending
         extra ignore messages. tested against several other ssh servers.

commit 1f8dddc9272f72ff48a9dbf7017fcd09ef5abdaa
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:02:25 2001 +1100

       - markus@cvs.openbsd.org 2001/10/30 20:29:09
         [ssh.1]
         ssh.1

commit 91c1847733ea76286cb43e0c1dfe0a18f62e35a8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 11:02:03 2001 +1100

       - markus@cvs.openbsd.org 2001/10/29 19:27:15
         [sshconnect2.c]
         hostbased: check for client hostkey before building chost

commit eb5fec6494e65d461b01275555a2b978574862c0
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 10:52:44 2001 +1100

       - markus@cvs.openbsd.org 2001/10/25 21:14:32
         [ssh-keygen.1 ssh-keygen.c]
         better docu for fingerprinting, ok deraadt@

commit 96507ef53542a805095319432c5108fa8ac3fa67
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 10:52:25 2001 +1100

       - markus@cvs.openbsd.org 2001/10/24 19:57:40
         [clientloop.c]
         make ~& (backgrounding) work again for proto v1; add support ~& for v2, too

commit 07cd5897f9854e2f835614027dd321ba17910013
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 10:52:03 2001 +1100

       - markus@cvs.openbsd.org 2001/10/24 08:51:35
         [clientloop.c ssh.c]
         ignore SIGPIPE early, makes ssh work if agent dies, netbsd-pr via itojun@

commit 595bb4f5728b12baf12b434b6fc48d15552ec9a2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 10:51:40 2001 +1100

       - markus@cvs.openbsd.org 2001/10/24 08:41:20
         [ssh.c]
         remove unused

commit 00b61645ebc01e2e2e880624f1c960e4e02a7f0b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 10:51:23 2001 +1100

       - markus@cvs.openbsd.org 2001/10/24 08:41:41
         [sshd.c]
         mention remote port in debug message

commit aba690c100734ac8bad501ecd982266571103873
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 10:36:21 2001 +1100

     - (djm) Cygwin config patch from Corinna Vinschen <vinschen@redhat.com>

commit f41d618fec126ae0d8083e2cc4c2074fbf023759
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 12 10:34:22 2001 +1100

     - (djm) Makefile correctness fix from Mark D. Baushke <mdb@juniper.net>

commit de77b464c6214139ff5ef65521621d9245472c68
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Nov 9 20:22:16 2001 +0000

     - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK)
       if permit_empty_passwd == 0 so null password check cannot be bypassed.
       jayaraj@amritapuri.com OpenBSD bug 2168

commit e589a299a1c1cf26035cddf3996107500242ba1d
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Nov 3 11:09:32 2001 -0800

    [ contrib/caldera/openssh.spec contrib/caldera/sshd.init]
    Updates from Raymund Will <ray@caldera.de>
    [acconfig.h configure.in] Clean up login checks.
    Problem reported by Jim Knoble <jmknoble@pobox.com>

commit 14a5c99b5c84ab86b34baf4b9e8f454118164815
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 1 09:32:34 2001 +1100

     - (djm) Compat define for OpenSSL < 0.9.6 (No OPENSSL_free)

commit 12eceb2efc8b8310e041a89339c671c86cfce386
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 31 10:31:13 2001 +1100

     - (djm) Unsmoke drugs: config files should be noreplace.

commit 1c613247288c06235b51d0f24f93eb99342f8c6a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 30 22:03:51 2001 +1100

     - (djm) Redhat RPM spec: remove noreplace from config files, allow IPv6
       by default (can force IPv4 using --define "noipv6 1")

commit b89e694b4c785076f9d4ad2d069cf678da29ec50
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Oct 29 18:50:39 2001 -0800

     [TODO defines.h loginrec.c] Change the references to configure.in
     to configure.ac

commit c3ad02e54bcdd4cc66dac087023f4104bde237b0
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Oct 28 18:10:22 2001 +0000

     - (stevesk) README: zlib location is http://www.gzip.org/zlib/

commit fe2f4a1e37c74af71ef2b5b6ac2e353647832b83
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Oct 28 17:32:38 2001 +0000

     - (stevesk) Fix compile problem with PAM password change fix

commit 092564869a30a7e1f51969fa736149f9246a9831
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 28 22:36:55 2001 +1100

     - (djm) Fix for PAM password changes being echoed (from stevesk)

commit c3aa3dd70c73312423797909af8d5fcad10db235
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 28 22:34:52 2001 +1100

     - (djm) Disconnect if no tty and PAM reports password expired

commit 33cdd9ee7b9261cd3cc8e35fd21f3676eeb12cbe
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 28 22:33:48 2001 +1100

     - (djm) Avoid bug in Solaris PAM libs

commit ffdf4aa10f59d540003b17877d174982ef3cfe43
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Oct 27 10:45:36 2001 -0700

    [configure.ac] Fixes for ReliantUNIX (don't use libucb)
    Patch by Robert Dahlem <Robert.Dahlem@siemens.com>

commit afefd16b6e7078e5db300424a67c0d7650ed92dc
Author: Tim Rice <tim@multitalents.net>
Date:   Fri Oct 26 17:33:18 2001 -0700

    Fix install: when building outside of source
    tree and using --src=/full_path/to/openssh
    Patch by Mark D. Baushke <mdb@juniper.net>

commit 9197c59493b895972a3dc4026461c019e48d29dc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Oct 26 15:56:55 2001 +0000

     - (bal) Set the correct current time in login_utmp_only().  Patch by
       Wayne Davison <wayned@users.sourceforge.net>

commit 9335669e3a804ebd50132038eae00bccba7ab43f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Oct 26 15:36:06 2001 +0000

    Updated Readme with right zlib location in [3]

commit 02cebcd93be1fc789f260202ccbfb600b1ba7e0f
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Oct 25 10:01:30 2001 -0700

    Give path given in --with-xxx= for pcre,zlib, and
    tcp-wrappers precedence over system libraries and includes.
    Report from Dave Dykstra <dwd@bell-labs.com>

commit a0bd44cc49a4b24869c952233b916961f67ac9a2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Oct 25 15:02:35 2001 +0000

     - (bal) Use VDISABLE if _POSIX_VDISABLE is set in readpassphrase.c.  Patch
        by todd@

commit 8ad995fd07876b6ca38c7a94a1896935d167b589
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Oct 24 21:15:26 2001 -0700

    Use configure.ac instead of configure.in so older versions of autoconf
    don't even try.

commit 3a78c845354096ffe3fb7275a763e67a5d45e797
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 24 21:06:07 2001 +0000

     - (bal) Should be 3.0p1 not 3.0p2.  Corrected version.h already.

commit 635a8d773ca9794e60969a58a7514cf43ffc3db1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 24 15:20:57 2001 +0000

    Ooops.. Give me a break.. =)  3.0p1 is the release not 3.0p2..

commit 17b93e5d65c29d6f03f99ad0118a2eb80e4443b7
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Oct 23 22:36:54 2001 -0700

    [configure.in] Fix test for broken dirname. Based on patch from
    Dave Dykstra <dwd@bell-labs.com>. Remove un-needed test for zlib.h.
    [contrib/caldera/openssh.spec, contrib/redhat/openssh.spec,
    contrib/suse/openssh.spec] Update version to match version.h

commit 95276711eb5b2c55788d2664b76cb2bd11f56251
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Oct 23 17:14:00 2001 +0000

     - (bal) Added 'PAM_TTY_KLUDGE' to Solaris platform.

commit ab73b9bd64572cbec192240741092bc8aa76ccd3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Oct 23 16:12:54 2001 +0000

     - (bal) Updated version to 3.0p1 in preparing for release.

commit 3a8a5cd5b075c02dac1d802765eec6c1ff5c11d6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 22 16:49:22 2001 +1000

     - (djm) Fix fd leak in loginrec.c (ro fd to lastlog was left open).
       Report from Michal Zalewski <lcamtuf@coredump.cx>

commit 13aae5ee7673a0b75369256e7ed6117f9f1b6c7d
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Oct 21 17:53:58 2001 -0700

    [configure.in] Clean up library testing.
    Add optional PATH to --with-pcre, --with-zlib, --with-tcp-wrappers
    based on patch by albert chin (china@thewrittenword.com)
    
    Re-arange AC_CHECK_HEADERS and AC_CHECK_FUNCS for eaiser reading
    of patches to configure.in
    
    Replace obsolete AC_STRUCT_ST_BLKSIZE with AC_CHECK_MEMBERS
    
    Add test for broken dirname() on Solaris 2.5.1 by
    Dan Astoorian <djast@cs.toronto.edu>
    
    [acconfig.h aclocal.m4 defines.h configure.in]
    Better socklen_t patch by albert chin (china@thewrittenword.com)
    
    [scp.c]
    Replace obsolete HAVE_ST_BLKSIZE with HAVE_STRUCT_STAT_ST_BLKSIZE
    
    [Makefile.in] When running make in top level, always do make in openbsd-compat
    patch by Dave Dykstra <dwd@bell-labs.com>

commit f2366b5a7d3cc9f7ad4dc6b89e30853b474bccec
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Oct 19 20:36:23 2001 +0000

     - (bal) Fixed up init.d symlink issue and piddir stuff.  Patches by
        Zoran Milojevic <Zoran.Milojevic@SS8.com> and j.petersen@msh.de

commit 368211ee476cf70467823eccb68e9173b8aacc2b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Oct 19 20:24:14 2001 +0000

    Forgot to check in before.

commit 7a97339359a75e2dbf01edb27846a3bc113d50a8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Oct 12 21:52:39 2001 +0000

     - (bal) Minor bug fix in contrib/solaris/opensshd.in .. $etcdir was not
       set right.

commit 8b5ba1c39acd9bdf64c55a1407021111969a4289
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Oct 12 20:30:52 2001 +0000

     - (bal) First wave of contrib/solaris/ package upgrades.  Still more
        work needs to be done, but it is a 190% better then the stuff we
        had before!

commit 4a820ea750ce79be709ca8c4b11edf39e07b2676
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 12 19:15:48 2001 +1000

     - (djm) Cleanup sshpty.c a little

commit 7c734056f48c396fdd68ae1c441c372908b54fe9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 12 19:15:27 2001 +1000

     - (djm) Clean some autoconf-2.52 junk when doing "make distclean"

commit 5f01280c797b9cf2cbedd828fea458caf45c1265
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 12 12:04:04 2001 +1000

     - (djm) "make veryclean" fix from Tom Holroyd <tomh@po.crl.go.jp>

commit 164a7f42f9f5c14c0d60f5d385d535f1a2fd5537
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 12 11:36:09 2001 +1000

       - markus@cvs.openbsd.org 2001/10/11 15:24:00
         [clientloop.c]
         clear select masks if we return before calling select().

commit 0585d51a52350409f63b687a02619a7617643309
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 12 11:35:50 2001 +1000

       - markus@cvs.openbsd.org 2001/10/11 13:45:21
         [session.c]
         delay detach of session if a channel gets closed but the child is
         still alive.  however, release pty, since the fd's to the child are
         already closed.

commit 3ec2759ad40f054c152c753db046ac55f9670d14
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 12 11:35:04 2001 +1000

     - (djm) OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2001/10/10 22:18:47
         [channels.c channels.h clientloop.c nchan.c serverloop.c]
         [session.c session.h]
         try to keep channels open until an exit-status message is sent.
         don't kill the login shells if the shells stdin/out/err is closed.
         this should now work:
         ssh -2n localhost 'exec > /dev/null 2>&1; sleep 10; exit 5'; echo ?

commit 4e088e4de02b6c813b498a1270df85e8136c4499
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 10 20:45:43 2001 +0000

     - (bal) seed_init() and seed_rng() required in ssh-keyscan.c

commit 926ce58d3be975754faff4c8accde5034de4983e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 10 20:38:55 2001 +0000

     - (bal) removed two unsed headers in openbsd-compat/bsd-misc.c

commit 52b77beb6560c409dfaaec6e61a8f2a2bf53d7d8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:14:37 2001 +1000

       - markus@cvs.openbsd.org 2001/10/09 21:59:41
         [channels.c channels.h serverloop.c session.c session.h]
         simplify session close: no more delayed session_close, no more blocking wait() calls.

commit c71f4e40b6d8cdf1c0d83381945841e66c127a95
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:08:36 2001 +1000

       - markus@cvs.openbsd.org 2001/10/09 19:51:18
         [serverloop.c]
         close all channels if the connection to the remote host has been closed,
         should fix sshd's hanging with WCHAN==wait

commit ae45246696fed011e1a9941d33b89669c74b3198
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:08:06 2001 +1000

       - markus@cvs.openbsd.org 2001/10/09 19:32:49
         [session.c]
         stat subsystem command before calling do_exec, and return error to client.

commit 139d4cd9087bb3eaf751406016bc2223d7d0d7b1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:07:44 2001 +1000

       - markus@cvs.openbsd.org 2001/10/09 10:12:08
         [session.c]
         chdir $HOME after krb_afslog(); from bbense@networking.stanford.edu

commit 7ea6f204b67039e09c79dfb3049a88806e5d1ea3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:04:41 2001 +1000

       - markus@cvs.openbsd.org 2001/10/08 16:15:47
         [sshconnect.c]
         use correct family for -b option

commit d3c04b90e478c664635d66fb4e07bb3236c62cc1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:04:20 2001 +1000

       - markus@cvs.openbsd.org 2001/10/08 11:48:57
         [channels.c]
         better debug

commit 4623a754624624523ef2f50ba8647cad7f31d992
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:03:58 2001 +1000

       - markus@cvs.openbsd.org 2001/10/07 17:49:40
         [channels.c channels.h]
         avoid possible FD_ISSET overflow for channels established
         during channnel_after_select() (used for dynamic channels).

commit 058655ccedb9cdad84be346bce7416454e45a598
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:03:36 2001 +1000

       - markus@cvs.openbsd.org 2001/10/07 10:29:52
         [authfile.c]
         grammer; Matthew_Clarke@mindlink.bc.ca

commit 59d9fb9e55f2448ec8b0911f05bdb943e8235ed2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:03:11 2001 +1000

       - markus@cvs.openbsd.org 2001/10/06 11:18:19
         [sshconnect1.c sshconnect2.c sshconnect.c]
         unify hostkey check error messages, simplify prompt.

commit 9c751429176f774bc327c23acb0711e76856e209
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:02:46 2001 +1000

       - markus@cvs.openbsd.org 2001/10/06 00:36:42
         [session.c]
         fix typo in error message, sync with do_exec_nopty

commit e398004f6c9aec5d46d0b77950592462f327e28b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:02:03 2001 +1000

       - markus@cvs.openbsd.org 2001/10/06 00:14:50
         [sshconnect.c]
         remove unused argument

commit 8c3902afde376c2efbd587ea63043e7abceabaff
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:01:40 2001 +1000

       - markus@cvs.openbsd.org 2001/10/04 15:12:37
         [serverloop.c]
         client_alive_check cleanup

commit af5f2e641c2a204943df3895a612ce334195def5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:01:16 2001 +1000

       - markus@cvs.openbsd.org 2001/10/04 15:05:40
         [channels.c serverloop.c]
         comment out bogus conditions for selecting on connection_in

commit af3030f70996be721a5152f23d5ea9a930a93b45
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 10 15:00:49 2001 +1000

       - markus@cvs.openbsd.org 2001/10/04 14:34:16
         [key.c]
         call OPENSSL_free() for memory allocated by openssl; from chombier@mac.com

commit 7c23540fffc70f9b981db318b569ec061e79e91a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Oct 8 02:53:55 2001 +0000

    Cleaned out dead entries.

commit f16c81f900c361c32cee3a15b6c1802187114793
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Oct 8 01:54:24 2001 +0000

     - (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys.
        Prompted by Matthew Vernon <matthew@sel.cam.ac.uk>

commit 4c90149c500f8cc7ad26a016ca3f67b586197b84
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Oct 6 00:08:09 2001 +0000

     - (bal) AES works under Cray, no more hack.

commit 8bceffb0c391897fc266f0e08ec1888832093449
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Oct 4 21:16:57 2001 +0000

     - (bal) nchan2.ms resync.  BSD License applied.

commit c3e49e7b3116d8cc56b0f689d92c4ac8acfa9514
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 3 17:55:26 2001 +0000

       - markus@cvs.openbsd.org 2001/10/03 10:01:20
         [auth.c]
         use realpath() for homedir, too. from jinmei@isl.rdc.toshiba.co.jp

commit 1bae4044577f402f33ae4f06e715832cc479c030
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 3 17:46:39 2001 +0000

       - stevesk@cvs.openbsd.org 2001/10/02 22:56:09
         [sshd.c]
         #include "channels.h" for channel_set_af()

commit 569f88de0440506347e3c14f954d0aa0e9f18651
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 3 17:43:01 2001 +0000

       - djm@cvs.openbsd.org 2001/10/02 08:38:50
         [ssh-add.c]
         return non-zero exit code on error; ok markus@

commit 3cecc9a41f32681b8729a7e4b32dbe8fe80a3f8a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 3 17:39:38 2001 +0000

       - markus@cvs.openbsd.org 2001/10/01 21:51:16
         [readconf.c readconf.h ssh.1 sshconnect.c]
         add NoHostAuthenticationForLocalhost; note that the hostkey is
         now check for localhost, too.

commit 908afed17f97a3f5814f8d0d16be27b9f487f93d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 3 17:34:59 2001 +0000

       - markus@cvs.openbsd.org 2001/10/01 21:38:53
         [channels.c channels.h ssh.c sshd.c]
         remove ugliness; vp@drexel.edu via angelos

commit 3e45e4cd003fd9aa5ae1556afd4ba405904b761f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 3 17:30:58 2001 +0000

       - markus@cvs.openbsd.org 2001/10/01 08:06:28
         [scp.c]
         skip filenames containing \n; report jdamery@chiark.greenend.org.uk
         and matthew@debian.org

commit 83f07d19544b3acc2fb4d3b2b8640c5e5c7ae9d4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 3 17:22:29 2001 +0000

       - markus@cvs.openbsd.org 2001/09/28 15:46:29
         [ssh.c]
         bug: read user config first; report kaukasoi@elektroni.ee.tut.fi

commit 1af4d3bb709453b0b206106adaba7c94548fa6f2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 3 17:18:37 2001 +0000

       - djm@cvs.openbsd.org 2001/09/28 12:07:09
         [ssh-keygen.c]
         bzero private key after loading to smartcard; ok markus@

commit 6149a6c57fe24a4afc4a11be7f2061d4d079966a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 3 17:15:32 2001 +0000

       - camield@cvs.openbsd.org 2001/09/27 17:53:24
         [sshd.8]
         don't talk about compile-time options
         ok markus@

commit bdfb4df08c8997247f365ca69dcd0b48bf783dc4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 3 17:12:43 2001 +0000

       - markus@cvs.openbsd.org 2001/09/27 15:31:17
         [auth2.c auth2-chall.c sshconnect1.c]
         typos; from solar

commit ae3de4b39e783b21eebb66cb56783ee18c997092
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 3 17:10:17 2001 +0000

       - markus@cvs.openbsd.org 2001/09/27 11:59:37
         [packet.c]
         missing called=1; chombier@mac.com

commit 96f8d143a70d671aa224cbb769980414a312a894
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 3 17:07:47 2001 +0000

       - markus@cvs.openbsd.org 2001/09/27 11:58:16
         [compress.c]
         mem leak; chombier@mac.com

commit 9b023ed2a2ac8fc9aed82885953ee2b1c1446c5d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 3 17:03:54 2001 +0000

     - (bal) CVS ID fix up in version.h

commit 5217265349e999c2c2131f41261e47025bc80308
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Oct 2 00:29:00 2001 +0000

     - (stevesk) loginrec.c: fix type conversion problems exposed when using
       64-bit off_t.

commit 819f1bef5c1baf684afcc5aef4d743f16e0c376b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Sep 29 14:27:00 2001 +0000

    20010929
     - (bal) move reading 'config.h' up higher.  Patch by albert chin
       <china@thewrittenword.com)

commit 0a8a0f4b5116d64785ffe669372471b8952b47ec
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 28 20:05:08 2001 +1000

    Sync version numbers with stable branch

commit bccb5a933800d9c37ff7ce2865b14950da5cb5e9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 28 20:03:25 2001 +1000

     - (djm) Update spec files for new x11-askpass

commit 3ff36d6ce250f74e7bf73b3fb6ef65fdb6f65b86
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 28 19:51:54 2001 +1000

     - (djm) OpenBSD CVS sync:
       - djm@cvs.openbsd.org 2001/09/28 09:49:31
         [scard.c]
         Fix segv when smartcard communication error occurs during key load.
         ok markus@

commit a0957d6898b962677cba968eee972ad987aff3a3
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Sep 27 19:50:26 2001 +0000

     - (stevesk) session.c: declare do_pre_login() before use
       wayned@users.sourceforge.net

commit cf7635c15b667fa0c5929a0a7c7caeb30c78dd79
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 27 00:24:21 2001 +1000

    We are a "SSH protocol implementation" not a "SSH implementation"

commit 5f4b10088fdb88ad4326211ebe9933b92d4f7eb7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 25 22:21:52 2001 +1000

     - (djm) Avoid bad and unportable sprintf usage in compat code

commit e8bb450af9bb67f9b8b2c7a1fc5659935a286788
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 25 16:39:35 2001 +1000

     - (djm) Add AC_SYS_LARGEFILE configure test

commit 16fcade16b5b3e5ffde7caf5278d7948d7569251
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 25 13:06:18 2001 +1000

     - (djm) Sync $sysconfdir/moduli

commit fdbcb5d9ab6134ee8cdad7248e3df787d03993af
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 25 13:01:49 2001 +1000

    Possible sia cleanup opportunity

commit 964fed54cd0fa6b7df1342f010c57f05261dcff2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 25 12:58:23 2001 +1000

     - (djm) Pull in auth-krb5.c from OpenBSD CVS. NB. it is not currently used.

commit d4d119377d10d4a5df8110119a7c8ca1309dc257
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 25 12:55:37 2001 +1000

    Sync

commit 8124e1a05bfaa4b02a37c38fa30687b731370f32
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 25 10:21:28 2001 +1000

    Add warning that code is still in development

commit 8b16c0e67a898f2822b3c528c6a78660757ec5b0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Sep 24 23:15:15 2001 +0000

     - (bal) Updated all *.specs for 2.9.9p1 and updated version.h

commit 40a0d20913cb8a1afa1ae4b0619215c9849d17ae
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Sep 24 22:04:02 2001 +0000

     - (bal) Removed 'extern int optopt;' since it is dead wood.

commit 5ccf63a9740ae0a1b5eed30572336c01abb18931
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Sep 24 20:00:10 2001 +0000

     - (bal) updated ssh.c to mirror minor getopts 'extern int' formating done
        by stevesk@

commit bffa1cb7f6071f972fe506b50a48212efcd2f57f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Sep 23 13:58:38 2001 +0000

       - markus@cvs.openbsd.org 2001/09/23 09:58:13
         [LICENCE]
         new rijndael implementation

commit b85544d717f82e466e55cd6acd158bf1dd109b33
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Sep 23 13:54:57 2001 +0000

    <grumble> Editing ChangeLog in the wrong directory.
    
       - markus@cvs.openbsd.org 2001/09/23 11:09:13
         [authfile.c]
         relax permission check for private key files.

commit 7aff2613d95d0d4c272f5d22f6c22d08542d72b1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Sep 23 13:53:22 2001 +0000

       - markus@cvs.openbsd.org 2001/09/23 11:09:13
         [authfile.c]
         relax permission check for private key files.

commit 15da033b34c007c22d37dca64a407049f9520aff
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Sep 20 23:15:44 2001 +0000

       - mouring@cvs.openbsd.org 2001/09/20 20:57:51
         [sshd_config]
         CheckMail removed.  OKed stevesk@

commit f558cf658023ed272a75c9b942bdd0499805413b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Sep 20 23:13:49 2001 +0000

       - markus@cvs.openbsd.org 2001/09/20 13:50:40
         [compat.c compat.h ssh.c]
         bug compat: request a dummy channel for -N (no shell) sessions +
         cleanup; vinschen@redhat.com

commit 1bc3bdb1c2d378687ab356b9f860262e8955e058
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Sep 20 23:11:26 2001 +0000

       - markus@cvs.openbsd.org 2001/09/20 13:46:48
         [auth2.c]
         key_read returns now -1 or 1

commit 406b4f0f33c5a0e81a0e32cf7494c209cbfe60ce
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Sep 20 23:09:16 2001 +0000

       - stevesk@cvs.openbsd.org 2001/09/20 00:15:54
         [sshd.8]
         fix ClientAliveCountMax

commit 76e7d9b6302ef1d695d95f12198e9315d4d57e16
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Sep 20 20:30:09 2001 +0000

    whitespace sync

commit 50abba560c1a20ae2b88a0e4dbfc0d1f166588ea
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Sep 20 19:43:41 2001 +0000

     - (stevesk) sun_len, SUN_LEN() configure stuff no longer required

commit c3422eb89094e4e56710b2fccfc7aff6294b1cab
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Sep 20 19:33:33 2001 +0000

    whitespace sync

commit 1ce8f0c3e563e890b5299ee61f1639b07317992c
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Sep 20 11:39:35 2001 -0700

     - (tim) [scard/Makefile.in] Don't strip the Java binary

commit 84a6bfba15e833a9b70de130f9427245fca89724
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Sep 20 02:07:50 2001 +0000

     - (bal) openbsd-compat/vis.[ch] is dead wood.  Removed.

commit 03598a1c230962db9befb8f8e5ccdab3d0449346
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Sep 20 01:07:57 2001 +0000

       - stevesk@cvs.openbsd.org 2001/09/19 21:41:57
         [sshd.8]
         don't advertise -V in usage; ok markus@

commit dfd1850398cec2a6bb99dc7c5ac16f617a78f3a8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Sep 20 01:06:08 2001 +0000

       - stevesk@cvs.openbsd.org 2001/09/19 21:04:53
         [sshd.8]
         missing -t in usage

commit b1d822c311b33e653f60faee35964052b2229522
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Sep 20 01:03:31 2001 +0000

       - stevesk@cvs.openbsd.org 2001/09/19 19:35:30
         [authfd.c]
         use sizeof addr vs. SUN_LEN(addr) for sockaddr_un.  Stevens
         blesses this and we do it this way elsewhere.  this helps in
         portable because not all systems have SUN_LEN() and
         sockaddr_un.sun_len.  ok markus@

commit 2b7a0e953e3e85c2d95cfb6b4bed095135c3a2b7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Sep 20 00:57:55 2001 +0000

       - stevesk@cvs.openbsd.org 2001/09/19 19:24:19
         [readconf.c readconf.h scp.c sftp.c ssh.1]
         add ClearAllForwardings ssh option and set it in scp and sftp; ok
         markus@

commit 309f3d1d9c6a8f480de33a21f61809c14da97bdd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Sep 20 00:55:53 2001 +0000

       - markus@cvs.openbsd.org 2001/09/19 13:23:29
         [key.c]
         key_read() now returns -1 on type mismatch, too

commit 20daef753ddc7b1139d88532580ef40267f66d26
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Sep 20 00:54:01 2001 +0000

       - markus@cvs.openbsd.org 2001/09/19 10:08:51
         [sshd.8]
         command=xxx applies to subsystem now, too

commit 871f662cb64b70e723c3486d872fcb497a0c3f56
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Sep 18 16:08:24 2001 +0000

     - (stevesk) nchan.c: we use X/Open Sockets on HP-UX now so shutdown(2)
       returns ENOTCONN vs. EINVAL for socket not connected; remove EINVAL
       check. ok Lutz Jaenicke

commit cc7aafc7a4d59b3f25c511a24b593e73232b7074
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Sep 18 05:56:57 2001 +0000

       - stevesk@cvs.openbsd.org 2001/09/17 23:56:07
         [scp.1]
         missing -B in usage string

commit 3b4d42c24006f7123f68168ef1287ad8b5d395a3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Sep 18 05:55:10 2001 +0000

       - markus@cvs.openbsd.org 2001/09/17 21:09:47
         [compat.c]
         more versions suffering the SSH_BUG_DEBUG bug;
         3.0.x reported by dbutts@maddog.storability.com

commit 6d218f404f9f6e5167626851ffb73a82f7881461
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Sep 18 05:53:12 2001 +0000

       - markus@cvs.openbsd.org 2001/09/17 21:04:02
         [channels.c serverloop.c]
         don't send fake dummy packets on CR (\r)
         bugreport from yyua@cs.sfu.ca via solar@@openwall.com

commit 944c4f0bdaa12ac3c58b77ee866758958e708329
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Sep 18 05:51:13 2001 +0000

       - markus@cvs.openbsd.org 2001/09/17 20:52:47
         [channels.c channels.h clientloop.c]
         try to fix agent-forwarding-backconnection-bug, as seen on HPUX,
         for example; with Lutz.Jaenicke@aet.TU-Cottbus.DE,

commit 99a30f11c2e698916f3a3d8434a438085d9f298f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Sep 18 05:49:14 2001 +0000

       - markus@cvs.openbsd.org 2001/09/17 20:50:22
         [key.c ssh-keygen.c]
         better error handling if you try to export a bad key to ssh.com

commit 6a337633321a3aef52d766e643f0abba7cdad02f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Sep 18 05:47:32 2001 +0000

       - stevesk@cvs.openbsd.org 2001/09/17 20:38:09
         [sftp.1 sftp.c]
         cleanup and document -1, -s and -S; ok markus@

commit a2fec90e0541e993eb336c02bac0351f6ae0448b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Sep 18 05:45:44 2001 +0000

       - markus@cvs.openbsd.org 2001/09/17 20:22:14
         [scard.c]
         never keep a connection to the smartcard open.
         allows ssh-keygen -D U while the agent is running; report from jakob@

commit 7a62b77042f87a2e4e83308c942cd9f945d3faa2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 18 15:44:34 2001 +1000

    Adapt for portable

commit 9e0ddd4379242d325157e38d406e5ed80ba0892c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Sep 18 05:41:19 2001 +0000

       - stevesk@cvs.openbsd.org 2001/09/17 19:27:15
         [kexdh.c kexgex.c key.c key.h ssh-dss.c ssh-keygen.c ssh-rsa.c]
         u_char*/char* cleanup; ok markus

commit 1e2432416483351ba18ac7ea21538b138db583ae
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Sep 18 05:38:44 2001 +0000

        - stevesk@cvs.openbsd.org 2001/09/17 17:57:57
          [scp.1 scp.c sftp.1 sftp.c]
          add -Fssh_config option; ok markus@

commit 99b8febe111e304e47c79c1f6f2351afed7a0e96
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 18 15:37:50 2001 +1000

    double doh

commit 033e4557c0a0944d9e96fa8c1577eabe0aa44eda
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Sep 18 05:36:27 2001 +0000

     - (bal) LICENCE update.  Has not been done in a while.

commit cf8cadf6f78b656025867a941aa86a988ad7f7f7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 18 15:35:04 2001 +1000

    doh

commit f2bd06c21e053176b80632967d7a842616780387
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 18 15:33:07 2001 +1000

     - (djm) Make smartcard support conditional in Redhat RPM spec

commit 2c1e1cb135decd723288b4f3c512adf42dd06694
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 18 15:23:58 2001 +1000

    oops

commit 7948d93173b00e19ca4c5a68a0d01fceecc98738
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 18 15:12:10 2001 +1000

     - (djm) Specify --datadir in RPM spec files so smartcard applet gets
        put somewhere sane. Add Ssh.bin to manifest.

commit d97c2ceed1e295bdc612be7e042015c1b7200773
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 18 15:06:21 2001 +1000

     - (djm) More makefile infrastructre for smartcard support, also based
       on Ben's work

commit ff5f47e230b2c8278791c0fb8b2bcb0d08fcee1b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 18 15:05:20 2001 +1000

     - (djm) Avoid warning on BSDgetopt

commit ffbe69890dd16bb0dce24e401163cec731034e39
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 18 14:03:03 2001 +1000

     - (djm) Revert setgroups call, it causes problems on OS-X

commit 85de580adcec0a5089ddddeda5cbbb519db35e50
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 18 14:01:11 2001 +1000

     - (djm) Configure support for smartcards

commit a4f7ae1a35b5da61705bea75bcc50bc7a27726dd
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Sep 17 14:34:33 2001 -0700

     - (tim) [includes.h openbsd-compat/getopt.c openbsd-compat/getopt.h]
             rename getopt() to BSDgetopt() to keep form conflicting with
             system getopt().
             [Makefile.in configure.in] disable filepriv until I can add
             missing procpriv calls.

commit c3bd7eccac2c9d087dd23ab4929d423414d3f18e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 15:49:36 2001 +1000

    double doh

commit 500c790090649cb46e329d4fbc2c63acef6b176c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 15:43:46 2001 +1000

    doh

commit 01ebad06db96f791706ea6c760fc921b141483ea
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Sep 17 15:07:23 2001 +1000

     - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds

commit 37e41c90198e4cb3c69f9faa2e0d64f580c10219
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Sep 16 22:17:15 2001 +0000

        - markus@cvs.openbsd.org 2001/09/16 14:46:54
          [session.c]
          calls krb_afslog() after setting $HOME; mattiasa@e.kth.se; fixes
          pr 1943b

commit 0b9278e92315f35f1187d66e3267888bdc3c5bff
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 16 17:13:45 2001 +1000

     - (djm) Workaround XFree breakage in RPM spec file

commit 426d6bdc00c297b6e014a86648bffb922daa8b97
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 16 17:13:11 2001 +1000

    I really should commit these in sync with the actual changes

commit 58be738ac85919c2302c8375eeaf7eadef93df5b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 15 21:31:54 2001 +1000

     - (djm) Make sure rijndael.c picks config.h
     - (djm) Ensure that u_char gets defined

commit 85085cb96d479de364ceb3b7e2556090a55e2a61
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 15 21:23:11 2001 +1000

    rewrite descriptions

commit ebf989e601a137d2c2dd489a614c7ba54b6fc910
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 15 21:12:49 2001 +1000

     - (djm) Clear supplemental groups at sshd start to prevent them from
       being propogated to random PAM modules. Based on patch from Redhat via
       Pekka Savola <pekkas@netcore.fi>

commit ba6f9f9e492705d85001426d535bd3ff5b8dc46c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 15 21:03:10 2001 +1000

     - (djm) Redhat initscript config sanity checking from Pekka Savola
       <pekkas@netcore.fi>

commit 0c217b74e2f6aa89b5961f617c9f5c1fac34873e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 15 21:01:41 2001 +1000

    C - (djm) Redhat spec file cleanups from Pekka Savola <pekkas@netcore.fi> and
       Redhat
    VS: ----------------------------------------------------------------------

commit 69e00a18a5dbbdf7a79561f040ce68de832289a2
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 15 20:58:46 2001 +1000

     - (djm) Sync scard/ stuff

commit 599d8eba16e295fd6a1727fbc1f4a17f67075900
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 15 12:25:53 2001 +1000

     - (djm) Make do_pre_login static to avoid prototype #ifdef hell

commit 23124eab3b0ea3a1b84a378144122277682b70e8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Sep 14 23:14:25 2001 +0000

       - markus@cvs.openbsd.org 2001/09/14
         [sshd.c]
         typo

commit b09f6b5b027e79692b9a4eb18c905cf49feda610
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Sep 14 23:12:07 2001 +0000

       - markus@cvs.openbsd.org 2001/09/14
         [session.c]
         command=xxx overwrites subsystems, too

commit d5e1c04c00fbc8fb3338fb4575cdbe93ae8d3f52
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Sep 14 23:09:29 2001 +0000

       - markus@cvs.openbsd.org 2001/09/13
         [rijndael.c rijndael.h]
         missing $OpenBSD

commit 319fc7353c647aa2703bb6c7f5288fb42f29e705
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Sep 14 02:47:33 2001 +0000

    I was promised that this does not need to have endness fix up by Markus.
    So I will blindly trust him. =)
    
       - markus@cvs.openbsd.org 2001/08/23 11:31:59
         [cipher.c cipher.h]
         switch to the optimised AES reference code from
         http://www.esat.kuleuven.ac.be/~rijmen/rijndael/rijndael-fst-3.0.zip

commit 4213c559ef3d44670c8580cc552d23dce7528bda
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 18:45:09 2001 +0000

       - stevesk@cvs.openbsd.org 2001/09/12 18:18:25
         [scp.c]
         don't forward agent for non third-party copies; ok markus@

commit 594e20389490bf91724dc903cb9aaa92d037b7a4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 18:35:30 2001 +0000

       - deraadt@cvs.openbsd.org 2001/09/05 06:23:07
         [scp.1 sftp.1 ssh.1 ssh-agent.1 sshd.8 ssh-keygen.1 ssh-keyscan.1]
         avoid first person in manual pages

commit edc0cf26d11d708320ade92e066d4f3e84e20112
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 18:32:20 2001 +0000

       - stevesk@cvs.openbsd.org 2001/09/03 20:58:33
         [readconf.c readconf.h ssh.c]
         fatal() for nonexistent -Fssh_config. ok markus@

commit 7d199962015ad042208beb54cf4a8fb72053f468
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 18:29:00 2001 +0000

       - markus@cvs.openbsd.org 2001/08/31 11:46:39
         [sshconnect2.c]
         disable kbd-interactive if we don't get
         SSH2_MSG_USERAUTH_INFO_REQUEST messages

commit 520b55c8c410061c9a16417a6ec879967b1ea95a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 18:05:05 2001 +0000

       - markus@cvs.openbsd.org 2001/08/30 22:22:32
         [ssh-keyscan.c]
         do not pass pointers to longjmp; fix from wayne@blorf.net

commit d71ba5771b5c67b4efd3294ecb85dc4d10d03265
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 18:03:31 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/30 20:36:34
         [auth-options.c sshd.8]
         validate ports for permitopen key file option. add host/port
         alternative syntax for IPv6. ok markus@

commit 62c25a43dbdd0dddb872b997a6f82b4f73c79180
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 18:01:59 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/30 16:04:35
         [readconf.c ssh.1]
         validate ports for LocalForward/RemoteForward.
         add host/port alternative syntax for IPv6 (like -L/-R).
         ok markus@

commit 6e69d532dc23ae8df9cb030427deb90851326333
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 17:59:59 2001 +0000

       - naddy@cvs.openbsd.org 2001/08/30 15:42:36
         [ssh.1]
         add -D to synopsis line; ok markus@

commit 60d82be9f31bfdfdd40034ff1f920467766b1eab
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 17:58:15 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/29 23:39:40
         [ssh.1 sshd.8]
         additional documentation for GatewayPorts; ok markus@

commit 1a1747172ec251739c846a378310bf7b5ba5b55d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 17:56:15 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/29 23:27:23
         [ssh.c]
         validate ports for -L/-R; ok markus@

commit 19ceb17040ba3c93833d4219d83f2002d25fd3fa
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 17:54:24 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/29 23:13:10
         [ssh.1 ssh.c]
         document -D and DynamicForward; ok markus

commit 6f672c09545b730a8763b42bf5418463f6ae2679
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 17:51:55 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/29 23:02:21
         [sshd.8]
         add text about -u0 preventing DNS requests; ok markus@

commit 5fccbc233957671774d925c8dc6694c7236b56a0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 17:49:48 2001 +0000

       - markus@cvs.openbsd.org 2001/08/29 20:44:03
         [scp.c]
         clear the malloc'd buffer, otherwise source() will leak malloc'd
         memory; ok theo@

commit 14f31ab947acd4c0b1698195782b904e0d6c7686
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 17:48:04 2001 +0000

       - markus@cvs.openbsd.org 2001/08/28 15:39:48
         [ssh.1 ssh.c]
         allow: ssh -F configfile host

commit 525a09389e05c2134b41ccee87deae5cff31d66f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 17:35:27 2001 +0000

       - markus@cvs.openbsd.org 2001/08/28 09:51:26
         [readconf.c]
         don't set DynamicForward unless Host matches

commit 78bbd9ebe348a4dc5dda23db4e281d90eeef85d5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 17:10:40 2001 +0000

       - danh@cvs.openbsd.org 2001/08/27 22:02:13
         [ssh-keyscan.c]
         fix memory fault if non-existent filename is given to the -f option
         ok markus@

commit 8d066fb262af638d0110437afa794ce46387e0dd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 17:06:13 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/23 18:08:59
         [ssh-add.1 ssh-keyscan.1]
         minor cleanup

commit ba1fa1d67b13b23ce089ee67d4cbdcb25cf6d349
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 17:02:49 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/23 18:02:48
         [ssh-agent.1]
         fix usage; ok markus@

commit ce89dacda8fed7173cb444bf5e5efc0483b6491f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 16:58:04 2001 +0000

       - camield@cvs.openbsd.org 2001/08/23 17:59:31
         [sshd.c]
         end request with 0, not NULL
         ok markus@

commit ffa1dd681712f92c71444cea28975265b826e8e8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 16:52:28 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/22 17:45:16
         [ssh.1]
         document cipher des for protocol 1; ok deraadt@

commit 044274bcb0ed2b0153d520ce500ebd886e0105f1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 16:46:08 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/22 16:30:02
         [sshd.8]
         no rexd; ok markus@

commit a10aed8b5e8f034815b8f36cea657693dcb4a905
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 16:43:26 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/22 16:21:21
         [ssh.1]
         hostname not optional; ok markus@

commit e59433da7a008e0af89be06db1d36046bb0e592b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 16:41:37 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/21 21:47:42
         [ssh.1 sshd.8]
         minor typos and cleanup

commit 7bb37b29c6082c86a2a8b4af4ad6bc6a00793323
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 16:40:05 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/17 18:59:47
         [servconf.h]
         typo in comment

commit 1c0fd09d15ac74eafe4c1fd75e6dbe295a47c7f3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 16:36:17 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/16 20:14:57
         [ssh.1 sshd.8]
         document case sensitivity for ssh, sshd and key file
         options and arguments; ok markus@

commit 91e9868e4ff0f5cd4e202282b66fbb2fbcc7c2e9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Sep 12 16:32:14 2001 +0000

       - jakob@cvs.openbsd.org 2001/08/16 19:18:34
         [servconf.c servconf.h session.c sshd.8]
         deprecate CheckMail. ok markus@

commit 19d7b8d3fa2c73d68ed60250c091f70ec44edbec
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Aug 16 00:09:49 2001 +0000

     - (bal) QNX resync.   OK tim@

commit 14c62eb2beb36b2898187b89e6c5058f8942a693
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Aug 15 23:25:46 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/14 17:54:29
         [scp.1 sftp.1 ssh.1]
         consistent documentation and example of ``-o ssh_option'' for sftp and
         scp; document keyword=argument for ssh.

commit 59e1249d67cea9e4fe571869750625b93c99a62b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Aug 15 23:22:56 2001 +0000

       - markus@cvs.openbsd.org 2001/08/14 09:23:02
         [sftp.1 sftp-int.c]
         "bye"; hk63a@netscape.net

commit 1fa90101f0072ba29594be257cdbd2c747d92535
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Aug 15 23:21:01 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/13 23:38:54
         [scp.c]
         don't need main prototype (also sync with rcp); ok markus@

commit 930b14a28e78be2884b87c8b4503f3df04de5316
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Aug 15 23:19:21 2001 +0000

       - jakob@cvs.openbsd.org 2001/08/11 22:51:27
         [ssh.c tildexpand.c]
         fix more paths beginning with "//"; <bradshaw@staff.crosswalk.com>.
         ok markus@

commit 049e0dd6cffbf6b5bffe0e2901957e87caccc869
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Aug 15 23:17:22 2001 +0000

       - markus@cvs.openbsd.org 2001/08/08 21:34:19
         [uidswap.c]
         undo last change; does not work for sshd

commit a66039373b81679d8af3ae6da347b1ebf0aedcc2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Aug 15 23:14:49 2001 +0000

       - markus@cvs.openbsd.org 2001/08/08 18:20:15
         [uidswap.c]
         permanently_set_uid is a noop if user is not privilegued;
         fixes bug on solaris; from sbi@uchicago.edu

commit 79e93bca6f158ae7cc7a0f15a66091b0dabac057
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Aug 15 23:06:59 2001 +0000

       - deraadt@cvs.openbsd.org 2001/08/08 07:16:58
         [scp.1]
         when describing the -o option, give -o Protocol=1 as the specific example
         since we are SICK AND TIRED of clueless people who cannot have difficulty
         thinking on their own.

commit c9a26364205602dab08fa6740185ad2a41550ea2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Aug 15 23:04:50 2001 +0000

       - markus@cvs.openbsd.org 2001/08/07 10:37:46
         [authfd.c authfd.h]
         extended failure messages from galb@vandyke.com

commit d0ff40847d8c84b2cad534080b97f81e0ec2deba
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Aug 15 22:58:59 2001 +0000

     - (bal) Fixed stray code in readconf.c that went in by mistake.

commit 4da21abd24856fe6dc3cc89d2ccf870f46dd5029
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Aug 14 21:02:15 2001 +0000

     - (stevesk) bsd-cray.c: more cleanup; ok wendyp@cray.com

commit 72992afb264bb7601e98e34f02fc524145081fe7
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Aug 14 20:54:52 2001 +0000

     - (stevesk) bsd-cray.c: utmp strings are not C strings

commit 25ee4e48f79681ce76122d2b4ddda46efcd37ca0
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Aug 14 20:41:34 2001 +0000

     - (stevesk) sshpty.c: return 0 on error in cray pty code;
       ok wendyp@cray.com

commit ad4aa5655dd67823af9b751d173e7ce166454770
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Aug 14 20:35:35 2001 +0000

    forgot this

commit f744b512f310db2c7e317ad55be011e21cd13ac3
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Aug 14 20:31:49 2001 +0000

     - (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup
       for some #ifdef _CRAY code; ok wendyp@cray.com

commit 56cb92968bc94322561e44959680a4dcf98bcc55
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Aug 12 13:02:50 2001 +1000

     - (djm) Fix detection of long long int support. Based on patch from
       Michael Stone <mstone@cs.loyola.edu>. ok stevesk, tim

commit 113339e024642f5480efe438d1ae462af356387a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Aug 9 00:56:52 2001 +0000

     - (bal) Minor correction to inet_ntop.h.  _BSD_RRESVPORT_H should be
        _BSD_INET_NTOP_H.  Pointed out by Mark Miller <markm@swoon.net>

commit e991e3cf221c9f898b7ec0c5e7492bb1202cefc4
Author: Tim Rice <tim@multitalents.net>
Date:   Tue Aug 7 15:29:07 2001 -0700

     - (tim) [configure.in sshconnect.c openbsd-compat/Makefile.in
             openbsd-compat/openbsd-compat.h ] Add inet_ntop.c inet_ntop.h back
             in. Needed for sshconnect.c
             [sshconnect.c] fix INET6_ADDRSTRLEN for non IPv6 machines
             [configure.in] make tests with missing libraries fail
             patch by Wendy Palm <wendyp@cray.com>
             Added openbsd-compat/bsd-cray.h. Selective patches from
             William L. Jones <jones@mail.utexas.edu>

commit 6db66ff3877f52110cda3104e798d91091af7200
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 23:29:16 2001 +0000

     - (bal) Second around of UNICOS patches.  A few other things left.
       Patches by William L. Jones <jones@mail.utexas.edu>

commit ff2866cf5198be7669423641538bb910080ee029
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 22:56:46 2001 +0000

     - (bal) ssh-keyscan double -lssh hack due to seed_rng().

commit 958d9f695b78a03645cb9b426855c291355b7091
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 22:48:19 2001 +0000

       - stevesk@cvs.openbsd.org 2001/08/06 19:47:05
         [scp.c]
         use alarm vs. setitimer for portable; ok markus@

commit de8fc6fadc2039747482f17bf4d32c505d0f0383
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 22:43:50 2001 +0000

       - markus@cvs.openbsd.org 2001/08/05 23:29:58
         [ssh-keyscan.c]
         make -t dsa work with commercial servers, too

commit 325e70c90f3896eff8df5676b500532ec8407789
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 22:41:30 2001 +0000

       - markus@cvs.openbsd.org 2001/08/05 23:18:20
         [ssh-keyscan.1 ssh-keyscan.c]
         ssh 2 support; from wayned@users.sourceforge.net

commit ddfb1e3a892f450178093964f11cdc534340a56a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 22:06:35 2001 +0000

       - jakob@cvs.openbsd.org 2001/08/03 10:31:30
         [ssh-add.c ssh-agent.c ssh-keyscan.c]
         improve usage(). ok markus@

commit e690121f0de556b0e4595630540ab0ae52115c0d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 22:03:08 2001 +0000

       - jakob@cvs.openbsd.org 2001/08/03 10:31:19
         [ssh-add.1]
         document smartcard options. ok markus@

commit 0b5afb98eba742712a30509778e3a1e73c16cea3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 22:01:29 2001 +0000

       - mpech@cvs.openbsd.org 2001/08/02 18:37:35
         [ssh-keyscan.1]
         o) .Sh AUTHOR -> .Sh AUTHORS;
         o) .Sh EXAMPLE -> .Sh EXAMPLES;
         o) Delete .Sh OPTIONS. Text moved to .Sh DESCRIPTION;
    
         millert@ ok

commit bcc1808bf26c36a393e0caf852d921cec59802c4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:59:25 2001 +0000

      - jakob@cvs.openbsd.org 2001/08/02 16:14:05
         [scard.c ssh-agent.c ssh.c ssh-keygen.c]
         clean up some /* SMARTCARD */. ok markus@

commit ffce1476383e513c252452d444d17af59c14ef2c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:57:31 2001 +0000

       - jakob@cvs.openbsd.org 2001/08/02 15:43:57
         [ssh-agent.c ssh.c ssh-keygen.c]
         add /* SMARTCARD */ to #else/#endif. ok markus@

commit 61eb9568b32a0c0d57808f9b7d12231d99220636
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:53:42 2001 +0000

       - jakob@cvs.openbsd.org 2001/08/02 15:32:10
         [ssh.c]
         add smartcard to usage(). ok markus@

commit a1ec4a9cb8b2f291780f7a66be967e8e22fc4bde
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:51:34 2001 +0000

       - jakob@cvs.openbsd.org 2001/08/02 15:07:23
         [ssh-keygen.1]
         document smartcard upload/download. ok markus@

commit 97be31e6ff07b4d396e95b0799dca754f013e1a8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:49:06 2001 +0000

       - jakob@cvs.openbsd.org 2001/08/02 15:06:52
         [ssh-keygen.c]
         more verbose usage(). ok markus@

commit f19578c447a5a9de60ab6b743ba67836d1f094e3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:46:54 2001 +0000

       - jakob@cvs.openbsd.org 2001/08/02 08:58:35
         [ssh-keygen.c]
         change -u (upload smartcard key) to -U. ok markus@

commit 8282d6a82f12cd5a3af77599766108177d89283d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:44:05 2001 +0000

       - markus@cvs.openbsd.org 2001/08/02 00:10:17
         [ssh-keygen.c]
         add -D readerid option (download, i.e. print public RSA key to stdout).
         check for card present when uploading keys.
         use strings instead of ints for smartcard reader ids, too.

commit a6c8a8d4d5c482163fc7c6784017cd8a802174f4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:42:00 2001 +0000

      - markus@cvs.openbsd.org 2001/08/01 23:38:45
         [scard.c ssh.c]
         support finish rsa keys.
         free public keys after login -> call finish -> close smartcard.

commit 6818bfbf3084af380eea97ac91237a9a201d9504
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:40:04 2001 +0000

       - markus@cvs.openbsd.org 2001/08/01 23:33:09
         [ssh-keygen.c]
         allow uploading RSA keys for non-default AUT0 (sha1 over passphrase
         like sectok).

commit 020a8699a946b9cefd850af82a22d953fd786e98
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:38:10 2001 +0000

       - markus@cvs.openbsd.org 2001/08/01 22:16:45
         [ssh.1 sshd.8]
         refer to current ietf drafts for protocol v2

commit f7db3bb64caf8d7822a18d6fd4c0480df7d0086d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:35:51 2001 +0000

       - markus@cvs.openbsd.org 2001/08/01 22:03:33
         [authfd.c authfd.h readconf.c readconf.h scard.c scard.h ssh-add.c
          ssh-agent.c ssh.c]
         use strings instead of ints for smartcard reader ids

commit 3ab1dfa2a654b6764eaa121f7111e94c35175894
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:33:44 2001 +0000

       - jakob@cvs.openbsd.org 2001/07/31 12:53:34
         [scard.c]
         close smartcard connection if card is missing

commit 95148e3de293052afa4cc7708bc1547c697903cc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:30:53 2001 +0000

       - jakob@cvs.openbsd.org 2001/07/31 12:42:50
         [sftp-int.c sftp-server.c]
         avoid paths beginning with "//"; <vinschen@redhat.com>
         ok markus@

commit ae996bf7d1967c83a0e0d71e9e89fa9a27d839f9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:27:53 2001 +0000

       - jakob@cvs.openbsd.org 2001/07/31 09:28:44
         [readconf.c readconf.h ssh.1 ssh.c]
         add 'SmartcardDevice' client option to specify which smartcard device
         is used to access a smartcard used for storing the user's private RSA
         key. ok markus@.

commit 94baf30d14ec1fb5b483ccca983d9faf3ef0ae2e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:25:38 2001 +0000

       - jakob@cvs.openbsd.org 2001/07/31 08:41:10
         [scard.c]
         do not complain about missing smartcards. ok markus@

commit 0256e8b93c79b3eb4e9c69a3c550a209ca2018f7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:24:11 2001 +0000

       - stevesk@cvs.openbsd.org 2001/07/30 16:23:30
         [rijndael.c rijndael.h]
         new BSD-style license:
         Brian Gladman <brg@gladman.plus.com>:
         >I have updated my code at:
         >http://fp.gladman.plus.com/cryptography_technology/rijndael/index.htm
         >with a copyright notice as follows:
         >[...]
         >I am not sure which version of my old code you are using but I am
         >happy for the notice above to be substituted for my existing copyright
         >intent if this meets your purpose.

commit 30b00be24f3e60dcb6d3113a8507d8b81e895460
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:22:10 2001 +0000

       - jakob@cvs.openbsd.org 2001/07/30 16:06:07
         [scard.c scard.h]
         better errorcodes from sc_*; ok markus@

commit 50e22c937f73319bd2eee30abc166b8bd403598f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:20:22 2001 +0000

       - mouring@cvs.openbsd.org 2001/07/29 17:02:46
         [scp.1]
         Clarified -o option in scp.1  OKed by Markus@

commit 07d24dcbd8818a18224d0b40b76160832dcbd4c6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:18:57 2001 +0000

       - markus@cvs.openbsd.org 2001/07/28 09:21:15
         [sshd.8]
         cleanup some RSA vs DSA vs SSH1 vs SSH2 notes

commit 2772a3f8643d085b78110afdd1b84296c04baca9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:17:12 2001 +0000

       - deraadt@cvs.openbsd.org 2001/07/27 17:26:16
         [scp.c]
         shorten lines

commit 711b04a56a7cf587131ae1910d243207062086ec
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:12:42 2001 +0000

       - millert@cvs.openbsd.org 2001/07/27 14:50:45
         [ssh.c]
         If smart card support is compiled in and a smart card is being used
         for authentication, make it the first method used.  markus@ OK

commit 60df8e4f7d9f7c36b5fac87d10d9edb217d2d6e7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:10:52 2001 +0000

       - rees@cvs.openbsd.org 2001/07/26 20:04:27
         [scard.c ssh-keygen.c]
         Inquire Cyberflex class for 0xf0 cards
         change aid to conform to 7816-5
         remove gratuitous fid selects

commit 794325ac7a490d02c9ce5c0ad3093e1874df59a0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:09:07 2001 +0000

       - stevesk@cvs.openbsd.org 2001/07/26 17:18:22
         [sshd.8 sshd.c]
         add -t option to test configuration file and keys; pekkas@netcore.fi
         ok markus@

commit f9cedb9ca0c90652712b8e652d5ce740c903ee9b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:07:11 2001 +0000

       - markus@cvs.openbsd.org 2001/07/25 14:35:18
         [readconf.c ssh.1 ssh.c sshconnect.c]
         cleanup connect(); connection_attempts 4 -> 1; from
    eivind@freebsd.org

commit f9bedf1441832e9ab71dd69d83ec2c33774e83e8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:05:05 2001 +0000

       - markus@cvs.openbsd.org 2001/07/25 11:59:35
         [scard.c]
         typo in comment

commit ff6458e03e64e0942379bed22119e902e4cc2b08
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:03:23 2001 +0000

       - stevesk@cvs.openbsd.org 2001/07/23 18:21:46
         [xmalloc.c]
         no zero size xstrdup() error; ok markus@

commit 940fb86c9a0ff501f812041ebaad09538c09b1b8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:01:49 2001 +0000

       - stevesk@cvs.openbsd.org 2001/07/23 18:14:58
         [auth2.c auth-rsa.c]
         use %lu; ok markus@

commit d18c80c2a65d7dd92d83c4f098132840e5450e86
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 21:00:27 2001 +0000

       - aaron@cvs.openbsd.org 2001/07/23 14:14:18
         [ssh-keygen.1]
         Fix typo.

commit a9086a1c4c603d277f1259b51d1df7b89a0554a8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 20:58:51 2001 +0000

       - markus@cvs.openbsd.org 2001/07/23 12:47:05
         [ssh.1]
         sync PreferredAuthentications

commit 45350e83746e958d3ee2a375fb3c9d8f79f61650
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 20:57:11 2001 +0000

       - markus@cvs.openbsd.org 2001/07/23 09:06:28
         [sshconnect2.c]
         reorder default sequence of userauth methods to match ssh behaviour:
         hostbased,publickey,keyboard-interactive,password

commit c8e29ceb683e32c86523d9b8349cfab01d2c00ce
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 20:55:28 2001 +0000

       - markus@cvs.openbsd.org 2001/07/22 22:24:16
         [sshd.8]
         Xr login.conf

commit 0076d75c253af56d178c584bd110425d884d9b9c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 20:53:26 2001 +0000

       - markus@cvs.openbsd.org 2001/07/22 22:04:19
         [readconf.c ssh.1]
         enable challenge-response auth by default; ok millert@

commit e2b9b064257a64550fba5a03f307bb5138b67717
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 20:50:55 2001 +0000

       - pvalchev@cvs.openbsd.org 2001/07/22 21:32:42
         [ssh.1]
         There is no option "Compress", point to "Compression" instead; ok
         markus

commit c88785efc8d38b6093ae21045dc0e8188ec42848
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Aug 6 20:47:23 2001 +0000

       - markus@cvs.openbsd.org 2001/07/22 21:32:27
         [sshpty.c]
         update comment

commit 2ab5924d1fd11233b50714ef40384a62e1f6740a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 6 16:51:49 2001 +1000

     - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
       a fast UltraSPARC.

commit e26a155415ffb384fd95296b2ed9e129169abd10
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Jul 26 17:51:49 2001 +0000

     - (stevesk) use mysignal() in protocol 1 loop now that the SIGCHLD
       handler has converged.

commit 8103de7d06ca2ed9157f73a6c2eb6ee1567aebab
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 25 16:24:33 2001 +0000

     - (bal) Added 'install-nokeys' to Makefile to assist package builders.

commit f7c256a7063b2aa9dcfebf4b9d99368989340bde
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 25 10:11:15 2001 +1000

    Use x11-ssh-askpass 1.2.2

commit 8e2aa5bb63b02606cadd938c5d33bd89d4dd8ea1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jul 24 17:00:13 2001 +0000

     - (bal) 4711 not 04711 for ssh binary.

commit 979c981f99de7e7a3589018852482b0a9c57907b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 22 20:45:39 2001 +0000

       - stevesk@cvs.openbsd.org 2001/07/20 18:41:51
         [ssh.1]
         "the" command line

commit 0250da057d8eea11ee76ff5100be41bb2ce2241c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 22 20:44:00 2001 +0000

       - markus@cvs.openbsd.org 2001/07/20 14:46:11
         [ssh-agent.c]
         do not exit() from signal handlers; ok deraadt@

commit 660076925e6ad3c001835568c786e3f63f75ddab
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 22 20:41:59 2001 +0000

       - stevesk@cvs.openbsd.org 2001/07/19 00:41:44
         [ssh.1]
         escape chars are below now

commit 3fdf8761078e27120b27a9801faed2e69ed998e7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 22 20:40:24 2001 +0000

       - stevesk@cvs.openbsd.org 2001/07/18 21:40:40
         [ssh-agent.c]
         chdir("/") from bbraun@synack.net; ok markus@

commit d01ba9898661052f1b8c154b5d457e85aec75b5f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 22 20:36:57 2001 +0000

     - OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2001/07/18 21:10:43
         [sshpty.c]
         pr #1946, allow sshd if /dev is readonly

commit d9e0824b437bb4d65c1ae564b049e35c93e31010
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 22 19:32:00 2001 +0000

     - (bal) Starting the Unicossmk merger.  File merged TODO, configure.in,
             myproposal.h, ssh_prng_cmds.in, and openbsd-compat/Makefile.in.
             Added openbsd-compat/bsd-cray.c.  Rest will be merged after
             approval.  Selective patches from William L. Jones
             <jones@mail.utexas.edu>

commit 5d629cb65344e14642264a33c9f4019ad609c266
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Jul 19 20:33:46 2001 -0700

     - (tim) [configure.in] put inet_aton back in AC_CHECK_FUNCS.
             report from Mark Miller <markm@swoon.net>

commit dc00c93b6c7992efbc06660410b371cc3c9152b1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 18 16:50:33 2001 +0000

     - OpenBSD CVS Sync
       - mouring@cvs.openbsd.org 2001/07/18 16:45:52
         [scp.c]
         Missing -o in scp usage()

commit a92783fbfa95403cf2040b3375ea20ff3a4e3345
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 18 16:27:31 2001 +0000

    cvs + pico == Bad when attempting to abort.  <sigh>  This should go with
    the last update.
    
     - (bal) Updated cygwin README and ssh-host-config.  Patch by
             Corinna Vinschen <vinschen@redhat.com>

commit a5820295c343b19d80a01eca537463a8c890e995
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 18 16:25:41 2001 +0000

    *** empty log message ***

commit cff94beb65f9196b213a17c9fac5fb91f3b6078a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 18 16:19:48 2001 +0000

     - (bal) Allow sshd to switch user context without password for Cygwin.
             Patch by Corinna Vinschen <vinschen@redhat.com>

commit 0dd676a26beb382d22ccb51090f067a4481ea014
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 18 16:05:50 2001 +0000

     - (bal) Cleaned up trailing spaces in ChangeLog.

commit 16d29d57e85fd84c9dc06fd803d1abeceadff14c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 18 16:01:46 2001 +0000

       - markus@cvs.openbsd.org 2001/07/17 21:04:58
         [channels.c channels.h clientloop.c nchan.c serverloop.c]
         keep track of both maxfd and the size of the malloc'ed fdsets.
         update maxfd if maxfd gets closed.

commit a3d5a4c2dbc4fa92333b76882b00e3811177eff6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 18 15:58:08 2001 +0000

       - markus@cvs.openbsd.org 2001/07/17 20:48:42
         [ssh-agent.c]
         update maxfd if maxfd is closed; report from jmcelroy@dtgnet.com

commit a7fc2f74348d0d3d2cf4c31ea6aa9fe08f2ba165
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 18 15:53:39 2001 +0000

       - stevesk@cvs.openbsd.org 2001/07/15 16:58:29
         [ssh-agent.c]
         typo in usage; ok markus@

commit a4a5323b2aee07f791343ed298e21543f3b50d6a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 18 15:51:00 2001 +0000

       - stevesk@cvs.openbsd.org 2001/07/15 16:57:21
         [ssh-agent.1]
         -d will not fork; ok markus@

commit 36857f6b8b29b208133e40f5111c68d5f5b9f464
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 18 15:48:57 2001 +0000

       - markus@cvs.openbsd.org 2001/07/15 16:17:08
         [serverloop.c]
         schedule client alive for ssh2 only, greg@cheers.bungi.com

commit ad77313f220c3b6f234b8a7a1d0bd41f71dee76c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 18 15:45:44 2001 +0000

     - OpenBSD CVS Sync
        - stevesk@cvs.openbsd.org 2001/07/14 15:10:17
          [readpass.c sftp-client.c sftp-common.c sftp-glob.c]
          delete spurious #includes; ok deraadt@ markus@

commit 2db5371d30d5c63fb0fa3e6502cf82520d07a154
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Jul 15 19:07:49 2001 -0700

     - (tim) put openssh/openbsd-compat/inet_aton.[ch] back in.
             (needed by openbsd-compat/fake-getaddrinfo.c)

commit fed7bb498f43a03f63976ac416e2d7ff4825a0ec
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jul 15 18:30:42 2001 +0000

     - (bal) Set "BROKEN_GETADDRINFO" for darwin platform.  Reported by
        Josh Larios <jdlarios@cac.washington.edu>

commit 6482ec865ab7c38a32f2dd431922f75f1c785c43
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jul 15 02:09:28 2001 +0000

     - (stevesk) configure.in: use ll suffix for long long constant
       in snprintf() test

commit 60193f70f7f246eb4a4b3530fa25323e6ba5f683
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Jul 14 16:05:55 2001 +0000

     - (stevesk) change getopt() declaration

commit 4f8e66929b592825856df3625f5de7922f826020
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 13:22:53 2001 +1000

     - (djm) Pull in getopt(3) from OpenBSD libc for the optreset extension.

commit 8f6bc30a4b23fb07ca3aca01a745f070a2129760
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 13:07:43 2001 +1000

     - (djm) Reorder Makefile.in so clean targets work a little better when
       run directly from Makefile.in

commit 0ae6e009c8c6c61e16407b906ee80714daf61037
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 12:21:34 2001 +1000

       - markus@cvs.openbsd.org 2001/07/11 18:26:15
         [auth.c]
         no need to call dirname(pw->pw_dir).
         note that dirname(3) modifies its argument on some systems.

commit 1b73448d6d6aaab3b2610197a57d0775bdd690fe
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 12:21:07 2001 +1000

       - markus@cvs.openbsd.org 2001/07/11 16:29:59
         [ssh.c]
         sort options string, fix -p, add -k

commit c4b7feabe0f65e8fc67aa1a213749b974e9fced9
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 12:20:32 2001 +1000

       - itojun@cvs.openbsd.org 2001/07/11 00:24:53
         [servconf.c]
         make it compilable in all 4 combination of KRB4/KRB5 settings.
         dugsong ok
         XXX isn't it sensitive to the order of -I/usr/include/kerberosIV and
         -I/usr/include/kerberosV?

commit 07ab49ef71a627452bcb14f62bdb08c0cc9ee49e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 12:19:56 2001 +1000

       - markus@cvs.openbsd.org 2001/07/10 21:49:12
         [readpass.c]
         don't panic if fork or pipe fail (just return an empty passwd).

commit efb1edfc7fb393b8de2f50efa77c006f3bfe5394
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 12:19:36 2001 +1000

       - deraadt@cvs.openbsd.org 2001/07/09 07:04:53
         [session.c sftp-int.c]
         correct type on last arg to execl(); nordin@cse.ogi.edu

commit f4614450d10eaef8c256a561e9b7887c31333e09
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 12:18:10 2001 +1000

     - OpenBSD CVS Sync
       - fgsch@cvs.openbsd.org 2001/07/09 05:58:47
         [ssh.c]
         Use getopt(3); markus@ ok.

commit 40857852760cec8b0207fccfd4e091ea9fc953dd
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 12:17:33 2001 +1000

     - OpenBSD CVS Sync
       - stevesk@cvs.openbsd.org 2001/07/08 15:23:38
         [servconf.c]
         fix ``MaxStartups max''; ok markus@

commit 40eb1d82bb92c9b1f0d5b40367b6f2aca7a8aca6
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 12:16:59 2001 +1000

     - OpenBSD CVS Sync
       - stevesk@cvs.openbsd.org 2001/07/05 20:32:47
         [sshconnect1.c]
         statement after label; ok dugsong@

commit ea12acf3ac7f060ed17080562e39215be43e5459
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 12:14:56 2001 +1000

     - OpenBSD CVS Sync
       - espie@cvs.openbsd.org 2001/07/05 11:43:33
         [sftp-glob.c]
         Directly cast to the right type. Ok markus@

commit f3512d9ba7e7ee92493cf394610c2ca047a0f637
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 12:14:27 2001 +1000

     - OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2001/07/04 23:49:27
         [ssh-agent.c]
         handle mutiple adds of the same smartcard key

commit 8d4bf17036562678cb54653c3167d95f68ac9f09
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 12:13:49 2001 +1000

     - OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2001/07/04 23:39:07
         [ssh-agent.c]
         for smartcards remove both RSA1/2 keys

commit 694be4b1d5b42ff176bafbed1c8f2aaa680ff21c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 12:13:26 2001 +1000

     - OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2001/07/04 23:13:10
         [scard.c scard.h ssh-agent.c]
         handle card removal more gracefully, add sc_close() to scard.h

commit 48bfa9cafaff0a8f615cb16449f9a3a2fdc39d67
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 12:12:55 2001 +1000

     - OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2001/07/04 22:47:19
         [ssh-agent.c]
         ignore SIGPIPE when debugging, too

commit 98273e3adeac9aba6851bd74a662a3735fc2448b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 11:55:15 2001 +1000

     - (djm) Revert dirname fix, a better one is on its way.

commit c62f1fc3ff9181894095bd505c7d54d0b5411be7
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 14 11:54:05 2001 +1000

     - (djm) Enable /etc/nologin check on PAM systems, as some lack the
       pam_nologin module. Report from William Yodlowsky
       <bsd@openbsd.rutgers.edu>

commit eec0c25f2a1704b871ceafff4c3cc96dd985b63b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 11 21:32:20 2001 +1000

     - (djm) dirname(3) may modify its argument on glibc and other systems.
       Patch from markus@, spotted by Tom Holroyd <tomh@po.crl.go.jp>

commit 024acc46e6d145708881b854c84b0eb879550c38
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jul 4 21:27:20 2001 -0700

     - (tim) [openbsd-compat/dirname.h] Remove ^M causing some compilers to
             issue warning (line 1: tokens ignored at end of directive line)
     - (tim) [sshconnect1.c] give the compiler something to do for success:
             if KRB5 and AFS are not defined.
             (ERROR: "sshconnect1.c", line 1274: Syntax error before or at: })

commit 7281a9bc8c1094c6b9ac92e7eaa2b76a8ca1f13d
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Jul 4 17:45:28 2001 -0700

    [contrib/caldera/openssh.spec] sync with Caldera

commit e468de65258b547cc113e822b9708d408aeb1310
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jul 4 18:37:20 2001 +0000

     - (stevesk) sync servconf.h (comments)

commit 27fd19291af95ae39d705eee4975d40cfb47b3ec
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jul 4 18:29:14 2001 +0000

    whitespace sync

commit 8f63caa1973bb714fd80357b46d57f328e928b14
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jul 4 18:23:02 2001 +0000

     - (stevesk) more sync for session.c

commit 08ccf9d08c44a622166ccae6b80495391d649df0
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jul 4 17:52:01 2001 +0000

    whitespace sync

commit d009ae3d04b7ea4e5385e2ca98394d8ddfefda93
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jul 4 17:25:54 2001 +0000

     - (stevesk) sync misc.h

commit f70b59c0393722baf3af24bedff7ba03553b7924
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:40:19 2001 +0000

     - (bal) Makefile fix up requires scard.c

commit 3133dbbdba20943f283f818f42265d956722e884
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:35:00 2001 +0000

     - (bal) forget a few new files in sync up.

commit 809744e9125bb96c7115922bf747dc88c60a199e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:26:06 2001 +0000

       - markus@cvs.openbsd.org 2001/07/02 22:52:57
         [channels.c channels.h serverloop.c]
         improve cleanup/exit logic in ssh2:
         stop listening to channels, detach channel users (e.g. sessions).
         wait for children (i.e. dying sessions), send exit messages,
         cleanup all channels.

commit 0047764526a5abcadc5cad7fe00d244e0dc47f75
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:24:27 2001 +0000

       - markus@cvs.openbsd.org 2001/07/02 22:40:18
         [ssh-keygen.c]
         update for sectok.h interface changes.

commit 4f42d8cda393bebebdd5ab706464e60ecdb7346f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:19:27 2001 +0000

       - markus@cvs.openbsd.org 2001/07/02 22:29:20
         [readpass.c]
         do not return NULL, use "" instead.

commit 4983d5ebd50800edd3c7caa08a37a5206221441d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:17:40 2001 +0000

       - markus@cvs.openbsd.org 2001/07/02 13:59:15
         [serverloop.c session.c session.h]
         wait until !session_have_children(); bugreport from
         Lutz.Jaenicke@aet.TU-Cottbus.DE

commit 173e646f7e04e559feb8815c27f2ffb13581d91e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:15:15 2001 +0000

       - stevesk@cvs.openbsd.org 2001/06/30 18:08:40
         [channels.c channels.h clientloop.c]
         adress -> address; ok markus@

commit 1118095d33e01dbec3b627d99d3c4b83b82523dc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:13:35 2001 +0000

       - stevesk@cvs.openbsd.org 2001/06/29 18:40:28
         [channels.c]
         use socklen_t for getsockopt arg #5; ok markus@

commit db47f383e6718b102dfe562e5c80f83330c08593
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:10:27 2001 +0000

       - stevesk@cvs.openbsd.org 2001/06/29 18:38:44
         [clientloop.c]
         sync function definition with declaration; ok markus@

commit d6e049cd59712b42ceb6d7cdfec254706c0480a2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:08:39 2001 +0000

       - markus@cvs.openbsd.org 2001/06/29 07:11:01
         [ssh-keygen.c]
         initialize early

commit 7feba35a47ad79dd344eee01a07f1dace1c06622
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:06:59 2001 +0000

       - markus@cvs.openbsd.org 2001/06/29 07:06:34
         [ssh-keygen.c]
         new error handling for cyberflex_*

commit 511d69e6d757a21bb1939fa73ceb28eb6682cf1b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:05:27 2001 +0000

       - stevesk@cvs.openbsd.org 2001/06/28 19:57:35
         [ssh-keygen.c]
         '\0' terminated data[] is ok; ok markus@

commit 44e49afae2fd3a0f3acc162cce0c780b503fcbe2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:03:51 2001 +0000

       - markus@cvs.openbsd.org 2001/06/27 06:26:36
         [ssh-add.c]
         convert to getopt(3)

commit f7297dd79d37768c5cdd55ca15d2cf13963b7281
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:02:23 2001 +0000

       - markus@cvs.openbsd.org 2001/06/27 05:42:25
         [rsa.c rsa.h ssh-agent.c ssh-keygen.c]
         s/generate_additional_parameters/rsa_generate_additional_parameters/
         http://www.humppa.com/

commit 680b276aad588b1006b5199a66e374d3f0936079
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 05:00:11 2001 +0000

       - markus@cvs.openbsd.org 2001/06/27 05:35:42
         [ssh-keygen.c]
         use cyberflex_inq_class to inquire class.

commit 60260022eeb9ca1a1e0f25eb51e354433c3566a4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 04:56:44 2001 +0000

       - markus@cvs.openbsd.org 2001/06/27 04:48:53
         [auth.c match.c sshd.8]
         tridge@samba.org

commit bddd551e1143ba2b7bf0cd453c15b97817bc917d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 04:53:53 2001 +0000

       - markus@cvs.openbsd.org 2001/06/27 02:12:54
         [serverloop.c serverloop.h session.c session.h]
         quick hack to make ssh2 work again.

commit c5b680018b1fbc58ad2316199693e2805dadf638
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 04:52:03 2001 +0000

       - markus@cvs.openbsd.org 2001/06/26 20:14:11
         [key.c key.h ssh.c sshconnect1.c sshconnect2.c]
         add smartcard support to the client, too (now you can use both
         the agent and the client).

commit eb7a84c49e6248279ba130f8592bae356e7fb61e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 04:48:36 2001 +0000

       - dugsong@cvs.openbsd.org 2001/06/26 17:41:49
         [servconf.c]
         #include <kafs.h>

commit 4cc240dabbd81a308f06f2717b1942041fe0e205
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 04:46:56 2001 +0000

       - markus@cvs.openbsd.org 2001/06/26 17:27:25
         [authfd.h authfile.h auth.h auth-options.h bufaux.h buffer.h
          canohost.h channels.h cipher.h clientloop.h compat.h compress.h
          crc32.h deattack.h dh.h dispatch.h groupaccess.c groupaccess.h
          hostfile.h kex.h key.h log.c log.h mac.h misc.c misc.h mpaux.h
          packet.h radix.h readconf.h readpass.h rsa.h servconf.h serverloop.h
          session.h sftp-common.c sftp-common.h sftp-glob.h sftp-int.h
          sshconnect.h ssh-dss.h sshlogin.h sshpty.h ssh-rsa.h sshtty.h
          tildexpand.h uidswap.h uuencode.h xmalloc.h]
         remove comments from .h, since they are cut&paste from the .c files
         and out of sync

commit 5bf5d67d497ed91c19851db6b904d54003afe67e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 04:31:38 2001 +0000

       - markus@cvs.openbsd.org 2001/06/26 17:25:34
         [ssh.1]
         document SSH_ASKPASS; fubob@MIT.EDU

commit ec95ed9b4ca014643a0272f6fa5b24ac9c70d263
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 04:21:14 2001 +0000

       - dugsong@cvs.openbsd.org 2001/06/26 16:15:25
         [auth1.c auth.h auth-krb4.c auth-passwd.c readconf.c readconf.h
          servconf.c servconf.h session.c sshconnect1.c sshd.c]
         Kerberos v5 support for SSH1, mostly from Assar Westerlund
         <assar@freebsd.org> and Bjorn Gronvall <bg@sics.se>. markus@ ok

commit b4c774cf8878d9100fde92ff4e938671c3b0301b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 04:07:12 2001 +0000

       - itojun@cvs.openbsd.org 2001/06/26 06:33:07
         [servconf.h serverloop.h session.h sftp-client.h sftp-common.h
          sftp-glob.h sftp-int.h sshconnect.h ssh-dss.h sshlogin.h sshpty.h
          ssh-rsa.h tildexpand.h uidswap.h uuencode.h xmalloc.h]
         prototype pedant.  not very creative...
         - () -> (void)
         - no variable names

commit 16ae3d0dba5f81e5602798b915105284033dea75
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 04:02:36 2001 +0000

       - itojun@cvs.openbsd.org 2001/06/26 06:32:58
         [atomicio.h authfd.h authfile.h auth.h auth-options.h bufaux.h
          buffer.h canohost.h channels.h cipher.h clientloop.h compat.h
          compress.h crc32.h deattack.h dh.h dispatch.h groupaccess.h
          hostfile.h kex.h key.h log.h mac.h match.h misc.h mpaux.h packet.h
          radix.h readconf.h readpass.h rsa.h]
         prototype pedant.  not very creative...
         - () -> (void)
         - no variable names

commit 90279d80f57c79ac6566051172a94a2cca9674b1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 03:56:56 2001 +0000

       - markus@cvs.openbsd.org 2001/06/26 05:50:11
         [auth2.c]
         new interface for secure_filename()

commit 88a6b7581b136149c0b05c278912deb95859333e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 03:55:21 2001 +0000

       - mpech@cvs.openbsd.org 2001/06/26 05:48:07
         [sshd.8]
         remove unnecessary .Pp between .It;
         millert@ ok

commit 3f471630bbe2e75ab5db9368778551474770f78e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 03:53:15 2001 +0000

       - markus@cvs.openbsd.org 2001/06/26 05:33:34
         [ssh-agent.c]
         more smartcard support.

commit db6b276f5a5c88e76bbe6705d19c938736248d54
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 03:51:35 2001 +0000

       - markus@cvs.openbsd.org 2001/06/26 05:07:43
         [ssh-agent.c]
         update usage

commit 036a6b28c9ef5a237e2fbd7d73ca94af3d24e897
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 03:50:02 2001 +0000

       - markus@cvs.openbsd.org 2001/06/26 04:59:59
         [authfd.c authfd.h ssh-add.c]
         initial support for smartcards in the agent

commit d94580c708175649f4e433451ac096425d3b81e2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 03:48:02 2001 +0000

       - markus@cvs.openbsd.org 2001/06/26 04:07:06
         [ssh-agent.1 ssh-agent.c]
         add debug flag

commit cd392284acc87a4e0a4b687163355b706b9e97cf
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 03:44:03 2001 +0000

       - markus@cvs.openbsd.org 2001/06/26 02:47:07
         [ssh-keygen.c]
         allow loading a private RSA key to a cyberflex card.

commit 79073822999e641b8705be9fcd8214b98856dd47
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 03:42:30 2001 +0000

       - stevesk@cvs.openbsd.org 2001/06/25 20:26:37
         [auth2.c sshconnect2.c]
         prototype cleanup; ok markus@

commit 248c0784bfcadea9bed9dd9b919b7e4633b4f86a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 03:40:39 2001 +0000

       - provos@cvs.openbsd.org 2001/06/25 17:54:47
         [auth.c auth.h auth-rsa.c]
         terminate secure_filename checking after checking homedir.  that way
         it works on AFS.  okay markus@

commit bda98b0091bb96ece12b6f54e7fa93cd832da772
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 03:35:24 2001 +0000

       - markus@cvs.openbsd.org 2001/06/25 17:18:27
         [ssh-keygen.1]
         sshd(8) will never read the private keys, but ssh(1) does;
         hugh@mimosa.com

commit 44697233257d80aa46402e7a6207ef8d6fe359e4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jul 4 03:32:30 2001 +0000

       - markus@cvs.openbsd.org 2001/06/25 08:25:41
         [channels.c channels.h cipher.c clientloop.c compat.c compat.h
          hostfile.c kex.c kex.h key.c key.h nchan.c packet.c serverloop.c
          session.c session.h sftp-server.c ssh-add.c ssh-agent.c uuencode.h]
         update copyright for 2001

commit 5cc6e92251b33578a7dbb29581e789d9e7182580
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Jun 29 19:51:48 2001 +0000

     - (stevesk) remove cli.[ch]

commit 9b26f96c122c2268debbe418b42a2eb1dd19896b
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Jun 29 17:52:17 2001 +0000

     - (stevesk) session.c: use u_int for envsize

commit 78e83b3e5e711f3bc462c76e1f07a6d980f9b529
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Jun 29 16:56:16 2001 +0000

     - (stevesk) remove _REENTRANT #define

commit 1cd6fefcc8c26d3ee3a2494e7df15b4407f9f270
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 29 12:39:23 2001 +0000

     - (bal) Updated zlib's home.  Thanks to David Howe <DaveHowe@gmx.co.uk>.

commit 5d739a4c86d69598f4a42b22aab6e224030ac403
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 29 12:35:12 2001 +0000

     - (bal) Fixed _DISABLE_VPOSIX in readpassphrase.c.

commit deacfcc43f968f20c7aa6e99ae077b7036059850
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jun 29 12:32:31 2001 +0000

     - (bal) Removed net_aton() since we don't use it any more

commit 961e98c6869b6c6ea98b007957687a9a9ef64252
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 28 23:30:38 2001 +0000

    You know I really should wake up. <sigh> Stop those 3 files from files from
    being compiled since we removed them. =)

commit e6affc6a13304e8f0cb81b467f70d414733e8457
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 28 23:27:37 2001 +0000

     - (bal) Remove getusershell() since it's no longer use

commit f96d887d75674e57ba823f190d73a5ddf50d126a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 28 23:21:28 2001 +0000

     - (bal) Removed strtok_r and inet_ntop since they are no longer used.

commit acf59e68cbf38be8baa151c22edcfaf7724d0928
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 28 20:23:14 2001 +1000

     - (djm) Fix from Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> for my
       broken makefile

commit 180207ffe1a54bb15d10ce54fdc854b8dcd0511f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 28 14:48:28 2001 +1000

    20010628
     - (djm) Sync openbsd-compat with -current libc

commit 315f8b70b0e255fd7c2222794631d233569ce22b
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Jun 28 00:24:41 2001 +0000

     - (stevesk) use X/Open socket interface for HP-UX 10.X also

commit 37a777e98b95571fc570e7d161cb1b20b81dcf1d
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Jun 28 00:13:48 2001 +0000

     - (stevesk) fix x11 forwarding from _PATH_XAUTH change

commit 6a7b0de576a8aa1a7814774e21c5dd9a50bb1874
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jun 27 16:32:24 2001 +0000

     - (stevesk) for HP-UX 11.X use X/Open socket interface;
        pulls in modern socket prototypes and eliminates a number of compiler
        warnings.  see xopen_networking(7).

commit 79b332dd6748980cf9c8af39e3194a7e272b9256
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 27 23:36:08 2001 +1000

     - (djm) Fix a few warnings the above turned up

commit 649d999b4bab2d2ff5fadf7c77f2d685ece4708c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 27 23:35:51 2001 +1000

     - (djm) Turn up warnings if gcc or egcs detected

commit b90416b7df65a0d8e36c5e6887e33ebd8b25125c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 27 23:26:38 2001 +1000

     - (djm) Sync with -current openbsd-compat/readpassphrase.c:
       - djm@cvs.openbsd.org 2001/06/27 13:23:30
         typo, spotted by Tom Holroyd <tomh@po.crl.go.jp>; ok deraadt@

commit b5b0af4d58906ff332ec0b67ca0b9cf3965f926a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 27 21:52:32 2001 +1000

     - (djm) Oops, forgot make logic for primes=>moduli. Also try to rename
       existing primes->moduli if it exists.

commit 407548b7ed6c0496033c8689c05beca3215f89c7
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 27 17:07:16 2001 +1000

     - (djm) Rename sysconfdir/primes => sysconfdir/moduli

commit ec9868aa3cc83dc0723c038cc02250dbdaed0110
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 27 15:36:43 2001 +1000

     - (djm) Remove redundant and incorrect test for max auth attempts in
       PAM kbdint code. Based on fix from Matthew Melvin
      <matthewm@webcentral.com.au>

commit 665af9cae7850c9df87f98c6604564652857d9ba
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 27 09:34:15 2001 +1000

     - (djm) Reintroduce pam_session call for non-pty sessions.

commit c8a3868ed0a9c8291c36e79180e18342acd4ed71
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 25 18:09:16 2001 +1000

     - (djm) Bring in readpassphrase() from OpenBSD libc. Compiles OK on Linux and
       Solaris

commit 2d5ac08f13a8e1f52f00c8ad67f9f03736371cc2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 25 17:07:59 2001 +1000

    -Wall

commit 491bbb811a2983cc98beb788d845066f54ba9d3c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 05:24:16 2001 +0000

       - markus@cvs.openbsd.org 2001/06/24 17:18:31
         [ttymodes.c]
         passing modes works fine: debug2->3

commit 126c56ad9e54ab6149f6e8c147d53a7b87c01256
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 05:22:53 2001 +0000

       - markus@cvs.openbsd.org 2001/06/24 05:47:13
         [sshconnect2.c]
         oops, missing format string

commit 949974bbdb057202a429036a18fe36de5a7b6eac
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 05:20:31 2001 +0000

       - markus@cvs.openbsd.org 2001/06/24 05:35:33
         [readpass.c readpass.h ssh-add.c sshconnect2.c ssh-keygen.c]
         switch to readpassphrase(3)
         2.7/8-stable needs readpassphrase.[ch] from libc

commit f0c50293dddf8b36e9511fdf1c2f3f443800e51c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 05:17:53 2001 +0000

       - markus@cvs.openbsd.org 2001/06/24 05:25:10
         [auth-options.c match.c match.h]
         move ip+hostname check to match.c

commit 05209451795171b9c851daa3473e4a52745c50d5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 05:16:02 2001 +0000

       - markus@cvs.openbsd.org 2001/06/23 22:37:46
         [sshconnect1.c]
         consistent with ssh2: skip key if empty passphrase is entered,
         retry num_of_passwd_prompt times if passphrase is wrong. ok fgsch@

commit 980978639c3d4d5dcb1dd184861a83b280147460
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 05:10:20 2001 +0000

       - markus@cvs.openbsd.org 2001/06/23 19:12:43
         [sshd.c]
         pidfile/sigterm race; bbraun@synack.net

commit 2464322d7ee41dcd8beee12903775f7f2a80a164
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 05:08:11 2001 +0000

       - itojun@cvs.openbsd.org 2001/06/23 17:48:18
         [sftp.1 ssh.1 sshd.8 ssh-keyscan.1]
         kill whitespace at EOL.

commit e586c4ce3f4af32ef9eed72344f0fc7f43b9e58a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 05:04:58 2001 +0000

       - markus@cvs.openbsd.org 2001/06/23 17:05:22
         [ssh-keygen.c]
         fix import for (broken?) ssh.com/f-secure private keys
         (i tested > 1000 RSA keys)

commit bba81213b972ce15fbbaca60b9ffabb42371ce8f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 05:01:22 2001 +0000

       - itojun@cvs.openbsd.org 2001/06/23 15:12:20
         [auth1.c auth2.c auth2-chall.c authfd.c authfile.c auth-rhosts.c
          canohost.c channels.c cipher.c clientloop.c deattack.c dh.c
          hostfile.c kex.c kexdh.c kexgex.c key.c nchan.c packet.c radix.c
          readpass.c scp.c servconf.c serverloop.c session.c sftp.c
          sftp-client.c sftp-glob.c sftp-int.c sftp-server.c ssh-add.c
          ssh-agent.c ssh.c sshconnect1.c sshconnect2.c sshconnect.c sshd.c
          ssh-keygen.c ssh-keyscan.c]
         more strict prototypes.  raise warning level in Makefile.inc.
         markus ok'ed
         TODO; cleanup headers

commit 34f91883a6f3123656b0a8017d68b658f7cf2403
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:47:54 2001 +0000

       - markus@cvs.openbsd.org 2001/06/23 06:41:10
         [ssh-keygen.c]
         try to decode ssh-3.0.0 private rsa keys
         (allow migration to openssh, not vice versa), #910

commit 90fd060bc852072ebe351ddacaced7c267d53f96
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:45:33 2001 +0000

       - deraadt@cvs.openbsd.org 2001/06/23 05:57:09
         [sftp.1 sftp-server.8 ssh-keygen.1]
         ok, tmac is now fixed

commit 5363aee8bd91095c9a420625500e4fd5983349ae
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:42:20 2001 +0000

       - markus@cvs.openbsd.org 2001/06/23 05:26:02
         [key.c]
         handle sigature of size 0 (some broken clients send this).

commit a4789ef8785c4ac37187cf3b9b937524d2823b4b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:40:49 2001 +0000

       - markus@cvs.openbsd.org 2001/06/23 03:04:42
         [auth2.c auth-rh-rsa.c]
         restore correct ignore_user_known_hosts logic.

commit 3c798d47438d421e64d742ec50d08cc4c841ee60
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:39:22 2001 +0000

       - markus@cvs.openbsd.org 2001/06/23 03:03:59
         [sshd.8]
         draft-ietf-secsh-dh-group-exchange-01.txt

commit d6481ea49ab5999e00cc2a2fd7b6a1d779f4c598
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:37:41 2001 +0000

       - markus@cvs.openbsd.org 2001/06/23 02:34:33
         [kexdh.c kexgex.c kex.h pathnames.h readconf.c servconf.h ssh.1
          sshconnect1.c sshconnect2.c sshconnect.c sshconnect.h sshd.8]
         get rid of known_hosts2, use it for hostkey lookup, but do not
         modify.

commit b710f788f173a80a9a24fa041558087b56bb7fac
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:32:38 2001 +0000

       - deraadt@cvs.openbsd.org 2001/06/23 02:33:05
         [sftp.1 sftp-server.8 ssh-keygen.1]
         join .%A entries; most by bk@rt.fm

commit 83647ce474c37c8533e2aaf02f7366fbc0602ad9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:30:16 2001 +0000

       - markus@cvs.openbsd.org 2001/06/23 00:20:57
         [auth2.c auth.c auth.h auth-rh-rsa.c]
         *known_hosts2 is obsolete for hostbased authentication and
         only used for backward compat. merge ssh1/2 hostkey check
         and move it to auth.c

commit 7d5ed3a07b0f00e961d636514ac42d4f1bc57a3e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:28:30 2001 +0000

       - deraadt@cvs.openbsd.org 2001/06/23 00:16:16
         [scp.c]
         slightly better care

commit 6ab6486273b8a2fb42c3472a7fc8914f20b8edb7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:26:55 2001 +0000

      - markus@cvs.openbsd.org 2001/06/22 23:35:21
         [ssh.c]
         don't overwrite argv (fixes ssh user@host in 'ps'), report by ericj@

commit 488d8805f383e65f3e23c8adce2e1fbf7d2aabb9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:24:49 2001 +0000

       - markus@cvs.openbsd.org 2001/06/22 22:21:20
         [sftp-server.c]
         allow long usernames/groups in readdir

commit af7388046d8238c5d50a78c5ecdc9d782dad01de
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:18:59 2001 +0000

       - provos@cvs.openbsd.org 2001/06/22 21:57:59
         [dh.c]
         increase linebuffer to deal with larger moduli; use rewind instead of
         close/open

commit f96704d4ef4c55599d9999292abc1457e8153674
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:17:12 2001 +0000

       - markus@cvs.openbsd.org 2001/06/22 21:55:49
         [auth2.c auth-rsa.c pathnames.h ssh.1 sshd.8 sshd_config
          ssh-keygen.1]
         merge authorized_keys2 into authorized_keys.
         authorized_keys2 is used for backward compat.
         (just append authorized_keys2 to authorized_keys).

commit ae1c51c208917198fd96f0aca209459f37001ea4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:14:59 2001 +0000

       - provos@cvs.openbsd.org 2001/06/22 21:28:53
         [sshd.8]
         document /etc/moduli

commit 93a29e046e297c060a48fcdd1e43641470d78cdd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:13:25 2001 +0000

       - provos@cvs.openbsd.org 2001/06/22 21:27:08
         [dh.c pathnames.h]
         use /etc/moduli instead of /etc/primes, okay markus@

commit d2bf0d64d93b942120e937058b189668069e77fd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 04:10:54 2001 +0000

       - mpech@cvs.openbsd.org 2001/06/22 10:17:51
         [ssh.1 sshd.8 ssh-keyscan.1]
         o) .Sh AUTHOR -> .Sh AUTHORS;
         o) remove unnecessary .Pp;
         o) better -mdoc style;
         o) typo;
         o) sort SEE ALSO;
    
         aaron@ ok

commit 07094e52e70792c9690149a8d742b38cbc25924f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jun 25 03:59:43 2001 +0000

        - markus@cvs.openbsd.org 2001/06/21 21:08:25
          [session.c]
          don't reset forced_command (we allow multiple login shells in
          ssh2); dwd@bell-labs.com

commit 824569537f874d754041f2c1b0898feda0c12f31
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Jun 22 21:14:18 2001 +0000

     - (stevesk) handle systems without pw_expire and pw_change.

commit 601e43638e9e7889127634c3ba0949ba9fb917aa
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 21 03:19:23 2001 +0000

       - markus@cvs.openbsd.org 2001/06/20 13:56:39
         [channels.c channels.h clientloop.c packet.c serverloop.c]
         move from channel_stop_listening to channel_free_all,
         call channel_free_all before calling waitpid() in serverloop.
         fixes the utmp handling; report from Lutz.Jaenicke@aet.TU-Cottbus.DE

commit 0a7ca6c7baf13265e86b98a40bfd00714d67c84e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 21 03:17:42 2001 +0000

       - markus@cvs.openbsd.org 2001/06/19 15:40:45
         [session.c]
         allocate and free at the same level.

commit 699776e9ec1378c1e962146a15436e888e9594b0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 21 03:14:49 2001 +0000

       - markus@cvs.openbsd.org 2001/06/19 14:09:45
         [session.c sshd.8]
         disable x11-fwd if use_login is enabled; from lukem@wasabisystems.com

commit c85ab8afab0b1f73cda607859f32f0d9558af594
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 21 03:13:10 2001 +0000

       - markus@cvs.openbsd.org 2001/06/19 12:34:09
         [session.c]
         cleanup forced command handling, from dwd@bell-labs.com

commit 3af4d4634f66a9325fc76d7c68262bccbb8ce24c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 21 03:11:27 2001 +0000

       - markus@cvs.openbsd.org 2001/06/16 08:58:34
         [misc.c]
         copy pw_expire and pw_change, too.

commit 738f51e3df2f471b36abf8932ce59984daa3aa64
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 21 03:08:58 2001 +0000

       - markus@cvs.openbsd.org 2001/06/16 08:57:35
         [scp.c]
         no stdio or exit() in signal handlers.

commit 83417a86da30b1db7acfd0650e33bcfd8f31b968
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 21 03:07:27 2001 +0000

       - markus@cvs.openbsd.org 2001/06/16 08:50:39
         [channels.h]
         bad //-style comment; thx to stevev@darkwing.uoregon.edu

commit 352b1c2130cec67ec09401f297dff461f6a2f623
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jun 21 03:04:37 2001 +0000

       - markus@cvs.openbsd.org 2001/06/16 08:49:38
         [misc.c]
         typo; dunlap@apl.washington.edu

commit 805cf5a78829369dde4fc39510c0a307b255b704
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Jun 15 04:23:12 2001 +0000

     - (stevesk) update TODO: STREAMS pty systems don't call vhangup() now

commit 974fb9cf2fa820971e0da31a0acf99241c14e48d
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Jun 15 00:04:23 2001 +0000

     - (stevesk) don't set SA_RESTART and set SIGCHLD to SIG_DFL
       around grantpt().

commit 7a83722577b5aa04c65e3b5314a77ae4012904e3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 13 19:23:32 2001 +0000

     - OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2001/06/13 09:10:31
         [session.c]
         typo, use pid not s->pid, mstone@cs.loyola.edu

commit c51ae1bdaa3e6a6246537fedab673703011a64e7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 13 04:43:52 2001 +0000

       - markus@cvs.openbsd.org 2001/06/12 21:30:57
         [session.c]
         unused

commit 2bcdf064d8e1cefb2b5ae14ee939427422862cf8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 13 04:41:41 2001 +0000

       - markus@cvs.openbsd.org 2001/06/12 21:21:29
         [session.c]
         remove xauth-cookie-in-tmp handling. use default $XAUTHORITY, since
         we do already trust $HOME/.ssh
         you can use .ssh/sshrc and .ssh/environment if you want to customize
         the location of the xauth cookies

commit 16d45b3952e051a864d05faa343a4ec88ca0bcfa
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 13 04:39:18 2001 +0000

       - markus@cvs.openbsd.org 2001/06/12 16:11:26
         [packet.c]
         do not log() packet_set_maxsize

commit 49c126044dcaa4b38dc7553f670f20b084afa6a4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 13 04:37:36 2001 +0000

       - markus@cvs.openbsd.org 2001/06/12 16:10:38
         [session.c]
         merge ssh1/ssh2 tty msg parse and alloc code

commit 7eaf8e4e266987629ebcb27eff9237fce96bb482
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jun 13 04:35:43 2001 +0000

       - markus@cvs.openbsd.org 2001/06/12 10:58:29
         [session.c]
         merge session_free into session_close()
         merge pty_cleanup_proc into session_pty_cleanup()

commit 34a996877eed6e97c73e5af5f5fb3de1919c044c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 12 00:23:12 2001 +0000

       - markus@cvs.openbsd.org 2001/06/11 16:04:38
         [sshd.8]
         typo; bdubreuil@crrel.usace.army.mil

commit 88259fbbc59253224aa5d0124eeab0b34140d985
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 12 00:21:34 2001 +0000

       - markus@cvs.openbsd.org 2001/06/11 10:18:24
         [session.c]
         reset pointer to NULL after xfree(); report from solar@openwall.com

commit 0a0c3a63d07c1db46642f97d964494e3a6407f0a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 12 00:15:57 2001 +0000

     - scp.c ID update (upstream synced vfsprintf() from us)

commit 16c1bd6d097fcc2fe24116449a30563c86ece402
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 12 00:12:56 2001 +0000

      - markus@cvs.openbsd.org 2001/06/10 11:29:20
         [dispatch.c]
         we support rekeying
         protocol errors are fatal.

commit 0b35572596e1c9928f8a01934b1565163297e533
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 10 17:43:35 2001 +0000

     - (bal) Fixed Makefile.in so that 'configure; make install' works.

commit d7d7da12ecbe0e84bd0cceb58b25cec0e75015cf
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 10 17:35:45 2001 +0000

     - (bal) Handle broken krb4 issues on Solaris with multiple defined u_*_t
       types.  Patch by Jan IVEN <Jan.Iven@cern.ch>

commit 68c3ce1075a6a29c5ff351a01ce0784999a0e051
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 10 17:24:51 2001 +0000

     - (bal) NeXT/MacOS X lack libgen.h and dirname().  Patch by Mark Miller
       <markm@swoon.net>

commit d1aed9c0579d3de30cd7b4c0eecf6eee660668ed
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Jun 10 00:41:18 2001 +0000

     - (bal) Missed two files in major resync.  auth-bsdauth.c and auth-skey.c

commit 9841b0a1acd9b2ed190ac77a42f3c05a106a2d98
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 02:26:58 2001 +0000

     - (bal) --with-catman should be --with-mantype patch by Dave
       Dykstra <dwd@bell-labs.com>

commit b30768f5045eb5d639b52c072184e592a7c31c94
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 02:22:16 2001 +0000

     - (bal) ANSIify strmode()

commit 23fec1471001e9a5caaae1e76ccc89593ac609b8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 02:16:28 2001 +0000

     - (bal) configure.in fix for Tru64 (forgeting to reset $LIB)

commit 1bf11f6af7e284f6a7aa1b74a2c7d646cb54080b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:48:01 2001 +0000

       - markus@cvs.openbsd.org 2001/06/08 15:25:40
         [includes.h pathnames.h readconf.c servconf.c]
         move the path for xauth to pathnames.h

commit 4d3f22769985191bd9e79c557714c5eda971b652
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:44:07 2001 +0000

       - markus@cvs.openbsd.org 2001/06/07 22:25:02
         [session.c]
         don't overwrite errno
         delay deletion of the xauth cookie

commit 664408d2a794806722aa3f321b92c7bdd667c42e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:42:01 2001 +0000

       - markus@cvs.openbsd.org 2001/06/07 20:23:05
         [authfd.c authfile.c channels.c kexdh.c kexgex.c packet.c ssh.c
          sshconnect.c sshconnect1.c]
         use xxx_put_cstring()

commit 9d0c06667eb4ca616ffa690e88b9dd7c438e3103
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:40:00 2001 +0000

       - markus@cvs.openbsd.org 2001/06/07 19:57:53
         [auth2.c]
         style is used for bsdauth.
         disconnect on user/service change (ietf-drafts)

commit 5acb5d03edecae6ecbd062b9da9f7f4fde382287
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:38:24 2001 +0000

       - markus@cvs.openbsd.org 2001/06/06 23:19:35
         [ssh-add.c]
         remove debug message; Darren.Moffat@eng.sun.com

commit c66d436f603c8e1d727dc55a8087e497701ca7f3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:36:21 2001 +0000

       - markus@cvs.openbsd.org 2001/06/06 23:13:54
         [ssh-dss.c ssh-rsa.c]
         cleanup, remove old code

commit cb3929d1d9ef6ca0059c39a9659668dd7c52ca6e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:34:15 2001 +0000

       - markus@cvs.openbsd.org 2001/06/05 16:46:19
         [session.c]
         let session_close() delete the pty.  deny x11fwd if xauthfile is set.

commit df4981bc316d6f9fc9aab8c6198d2396890ba255
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:32:29 2001 +0000

       - markus@cvs.openbsd.org 2001/06/05 10:24:32
         [channels.c]
         don't delete the auth socket in channel_stop_listening()
         auth_sock_cleanup_proc() will take care of this.

commit a238f6e8348502e9f4b32ee1800138f4421a3ce3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:30:39 2001 +0000

       - pvalchev@cvs.openbsd.org 2001/06/05 05:05:39
         [ssh-keyscan.1 ssh-keyscan.c]
         License clarification from David Mazieres, ok deraadt@

commit 768176b24038a28b8e2e7709b153f6633348efc9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:29:12 2001 +0000

       - markus@cvs.openbsd.org 2001/06/04 23:16:16
         [session.c]
         merge ssh1/2 x11-fwd setup, create listener after tmp-dir

commit ec46e0b5fd2299f7f1449240894fa36d1745587e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:27:31 2001 +0000

       - markus@cvs.openbsd.org 2001/06/04 23:07:21
         [clientloop.c serverloop.c sshd.c]
         set flags in the signal handlers, do real work in the main loop,
         ok provos@

commit 983c098311526a2e09a7c2cee18f3bf1081431e5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:20:06 2001 +0000

       - markus@cvs.openbsd.org 2001/06/04 21:59:43
         [channels.c channels.h session.c]
         switch uid when cleaning up tmp files and sockets; reported by
         zen-parse@gmx.net on bugtraq

commit 742e89ec5d6d51402e8140f9eca4222405ffce36
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:17:23 2001 +0000

       - markus@cvs.openbsd.org 2001/06/03 20:06:11
         [auth2-chall.c]
         the challenge response device decides how to handle non-existing
         users.
         -> fake challenges for skey and cryptocard

commit 9cc94646138a4fefb6805dd9e03e9e88e7359d3f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:15:11 2001 +0000

       - markus@cvs.openbsd.org 2001/06/03 19:38:42
         [scp.c]
         pass -v to ssh; from slade@shore.net

commit 2a097a454378e9ae496bcfa303029d8a9d7361ce
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:13:40 2001 +0000

       - markus@cvs.openbsd.org 2001/06/03 19:36:44
         [ssh-keygen.1]
         1-2 bits of entrophy per character (not per word), ok stevesk@

commit 838394ca26ff175e7f2d1729112f3f2605de4096
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:11:59 2001 +0000

       - markus@cvs.openbsd.org 2001/06/03 14:55:39
         [channels.c channels.h session.c]
         use fatal_register_cleanup instead of atexit, sync with x11 authdir
         handling

commit c4b7225b8ddbc4932d5d4a63183b911a9f2a1d73
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:09:51 2001 +0000

       - markus@cvs.openbsd.org 2001/05/31 13:08:04
         [sshd_config]
         group options and add some more comments

commit 3812ff5f415dc82800b922ed0f9e653eccef8142
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 01:04:06 2001 +0000

    Should have removed this.  It's part of nchan.c now.

commit 3b670d09a83d2d625a80e2c61dc206334fb84be4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 00:57:39 2001 +0000

     - (bal) Ooops.. nchan.c resync from OpenBSD ssh Attic.

commit a6fc91e86e976905877e448c85eef3509a36fdc4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 00:44:44 2001 +0000

    - (bal) nchan.c CVS ID Update.

commit e9c999137a7b3497a7ad652da2535e14b42c6552
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 00:41:05 2001 +0000

     - (bal) Channels.c and Channels.h -- "Merge Functions, simplify" (draged
       out of ssh Attic)

commit c763767f18464129f3aa80f00a341f8665cfe53a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 00:36:26 2001 +0000

    [NOTE: Next patch will sync nchan.c, channels.c and channels.h and all this
    pain will be over.]
       - markus@cvs.openbsd.org 2001/05/31 10:30:17
         [auth-options.c auth2.c channels.c channels.h clientloop.c nchan.c
          packet.c serverloop.c session.c ssh.c]
         undo the .c file split, just merge the header and keep the cvs
         history

commit cd4349f969a8cc4cf2902ffd0a67aea49fae2102
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 00:23:17 2001 +0000

       - markus@cvs.openbsd.org 2001/05/30 23:31:14
         [auth2.c]
         merge

commit 5ec2645a2d4a5045e587868b3f2ed33ae187f594
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 00:18:51 2001 +0000

       - markus@cvs.openbsd.org 2001/05/30 15:20:10
         [ssh.c]
         merge functions, simplify.

commit e6455aee8fe31931f006f390fcbf0e99c1fbaacf
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jun 9 00:17:10 2001 +0000

    [NOTE: File split is was not done in Portabl Tree]
       - markus@cvs.openbsd.org 2001/05/30 12:55:13
         [auth-options.c auth2.c channels.c channels.h clientloop.c nchan.c
          packet.c serverloop.c session.c ssh.c ssh1.h]
         channel layer cleanup: merge header files and split .c files

commit 2d0356f7de5e12dd818b705c54bc8a380827ab8e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 21:13:57 2001 +0000

       - markus@cvs.openbsd.org 2001/05/29 12:31:27
         [authfile.c]
         typo

commit 80c6d77085d7869f07850e40f0e96d4e392d0bf4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 21:09:18 2001 +0000

       - markus@cvs.openbsd.org 2001/05/28 23:58:35
         [packet.c packet.h sshconnect.c sshd.c]
         remove some lines, simplify.

commit 4c247550aec813ec389415c8d9f41ed1a9c0339a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 20:56:47 2001 +0000

       - markus@cvs.openbsd.org 2001/05/28 23:25:24
         [channels.c]
         cleanup, typo

commit c0dee1a1485aae5d4b62ee7742cea5f752392361
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 20:52:50 2001 +0000

       - markus@cvs.openbsd.org 2001/05/28 23:14:49
         [channels.c channels.h nchan.c]
         undo broken channel fix and try a different one. there
         should be still some select errors...

commit a3828d48121544bb84a61c0a9c3260c6537f6d84
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 20:50:16 2001 +0000

       - markus@cvs.openbsd.org 2001/05/28 22:51:11
         [cipher.c cipher.h]
         simpler 3des for ssh1

commit 322915d5e4786ab60dd94766d602ddb8c0e31168
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 20:46:32 2001 +0000

       - markus@cvs.openbsd.org 2001/05/28 10:08:55
         [authfile.c]
         key_load_private: set comment to filename for PEM keys

commit 3b89c5ef8988ae33621efef8bd117db8f1f47e35
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 20:44:16 2001 +0000

       - markus@cvs.openbsd.org 2001/05/28 08:04:39
         [ssh.c]
         fix usage()

commit d78ae766dedb4ca0cdce82a5193efb65ad9f1931
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 20:35:09 2001 +0000

       - markus@cvs.openbsd.org 2001/05/25 14:37:32
         [ssh-keygen.c]
         use -P for -e and -y, too.

commit 2b1f71baeec8c1545885dc3ec5e3ac7d96319853
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 20:32:21 2001 +0000

       - stevesk@cvs.openbsd.org 2001/05/24 18:57:53
         [clientloop.c readconf.c ssh.c ssh.h]
         don't perform escape processing when ``EscapeChar none''; ok markus@

commit 60567ff89008d4f519079646d984f708f6c449b7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 20:27:53 2001 +0000

       - markus@cvs.openbsd.org 2001/05/24 11:12:42
         [auth.c]
         fix comment; from jakob@

commit bfb3a0e973214fabc1be744b8c7e4a89a0c5570c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 20:25:05 2001 +0000

       - markus@cvs.openbsd.org 2001/05/20 17:20:36
         [auth-rsa.c auth.c auth.h auth2.c servconf.c servconf.h sshd.8
          sshd_config]
         configurable authorized_keys{,2} location; originally from peter@;
         ok djm@

commit e2595448766a4149bbd2652830d1b086a066af13
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 20:01:39 2001 +0000

       - stevesk@cvs.openbsd.org 2001/05/19 19:57:09
         [channels.c]
         typo in error message

commit 1bda4c835e2fb1c8a9088f9d1011ae404ab8cd85
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 19:59:08 2001 +0000

       - stevesk@cvs.openbsd.org 2001/05/19 19:43:57
         [misc.c misc.h servconf.c sshd.8 sshd.c]
         sshd command-line arguments and configuration file options that
         specify time may be expressed using a sequence of the form:
         time[qualifier], where time is a positive integer value and qualifier
         is one of the following:
             <none>,s,m,h,d,w
         Examples:
             600     600 seconds (10 minutes)
             10m     10 minutes
             1h30m   1 hour 30 minutes (90 minutes)
         ok markus@

commit bd0e2de8e59b4588a45a27c168e70bba95db9969
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 19:52:52 2001 +0000

       - markus@cvs.openbsd.org 2001/05/19 16:46:19
         [ssh.1 sshd.8]
         document MACs defaults with .Dq

commit 1bfe29151b064d3e1f56c4c45b7f5b74369fcc37
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 19:37:25 2001 +0000

       - markus@cvs.openbsd.org 2001/05/19 16:32:16
         [ssh.1 sshconnect2.c]
         change preferredauthentication order to
            publickey,hostbased,password,keyboard-interactive
         document that hostbased defaults to no, document order

commit 608d1d1f9b4e1531cd1124dc0df4d38fa56a0712
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 19:33:22 2001 +0000

       - markus@cvs.openbsd.org 2001/05/19 16:08:43
         [sshd.8]
         sort options; Matthew.Stier@fnc.fujitsu.com

commit 7bad55b8cbcb0bade494eb30dbd15c67c8cd9f22
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 19:31:41 2001 +0000

       - markus@cvs.openbsd.org 2001/05/19 16:05:41
         [scp.c]
         ftruncate() instead of open()+O_TRUNC like rcp.c does
         allows scp /path/to/file localhost:/path/to/file

commit 7d68fbf4c53f9e2c9f16b8cd69bc07c377b114de
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 19:29:20 2001 +0000

       - djm@cvs.openbsd.org 2001/05/19 00:36:40
         [session.c]
         Disable X11 forwarding if xauth binary is not found. Patch from Nalin
         Dahyabhai <nalin@redhat.com>; ok markus@

commit 551ea37576333968c760f3f080a8dfe51ca9b06a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 18:56:16 2001 +0000

       - markus@cvs.openbsd.org 2001/05/18 14:13:29
         [auth-chall.c auth.h auth1.c auth2-chall.c auth2.c readconf.c
          readconf.h servconf.c servconf.h sshconnect1.c sshconnect2.c sshd.c]
         improved kbd-interactive support. work by per@appgate.com and me

commit c4bcb7d9e3a381a4dd5048ee23e4bd2cd6023de7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jun 5 18:39:10 2001 +0000

       - markus@cvs.openbsd.org 2001/05/17 21:34:15
         [ssh.1]
         no spaces in PreferredAuthentications;
         meixner@rbg.informatik.tu-darmstadt.de

commit 36fb6e5862e8cdba5ae0fd7c4ed68a8943d7d4fa
Author: Tim Rice <tim@multitalents.net>
Date:   Mon May 28 10:17:34 2001 -0700

     - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c
       Patch by Corinna Vinschen <vinschen@redhat.com>

commit b467ddb124bff761586b4411677208c745089c9f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 17 03:40:05 2001 +0000

     - (bal) Corrected on_exit() emulation via atexit().

commit ca60a9bf661830019d49c4de5ae71ff96a1ed9e5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 17 03:32:50 2001 +0000

     - (bal) Enabled USE_PIPES for Cygwin on Corinna Vinschen <vinschen@redhat.com>

commit b6147ab9e986c698f2a9a5e099a7ed199333cb94
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 17 03:21:27 2001 +0000

       - markus@cvs.openbsd.org 2001/05/16 22:09:21
         [channels.c nchan.c]
         more select() error fixes (don't set rfd/wfd to -1).

commit c8b3f476765c2f24cb50462e397262028fc28a2e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 17 03:19:40 2001 +0000

       - markus@cvs.openbsd.org 2001/05/16 21:53:53
         [clientloop.c]
         check for open sessions before we call select(); fixes the x11 client
         bug reported by bowman@math.ualberta.ca

commit 06b08018ef12d8bdf86b0ad3c2508666b789df70
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 17 03:17:55 2001 +0000

       - markus@cvs.openbsd.org 2001/05/16 20:51:57
         [authfile.c]
         return comments for private pem files, too; report from nolan@naic.edu

commit 7121507b19b7e634c3f5aecbd5beb68690e4ca35
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 17 03:16:18 2001 +0000

       - deraadt@cvs.openbsd.org 2001/05/15 22:04:01
         [ssh.1]
         X11 forwarding details improved

commit abbb73d0893e2daf4a06339f581cbe7dc752260f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 17 03:14:57 2001 +0000

       - markus@cvs.openbsd.org 2001/05/12 19:53:13
         [sftp-server.c]
         readlink does not NULL-terminate; mhe@home.se

commit 6ef3964c793f22dcbbfdac106cd5ead67a26bc2a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat May 12 16:50:50 2001 +0000

     - (bal) Patch to partial sync up contrib/solaris/ packaging software.
       Patch by pete <ninjaz@webexpress.com>

commit c93e84c2cecf2b968a069de595aff374abe89036
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat May 12 00:08:37 2001 +0000

       - markus@cvs.openbsd.org 2001/05/11 14:59:56
         [clientloop.c misc.c misc.h]
         add unset_nonblock for stdout/err flushing in client_loop().

commit ddb4f24056225322bc97eb366cbe5b2927fd7c89
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 10 23:26:11 2001 +0000

       - markus@cvs.openbsd.org 2001/05/09 23:01:31
         [rijndael.h]
         fix prototype; J.S.Peatfield@damtp.cam.ac.uk

commit 6d618466e8c20eba056db44acc22fc9f7048f961
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 10 23:24:49 2001 +0000

       - markus@cvs.openbsd.org 2001/05/09 22:51:57
         [channels.c]
         fix -R for protocol 2, noticed by greg@nest.cx.
         bug was introduced with experimental dynamic forwarding.

commit 6aebb340fb7a9f2a2184482b9088ef57c83e1a5f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 9 00:38:19 2001 +0000

     - (bal) Updates from the Sony NEWS-OS platform by NAKAJI Hiroyuki
       <nakaji@tutrp.tut.ac.jp>

commit 56b9d459ff99643b2f607e1f156690c9077bfc1a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 9 00:02:52 2001 +0000

       - markus@cvs.openbsd.org 2001/05/08 22:48:07
         [atomicio.c]
         no need for xmalloc.h, thanks to espie@

commit a69d89bb459fb47880b03bc003479b1d98284c2e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 9 00:01:18 2001 +0000

    I have no clue how this file was mised.. <frown>
    
       - markus@cvs.openbsd.org 2001/05/08 19:17:31
         [channels.c serverloop.c clientloop.c]
         adds correct error reporting to async connect()s
         fixes the server-discards-data-before-connected-bug found by
         onoe@sm.sony.co.jp

commit 23fedf5e493b1347e6923a8ea54c941fe10fb208
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue May 8 23:58:37 2001 +0000

       - markus@cvs.openbsd.org 2001/05/06 21:45:14
         [clientloop.c]
         use atomicio for flushing stdout/stderr bufs. thanks to
         jbw@izanami.cee.hw.ac.uk

commit 72af2ef8db31b13b8b51a2a29ed8edf36f3c89fb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue May 8 20:42:28 2001 +0000

     - (bal) ./configure support to disable SIA on OSF1.  Patch by
       Chris Adams <cmadams@hiwaay.net>

commit 97c677d4f04b8f8938c893656f667a29527f4a0f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue May 8 20:33:05 2001 +0000

     - (bal) UseLogin patch for Solaris/UNICOS.  Patch by Wayne Davison
       <wayne@blorf.net>

commit 387c472660ef173c2e469e70eb1a25d47f6e8887
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue May 8 20:27:25 2001 +0000

       - mouring@cvs.openbsd.org 2001/05/08 19:45:25
         [misc.c misc.h scp.c sftp.c]
         Use addargs() in sftp plus some clean up of addargs().  OK Markus

commit 69128668938c82e8d428e77726ef00b2b6f799b9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue May 8 20:07:39 2001 +0000

       - markus@cvs.openbsd.org 2001/05/08 19:17:31
         [channels.c serverloop.c]
         adds correct error reporting to async connect()s
         fixes the server-discards-data-before-connected-bug found by
         onoe@sm.sony.co.jp

commit e487d84e03615256aca61431bb9b515db8c2b6e6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue May 8 20:05:44 2001 +0000

       - markus@cvs.openbsd.org 2001/05/06 21:23:31
         [cli.c]
         cli_read() fails to catch SIGINT + overflow; from obdb@zzlevo.net

commit 253effb61d3f7917549ee859fa93c9e4a1f15ede
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon May 7 12:54:26 2001 +0000

     - (bal) Fixed configure test for USE_SIA.

commit f278613f5e3f6d3577a21004c09ef4a2f720bbb5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun May 6 18:01:43 2001 +0000

     - (bal) CVS ID updates for readpass.c, readpass.h, cli.c, and cli.h

commit aafff9cc7619d238e27500d0e4d2e4ea0fa140e1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun May 6 03:01:02 2001 +0000

       - stevesk@cvs.openbsd.org 2001/05/05 13:42:52
         [sftp.1 ssh-add.1 ssh-keygen.1]
         typos, grammar

commit 93d1fe8112582fe1d0c65c554411709464163712
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun May 6 02:57:20 2001 +0000

     - (bal) Add 'seed_rng()' to ssh-add.c

commit 5428bea57454391b47914f557b3b08f700912746
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun May 6 02:53:25 2001 +0000

     - (bal) White Space and #ifdef sync with OpenBSD

commit 5bf5f2c8f84e4b12acd2ed6baa1b110c282249ff
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 6 10:54:15 2001 +1000

     - (djm) Update config.guess and config.sub with latest versions (from
       ftp://ftp.gnu.org/gnu/config/) to allow configure on ia64-hpux.
       Suggested by Jason Mader <jason@ncac.gwu.edu>

commit 99c73b377a45d3e008e73cca9073dc006e1cfaae
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat May 5 04:09:47 2001 +0000

       - markus@cvs.openbsd.org 2001/05/04 23:47:34
         [channels.c channels.h clientloop.c nchan.c nchan.h serverloop.c ssh.c]
         move to Channel **channels (instead of Channel *channels), fixes realloc
         problems.  channel_new now returns a Channel *, favour Channel * over
         channel id.  remove old channel_allocate interface.

commit c8cb8c0405db1f83bd8f97224f69db6a828cc94f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri May 4 22:40:28 2001 +0000

       - markus@cvs.openbsd.org 2001/05/04 14:34:34
         [channels.c]
         channel_new() reallocs channels[], we cannot use Channel *c after calling
         channel_new(), XXX fix this in the future...

commit f0609f8bd3fe50a1cde0c4eb55144dbdffbc56f2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri May 4 22:38:43 2001 +0000

       - stevesk@cvs.openbsd.org 2001/05/04 14:21:56
         [ssh.1 sshd.8]
         typos

commit 4529b70b4ca28e6f2120a834c88b3ee2bc2e43f5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 3 23:39:53 2001 +0000

       - mouring@cvs.openbsd.org 2001/05/03 23:09:53
         [misc.c misc.h scp.c sftp.c]
         Move colon() and cleanhost() to misc.c where I should I have put it in
         the first place

commit 3524d697374a37d39e971d96c33080c307304820
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 3 22:59:24 2001 +0000

     - (bal) Avoid socket file security issues in ssh-agent for Cygwin.
       Patch by Egor Duda <deo@logos-m.ru>

commit 834417afa544d3521f9dbb17335d777c3a8a0b31
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 3 22:45:21 2001 +0000

     - (bal) Updated Cygwin README by Corinna Vinschen <vinschen@redhat.com>

commit a6218b81ca335b83f970e90fe4e65b22fa1812b6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 3 22:39:11 2001 +0000

       - stevesk@cvs.openbsd.org 2001/05/03 21:43:01
         [servconf.c]
         remove "\n" from fatal()

commit 60402fd42a6305f1df1de9269ba1654f02fe1309
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 3 22:37:26 2001 +0000

       - markus@cvs.openbsd.org 2001/05/03 15:45:15
         [session.c]
         exec shell -c /bin/sh .ssh/sshrc, from abartlet@pcug.org.au

commit 2b45180b2e743302ec502737fcd8abce4397f82d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu May 3 22:35:32 2001 +0000

       - stevesk@cvs.openbsd.org 2001/05/03 15:07:39
         [channels.c]
         typo in debug() string

commit 8a1371347bf6843f9873fbcd624254c29a0026c1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 2 22:40:12 2001 +0000

       - markus@cvs.openbsd.org 2001/05/02 16:41:20
         [ssh-add.c]
         fix prompt for ssh-add.

commit 6d849315ff76bccb6cb89a2151c4068a4e5361b3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed May 2 01:30:32 2001 +0000

       - mouring@cvs.openbsd.org 2001/05/02 01:25:39
         [readpass.c]
         Put the 'const' back into ssh_askpass() function.  Pointed out
         by Mark Miller <markm@swoon.net>.  OK Markus

commit aebd0b66fd4d800d56f802cf16df2ad19c263182
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 30 23:09:45 2001 +0000

       - markus@cvs.openbsd.org 2001/04/30 16:02:49
         [compat.c]
         ssh-2.0.10 has the weak-key-bug, too.

commit 8c9639225559fab155828a3396cdbdc7fcb5cad0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 30 23:06:57 2001 +0000

       - markus@cvs.openbsd.org 2001/04/30 15:50:46
         [compat.c compat.h kex.c]
         allow interop with weaker key generation used by ssh-2.0.x, x < 10

commit 67bf50e23a2a8fdf130f1af79a8c284a0b596ff3
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Apr 30 11:00:11 2001 -0700

     - (tim) [contrib/caldera/openssh.spec] add Requires line for Caldera 3.1

commit e0f88041945df494d1242cbaf3984edeeb68dd72
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 30 13:06:24 2001 +0000

       - markus@cvs.openbsd.org 2001/04/30 11:18:52
         [readconf.c readconf.h ssh.1 ssh.c sshconnect.c]
         implement 'ssh -b bind_address' like 'telnet -b'

commit 8a188a80274be0fb3d68049a8ba6cda58aab46f4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 30 13:55:37 2001 +1000

     - (djm) Add .cvsignore files, suggested by Wayne Davison <wayne@blorf.net>

commit 4534492aec2d7c383d6f29685195597375344673
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Apr 29 18:01:51 2001 -0700

     - (tim) New version of mdoc2man.pl from Mark D. Roth <roth+openssh@feep.net>

commit f343674d5e297f16aafe24f68620b22656a27ba1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 29 19:52:00 2001 +0000

       - markus@cvs.openbsd.org 2001/04/29 19:16:52
         [channels.c clientloop.c compat.c compat.h serverloop.c]
         more ssh.com-2.0.x bug-compat; from per@appgate.com

commit 2f0304c768a2f44b78471a258b2dd7ce9acc199b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 29 19:49:14 2001 +0000

       - markus@cvs.openbsd.org 2001/04/29 18:32:52
         [serverloop.c]
         fix whitespace

commit d240122ee8e442c68ca17ebd1f8985c58be0f9a5
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 29 20:45:50 2001 +1000

    Release

commit a4c02d8004d55af3eb48f4e55889401faab355ea
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 28 16:32:10 2001 +0000

     - (bal) Updated INSTALL.  PCRE moved to a new place.

commit a8c7a62ad4a2401e1200cef2c180d34f95aaf7cc
Author: Tim Rice <tim@multitalents.net>
Date:   Thu Apr 26 22:50:48 2001 -0700

     - (tim) update contrib/caldera files with what Caldera is using.
       <sps@caldera.de>

commit bb34625b6c417d40571acc166786ba0addf728de
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 27 02:15:00 2001 +0000

     - (bal) version.h synced, RPM specs updated for 2.9

commit 0f85348e899fd2243c833d078a5106de5531678e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 27 02:10:15 2001 +0000

     - (bal) Cygwin lacks setgroups() API.  Patch by Corinna Vinschen
       <vinschen@redhat.com>

commit 26f33893a60f712b3a6fb572cde6538bfe5ce394
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 27 00:46:17 2001 +0000

     - (bal) Add /etc/sysconfig/sshd support to redhat's sshd.init. Patch by
       Pekka Savola <pekkas@netcore.fi>

commit e39867df6dae55096b52d4d0b60415d216e168da
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 27 00:34:44 2001 +0000

     - (bal) arpa/nameser.h does not exist on Cygwin.  Patch by Corinna
       Vinschen <vinschen@redhat.com>

commit 3886218d5f613047e5fad845d2934c0e39b5fa9e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 27 00:31:07 2001 +0000

     - (bal) Build manpages and config files once unless changed.  Patch by
       Carson Gaspar <carson@taltos.org>

commit 4468b260cf894cf659b7e92294ee51745cab80a3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 26 23:03:37 2001 +0000

     - (bal) Fixed uidswap.c so it should work on non-posix complient systems.
       patch based on 2.5.2 version by djm.

commit 07183b8e17da2fcb077f5205047ac0cf6b5805af
Author: Tim Rice <tim@multitalents.net>
Date:   Wed Apr 25 21:40:28 2001 -0700

     - tim@mindrot.org 2001/04/25 21:38:01 [configure.in]
       man page detection fixes for SCO

commit da2ed56f61f3b28259c0aa32d89e5e6f08228a4b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 25 22:50:18 2001 +1000

     - (djm) Include crypt.h if available in auth-passwd.c

commit f815442116071c69525915018edf5a32081bddc2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 25 22:44:14 2001 +1000

     - (djm) Add new server configuration directive 'PAMAuthenticationViaKbdInt'
       (default: off), implies KbdInteractiveAuthentication. Suggestion from
       markus@

commit 768f975b1394cc0c0313b69175ea8fcc3a4dc2bc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 25 06:27:11 2001 +0000

     - (bal) Whitespace resync w/ OpenBSD for uidswap.c

commit 3035860f249ed1028e4248fa8876dc6e210993b5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 24 16:59:28 2001 +0000

       - markus@cvs.openbsd.org 2001/04/23 22:14:13
         [ssh-keygen.c]
         remove debug

commit 46c264f2ae6e74c1ea218dd3a8717695c5c8d680
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 24 16:56:58 2001 +0000

       - markus@cvs.openbsd.org 2001/04/23 21:57:07
         [ssh-keygen.1 ssh-keygen.c]
         allow public key for -e, too

commit 4adb091c2925ab055016a27142a5cb258527ee9e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 24 00:03:58 2001 +0000

     - (bal) Fixed contrib/postinstall.in.  Patch by wsanders@wsanders.net

commit 3432834ca429e9ad7208ece2e72e16c5cef5607e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 23 22:39:42 2001 +0000

     - (bal) sys/queue.h is bogus for NCR platform.  Patch by Daniel Carroll
       <dan@mesastate.edu>

commit 706e7a9cf93fad3a8b0b7cd524c44d9e17e64da7
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Apr 23 18:38:37 2001 +0000

     - (stevesk) auth-pam.c: use PERMIT_NO_PASSWD

commit 265fb440e777b05795b6643058032af75d7f5b0e
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Apr 23 17:55:26 2001 +0000

    start_pam() not pam_start()

commit 5f3b9b9091b8887b28c46eea3ca574f13bb1388a
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Apr 23 17:28:28 2001 +0000

     - (stevesk) pam_start() doesn't use DNS now for sshd -u0.

commit c65e6a0fec9d96722d268003c2b89c2a8906aee9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 23 13:02:16 2001 +0000

       - markus@cvs.openbsd.org 2001/04/22 23:58:36
         [ssh-keygen.1 ssh.1 sshd.8]
         document hostbased and other cleanup

commit 2857d9cf771ffa561e6e6e535632bd7ef74c0f7d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 22 17:19:46 2001 +0000

       - markus@cvs.openbsd.org 2001/04/22 13:41:02
         [ssh-keygen.1 ssh-keygen.c]
         style, noted by stevesk; sort flags in usage

commit 160ec62dceda477c02221519dbdff98f00ad510f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 22 17:17:46 2001 +0000

       - markus@cvs.openbsd.org 2001/04/22 13:32:27
         [sftp-server.8 sftp.1 ssh.1 sshd.8]
         xref draft-ietf-secsh-*

commit 5a707825765ebab087abf6b79ff050b7021cf3b9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 22 17:15:46 2001 +0000

       - markus@cvs.openbsd.org 2001/04/22 13:25:37
         [ssh-keygen.1 ssh-keygen.c]
         rename arguments -x -> -e (export key), -X -> -i (import key)
         xref draft-ietf-secsh-publickeyfile-01.txt

commit 4eda71d3dec578397022f1a39a1816f2db1ef79c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 22 17:13:20 2001 +0000

       - markus@cvs.openbsd.org 2001/04/22 12:34:05
         [scp.c]
         scp > 2GB; niles@scyld.com; ok deraadt@, djm@

commit f8d245756b1637637d305eba1ff9daab3425596e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 22 17:11:56 2001 +0000

       - djm@cvs.openbsd.org 2001/04/22 08:13:30
         [ssh.1]
         typos spotted by stevesk@; ok deraadt@

commit 8376ac354a4b110f7e7a4559bcd661810871f5ae
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 22 17:10:11 2001 +0000

       - mouring@cvs.openbsd.org 2001/04/21 00:55:57
         [sftp.1]
         Spelling

commit ee2786a2a1c295e25b165af1b830fd0ef28985db
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 22 17:08:00 2001 +0000

       - markus@cvs.openbsd.org 2001/04/20 16:32:22
         [uidswap.c]
         set non-privileged gid before uid; tholo@ and deraadt@

commit b8fbb8eca0ae7ce621a40ee95cdb3f139398e0c9
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Apr 21 14:31:52 2001 -0700

    fix perl test, fix nroff test, fix Makefile to build outside source tree

commit 32c97c3712c71e00b11dd5ba87962c146606b3ba
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Apr 20 20:56:21 2001 +0000

     - (stevesk) document PAM service name change in INSTALL

commit 85ecbe767e6cdcf04ac2d1784e54212533d88ae9
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Apr 20 17:43:47 2001 +0000

     - (stevesk) set the default PAM service name to __progname instead
       of the hard-coded value "sshd"; from Mark D. Roth <roth@feep.net>

commit c3d007155288d141f749faacbd06ba4fe30c1e5e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 20 23:19:37 2001 +1000

     - Update RPM spec files for CVS version.h

commit 9ffdcb5478d77f6a28731eeb39456ac6fbf60363
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 20 12:50:51 2001 +0000

       - djm@cvs.openbsd.org 2001/04/20 07:17:51
         [clientloop.c ssh.1]
         Split out and improve escape character documentation, mention ~R in
         ~? help text; ok markus@

commit 82f077d0dcb72ccc4e8829d5c8edcf2e3f940082
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 20 04:59:22 2001 +0000

      - (bal) Put scp-common.h back into scp.c (it exists in the upstream
        tree) pointed out by Tom Holroyd <tomh@po.crl.go.jp>

commit 3f36496e33ffb16b9b1c0d6c6da33c021b26f6a2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 19 20:50:07 2001 +0000

       - markus@cvs.openbsd.org 2001/04/19 00:05:11
         [auth2.c]
         use local variable, no function call needed.
         (btw, hostbased works now with ssh.com >= 2.0.13)

commit 648772faf5ed2ee182af0c4a031014edd7a89978
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 19 20:47:10 2001 +0000

       - markus@cvs.openbsd.org 2001/04/18 23:44:51
         [authfile.c]
         error->debug; noted by fries@

commit 671388f2338ddb335b01f1c3cf545caa9f90649e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 19 20:40:45 2001 +0000

       - markus@cvs.openbsd.org 2001/04/18 23:43:26
         [auth2.c compat.c sshconnect2.c]
         more ssh v2 hostbased-auth interop: ssh.com >= 2.1.0 works now
         (however the 2.1.0 server seems to work only if debug is enabled...)

commit 4aa603c150b6315f45d1f9d115203ad44a4d86f8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 19 20:38:06 2001 +0000

       - markus@cvs.openbsd.org 2001/04/18 22:48:26
         [auth2.c]
         no longer const

commit 2bffd6fd1b27351c0be1df55e42d5f616dccb051
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 19 20:35:40 2001 +0000

       - markus@cvs.openbsd.org 2001/04/18 22:03:45
         [auth2.c sshconnect2.c]
         use FDQN with trailing dot in the hostbased auth packets, ok deraadt@

commit 5eb97b6f3d878e6b40cfa73a18bacc293ea6b1ad
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 19 20:33:07 2001 +0000

       - markus@cvs.openbsd.org 2001/04/18 21:57:42
         [readpass.c ssh-add.c]
         call askpass from ssh, too, based on work by roth@feep.net, ok deraadt

commit f73e05eca801c3a3488caa3b6bf1585ab7e2c13a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 19 20:31:02 2001 +0000

       - ian@cvs.openbsd.org 2001/04/18 16:21:05
         [ssh-keyscan.1]
         Fix typo reported in PR/1779

commit bc70992058852307479e08e98e286e9aa3566493
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 18 18:04:21 2001 +0000

      - (bal) Makfile day... Cleaned up multiple mantype support (Patch by
        Mark D. Roth <roth+openssh@feep.net>), and fixed PIDDIR support.

commit e2e66a27a7f851a65a828822171a99776d6f0251
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 18 15:46:01 2001 +0000

      - (bal) renabled 'catman-do:' and fixed it.  So now catman pages should
        be working again.

commit 121c7852fe956182d4d2ad70c4ab7bb477d55334
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 18 15:32:44 2001 +0000

       - markus@cvs.openbsd.org 2001/04/18 14:15:00
         [canohost.c]
         debug->debug3

commit 005dd22c97239f8814319daff6a41469158bd495
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 18 15:29:33 2001 +0000

       - markus@cvs.openbsd.org 2001/04/17 19:34:25
         [session.c]
         move auth_approval to do_authenticated().
         do_child(): nuke hostkeys from memory
         don't source .ssh/rc for subsystems.

commit 2b261b9035031f5319c4694a0f2c9a5deeb9d906
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 17 18:14:34 2001 +0000

       - markus@cvs.openbsd.org 2001/04/17 12:55:04
         [channels.c ssh.c]
         undo socks5 and https support since they are not really used and
         only bloat ssh.  remove -D from usage(), since '-D' is experimental.

commit 982dbbcfda7ab9e56c4caccfba6f8920529421b7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 17 18:11:36 2001 +0000

       - markus@cvs.openbsd.org 2001/04/17 10:53:26
         [key.c key.h readconf.c readconf.h ssh.1 sshconnect2.c]
         add HostKeyAlgorithms; based on patch from res@shore.net; ok provos@

commit 4c8cff14ddac08f1bdb393d71d9e0907d9a9215e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 17 18:09:42 2001 +0000

      - markus@cvs.openbsd.org 2001/04/17 09:52:48
         [clientloop.c]
         handle EINTR/EAGAIN on read; ok deraadt@

commit 9cb59afb9027f5449f2fc4e8d78cd62ca350355e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 17 18:08:15 2001 +0000

       - markus@cvs.openbsd.org 2001/04/17 08:14:01
         [sshconnect1.c]
         check for key!=NULL, thanks to costa

commit 459d1913bfd4a444d8a778bc819f026d2dc10ec0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 17 18:06:14 2001 +0000

       - deraadt@cvs.openbsd.org 2001/04/16 08:26:04
         [key.c]
         better safe than sorry in later mods; yongari@kt-is.co.kr

commit 04eeadea1d1cd1ba7cce5cc927fa5e7f52771ad3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 17 17:58:55 2001 +0000

    Spelling.

commit 47e0c0b1001ac7c57bc2c1a14ae9e73fc4d135fd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 17 17:57:09 2001 +0000

      - (bal) Add perl5 check for HP/UX, Removed GNUness from Makefile.in
        and temporary commneted out catman-do: since it's broken.  Patches
        for the first two by Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit 364a9bd9ce0fa0c357e55306df56e47883a591f9
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 16 18:37:05 2001 +1000

     - Fix OSF SIA support displaying too much information for quiet
       logins and logins where access was denied by SIA. Patch from Chris Adams
       <cmadams@hiwaay.net>

commit 3b12614396192aa0e7b62cddf593c440feb70d2f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 16 18:36:38 2001 +1000

    doh - missed these in sync

commit cf205e8f353f3f7da38bab329951301ac2d69426
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 16 18:29:15 2001 +1000

       - djm@cvs.openbsd.org 2001/04/16 08:19:31
         [session.c]
         Split motd and hushlogin checks into seperate functions, helps for
         portable. From Chris Adams <cmadams@hiwaay.net>; ok markus@

commit 0b1e0a12183461a38d6c59b3e2511fdb7f96d534
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 16 18:27:07 2001 +1000

       - deraadt@cvs.openbsd.org 2001/04/16 08:05:34
         [xmalloc.c]
         xrealloc dealing with ptr == nULL; mouring

commit 21134b5b09ad480a2283f1b63c0c1e3a68515274
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 16 18:26:41 2001 +1000

      - (djm) OpenBSD CVS Sync
       - mouring@cvs.openbsd.org 2001/04/16 02:31:44
         [scp.c sftp.c]
         IPv6 support for sftp (which I bungled in my last patch) which is
         borrowed from scp.c.  Thanks to Markus@ for pointing it out.

commit b5cdc6643848d170156770821ce946dae0d3f844
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 16 02:13:26 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/15 21:28:35
         [readconf.c servconf.c]
         use fatal() or error() vs. fprintf(); ok markus@

commit bdc2beb678f89823097a75c438d7a08f0963eb3e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 16 02:11:52 2001 +0000

     - (bal) CVS ID fix up and slight manpage fix from OpenBSD tree.

commit a8f3972ce6fd3a7104e2cb33e261b43238af2e96
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 16 02:03:49 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/15 19:41:21
         [sshd.8]
         some ClientAlive cleanup; ok markus@

commit 302ea6f2f919acb2727a21f2c2c5e86bfed6053a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 16 02:01:25 2001 +0000

       - markus@cvs.openbsd.org 2001/04/15 17:16:00
         [clientloop.c]
         set stdin/out/err to nonblocking in SSH proto 1, too. suggested by ho@
         should fix some of the blocking problems for rsync over SSH-1

commit 15f33866a6fb9e67f2a89f5edc8b8c7635f6d984
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 16 02:00:02 2001 +0000

       - markus@cvs.openbsd.org 2001/04/15 16:58:03
         [authfile.c ssh-keygen.c sshd.c]
         don't use errno for key_{load,save}_private; discussion w/ solar@openwall

commit 897741eeaa0ebb5e2ce10a6b0ada8f3e55d22777
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 16 10:41:46 2001 +1000

     - (djm) Convert mandoc manpages to man automatically. Patch from Mark D.
       Roth <roth+openssh@feep.net>

commit 206941fdd88031e76da1e2aa0b5dd3b8d1d5d38b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 15 14:27:16 2001 +0000

       - markus@cvs.openbsd.org 2001/04/15 08:43:47
         [dh.c sftp-glob.c sftp-glob.h sftp-int.c sshconnect2.c sshd.c]
         some unused variable and typos; from tomh@po.crl.go.jp

commit ac2f00390392b22bfc971146e61c440ce62cf242
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 15 14:25:12 2001 +0000

     - OpenBSD CVS Sync
       - stevesk@cvs.openbsd.org 2001/04/15 01:35:22
         [ttymodes.c]
         fix comments

commit e626cf8b4aa4443d7c2cec937ddc5e36cb5d89ee
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 14 23:21:50 2001 +0000

      - Missed sshtty.[ch] in Sync.

commit f719a2011060639cfe6292349cb8c040b3c7352b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 14 23:14:22 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/14 17:04:42
         [scp.c]
         'T' handling rcp/scp sync; ok markus@

commit ae8e2d30db561a556ee0a82dce0dcda3d6f82623
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 14 23:13:02 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/14 16:33:20
         [clientloop.c packet.h session.c ssh.c ttymodes.c ttymodes.h]
         protocol 2 tty modes support; ok markus@

commit 7457f2af01d77c4bdeaef3a6c211bb2f1e215a9c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 14 23:10:09 2001 +0000

       - markus@cvs.openbsd.org 2001/04/14 16:27:57
         [ssh-add.c]
         use clear_pass instead of xfree()

commit d334b2768b80640d3b9aa229332482ae572d08ad
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 14 23:08:36 2001 +0000

       - markus@cvs.openbsd.org 2001/04/14 16:17:14
         [channels.c]
         remove some channels that are not appropriate for keepalive.

commit da5d9b12256275411e34824a880f8ff471acd0e2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 14 23:07:16 2001 +0000

       - deraadt@cvs.openbsd.org 2001/04/14 04:31:01
         [ssh-add.c]
         do not double free

commit 5744dc421d035c701b6660a58bed0d038c211375
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 13 23:28:01 2001 +0000

       - beck@cvs.openbsd.org 2001/04/13 22:46:54
         [channels.c channels.h servconf.c servconf.h serverloop.c sshd.8]
         Add options ClientAliveInterval and ClientAliveCountMax to sshd.
         This gives the ability to do a "keepalive" via the encrypted channel
         which can't be spoofed (unlike TCP keepalives). Useful for when you want
         to use ssh connections to authenticate people for something, and know
         relatively quickly when they are no longer authenticated. Disabled
         by default (of course). ok markus@

commit 402b3319456c1f0da0822319c3813c68e155726d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 14 00:28:42 2001 +1000

     - Cygwin sftp/sftp-server binary mode patch from Corinna Vinschen
       <vinschen@redhat.com>

commit 6e77a538ca63f2ecbab74656839e77084a2db425
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 14 00:22:33 2001 +1000

     - Sync with OpenBSD glob.c, strlcat.c and vis.c changes

commit 92d4a020011565d766153cbf85210157c33c541c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 13 04:44:37 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/13 01:26:17
         [ssh.c]
         missing \n in error message

commit 63667f6568d0667b91aea46f77d54311dcffb53a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Apr 13 00:00:14 2001 +0000

       - mouring@cvs.openbsd.org 2001/04/12 23:17:54
         [sftp-int.c sftp-int.h sftp.1 sftp.c]
         Add support for:
            sftp [user@]host[:file [file]]  - Fetch remote file(s)
            sftp [user@]host[:dir[/]]       - Start in remote dir/
         OK deraadt@

commit 19066a112baff6107781dc337b27e557f43098c2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 12 23:39:26 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/12 20:09:38
         [misc.c misc.h readconf.c servconf.c ssh.c sshd.c]
         robust port validation; ok markus@ jakob@

commit d69dab3cde47c7e17382de556449bfda0fb28deb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 12 23:36:05 2001 +0000

       - markus@cvs.openbsd.org 2001/04/12 19:39:27
         [readconf.c]
         typo

commit 5eabda303aa26c77e4c383230db9ce9d9175e580
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 12 23:34:34 2001 +0000

       - markus@cvs.openbsd.org 2001/04/12 19:15:26
         [auth-rhosts.c auth.h auth2.c buffer.c canohost.c canohost.h
          compat.c compat.h hostfile.c pathnames.h readconf.c readconf.h
          servconf.c servconf.h ssh.c sshconnect.c sshconnect.h sshconnect1.c
          sshconnect2.c sshd_config]
         implement HostbasedAuthentication (= RhostRSAAuthentication for ssh v2)
         similar to RhostRSAAuthentication unless you enable (the experimental)
         HostbasedUsesNameFromPacketOnly option.  please test. :)

commit 0998872972ec9a059204344cf0bec64123b3e28c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 12 21:35:52 2001 +0000

     - (bal) Added openbsd-compat/inet_ntop.[ch] since HP/UX (and others)
       lack it.

commit 2b646528cbee9b0051f3904c56b7d49aac5cdc6c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 12 16:16:57 2001 +0000

       - markus@cvs.openbsd.org 2001/04/12 14:29:09
         [ssh.c]
         show debug output during option processing, report from
         pekkas@netcore.fi

commit 9fce9f02e816e8095e93e0c0d0459d8e59af69f5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 11 23:10:09 2001 +0000

       - lebel@cvs.openbsd.org 2001/04/11 16:25:30
         [sshd.8 sshd.c]
         implement the -e option into sshd:
          -e      When this option is specified, sshd will send the output to the
                  standard error instead of the system log.
         markus@ OK.

commit 6fa9d10ed579c29688e39cfa8d635fe8b511cb80
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 11 23:08:17 2001 +0000

       - markus@cvs.openbsd.org 2001/04/11 13:56:13
         [channels.c ssh.c]
         https-connect and socks5 support. i feel so bad.

commit 146edb98324111ce29ca266221abb1514aacfe24
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 11 23:06:28 2001 +0000

       - markus@cvs.openbsd.org 2001/04/11 10:59:01
         [ssh.c]
         use strtol() for ports, thanks jakob@

commit 23d9a6d38eae8bb25af3ccd88bcdfe3699cc3bf4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 11 23:05:17 2001 +0000

       - djm@cvs.openbsd.org 2001/04/11 07:06:22
         [sftp-int.c]
         'mget' and 'mput' aliases; ok markus@

commit c486d88bf8709e6982690e03ab4c80a846802a57
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 11 16:08:34 2001 +0000

       - markus@cvs.openbsd.org 2001/04/10 12:15:23
         [channels.c]
         debug cleanup

commit 18a82ac02941bb770e0edb9d849fd4e2d74aa682
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 11 15:59:35 2001 +0000

       - itojun@cvs.openbsd.org 2001/04/10 09:13:22
         [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8]
         document id_rsa{.pub,}.  markus ok

commit b39215168584a1601a47356697963d808614990a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 11 15:57:50 2001 +0000

       - markus@cvs.openbsd.org 2001/04/10 07:46:58
         [channels.c]
         cleanup socks4 handling

commit 1a598a459770245946505c17e89c1200bc9be949
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 10 02:48:50 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/09 18:00:15
         [sshd.8]
         ListenAddress mandoc from aaron@

commit 12de61680e1767a30cb521869b816181e1766b35
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 10 02:46:54 2001 +0000

       - markus@cvs.openbsd.org 2001/04/09 15:19:49
         [ssh-add.1]
         ssh-add retries the last passphrase...

commit ee61794620e6ce4d40ae0e3a90c2ee90bf5f4719
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 10 02:45:32 2001 +0000

       - markus@cvs.openbsd.org 2001/04/09 15:12:23
         [ssh-add.c]
         passphrase caching: ssh-add tries last passphrase, clears passphrase if
         not successful and after last try.
         based on discussions with espie@, jakob@, ... and code from jakob@ and
         wolfgang@wsrcc.com

commit 8ffeacfb2d94e13edeb48f53641674ac2788ec13
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 10 02:43:57 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/09 00:42:05
         [sftp.1]
         spelling

commit 4b3564e6f25dd664c6f5112d5b5d499cdd8abf70
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 10 02:41:56 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/08 23:28:27
         [sshd.8]
         spelling

commit 9492484a2781d8d2ed51ab0104942f2b80529a52
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Apr 10 02:40:17 2001 +0000

       - deraadt@cvs.openbsd.org 2001/04/08 20:52:55
         [sftp.c]
         do not modify an actual argv[] entry

commit cb17e99faeea6823a630b9769a1c8906ea0766b3
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Apr 9 14:50:52 2001 +0000

     - (stevesk) use setresgid() for setegid() if needed

commit 393d2f782d4137873c7d5e96bb8a439767a9ac74
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Apr 8 22:50:43 2001 +0000

     - (stevesk) configure.in: typo

commit f52373f732d6b97ce63298dbbec813a13b570d9f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 8 18:38:04 2001 +0000

       - markus@cvs.openbsd.org 2001/04/08 11:24:33
         [uidswap.c]
         KNF

commit 3bb4f9da7382e62dc08eb72ba8307c28d4ccc566
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 8 18:30:26 2001 +0000

       - markus@cvs.openbsd.org 2001/04/07 08:55:18
         [buffer.c channels.c channels.h readconf.c ssh.c]
         allow the ssh client act as a SOCKS4 proxy (dynamic local
         portforwarding).  work by Dan Kaminsky <dankamin@cisco.com> and me.
         thanks to Dan for this great patch: use 'ssh -D 1080 host' and make
         netscape use localhost:1080 as a socks proxy.

commit 3fcf1a22b52ed8e66d2cf548d5d4528f67377af9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 8 18:26:59 2001 +0000

       - markus@cvs.openbsd.org 2001/04/06 21:00:17
         [auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth2.c channels.c session.c
          ssh.c sshconnect.c sshconnect.h uidswap.c uidswap.h]
         do gid/groups-swap in addition to uid-swap, should help if /home/group
         is chmod 750 + chgrp grp /home/group/, work be deraadt and me, thanks
         to olar@openwall.com is comments.  we had many requests for this.

commit d344763643339b5ddc075cf7b8c8fb4404dc0aa0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 8 18:07:22 2001 +0000

       - markus@cvs.openbsd.org 2001/04/08 11:27:33
         [clientloop.c]
         leave_raw_mode if ssh2 "session" is closed

commit d5730a8b858bdab06f3162ab89c001e63c2b954d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 8 18:04:36 2001 +0000

       - markus@cvs.openbsd.org 2001/04/08 13:03:00
         [ssh-add.c]
         init pointers with NULL, thanks to danimal@danimal.org

commit 49e57a871abf4304b96bdd4abc5f5872cdd913ea
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Apr 8 18:02:43 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/08 16:01:36
         [sshd.8]
         document ListenAddress addr:port

commit c510af40e3b7ac3469f8fbb03e2e880bbae6fd34
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 7 17:25:48 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/06 22:25:25
         [servconf.c]
         in addition to:
         ListenAddress host|ipv4_addr|ipv6_addr
         permit:
         ListenAddress [host|ipv4_addr|ipv6_addr]:port
         ListenAddress host|ipv4_addr:port
         sshd.8 updates coming.  ok markus@

commit ab0cedc58766dc83562ab6b00dee1fd1b0337dae
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 7 17:23:43 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/06 22:12:47
         [hostfile.c]
         unused; typo in comment

commit d47cf4d53cbddda9df6863d7000542f89b07b698
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 7 01:14:38 2001 +0000

       - deraadt@cvs.openbsd.org 2001/04/06 16:46:59
         [scp.c]
         remove trailing / from source paths; fixes pr#1756

commit e34ab4c04eace868c3ea95810161abf16db6231f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 7 01:12:11 2001 +0000

       - markus@cvs.openbsd.org 2001/04/05 23:39:20
         [serverloop.c]
         keep the ssh session even if there is no active channel.
         this is more in line with the protocol spec and makes
            ssh -N -L 1234:server:110 host
         more useful.
         based on discussion with <mats@mindbright.se> long time ago
         and recent mail from <res@shore.net>

commit 8248d116c4c35ce23359edbd66ea41c561a44dbb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Apr 7 01:08:46 2001 +0000

     - (bal) CVS ID Resync of version.h

commit be48f2b4b1c83e687186fd0bb8bfe9fa76b7a375
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Apr 6 01:58:37 2001 +0000

     - (stevesk) Makefile.in: log.o is in libssh.a

commit 4c3f77dd3b36eb400e802065e50ccad584d039b6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 5 23:37:36 2001 +0000

       - markus@cvs.openbsd.org 2001/04/05 21:05:24
         [clientloop.c ssh.c]
         don't request a session for 'ssh -N', pointed out slade@shore.net

commit d7dd23ffed2b54d5443ef9c0d09324a56894c739
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 5 23:36:01 2001 +0000

       - markus@cvs.openbsd.org 2001/04/05 21:02:46
         [buffer.c]
         better error message

commit 11bd89936db5d399a7a5f10af02c7b578735bfd5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 5 23:34:29 2001 +0000

       - markus@cvs.openbsd.org 2001/04/05 20:01:10
         [clientloop.c]
         for ~R print message if server does not support rekeying. (and fix ~R).

commit f15a386511f669b2bb81c57032f458ff3e9e93a6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 5 23:32:17 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/05 15:48:18
         [canohost.c canohost.h session.c]
         move get_remote_name_or_ip() to canohost.[ch]; for portable.  ok markus@

commit f327235f65b91e80f2d5db28678274f6a5d4def8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 5 23:29:59 2001 +0000

       - markus@cvs.openbsd.org 2001/04/05 15:45:43
         [ssh.1]
         ssh defaults to protocol v2; from quisar@quisar.ambre.net

commit a8baf36d41b0dc49451faa1e6fb074f70124527e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 5 23:28:36 2001 +0000

       - markus@cvs.openbsd.org 2001/04/05 11:09:17
         [clientloop.c compat.c compat.h]
         add SSH_BUG_NOREKEY and detect broken (=all old) openssh versions.

commit a3700050ec681277bcdf76a02b0c2e304ff317c7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 5 23:26:32 2001 +0000

       - markus@cvs.openbsd.org 2001/04/05 10:42:57
         [auth-chall.c authfd.c channels.c clientloop.c kex.c kexgex.c key.c
          mac.c packet.c serverloop.c sftp-client.c sftp-client.h sftp-glob.c
          sftp-glob.h sftp-int.c sftp-server.c sftp.c ssh-keygen.c sshconnect.c
          sshconnect2.c sshd.c]
         fix whitespace: unexpand + trailing spaces.

commit a6c20148f58e34a902512ffe5eee3279acaaa26b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 5 23:22:25 2001 +0000

       - markus@cvs.openbsd.org 2001/04/05 10:39:48
         [version.h]
         temporary version 2.5.4 (supports rekeying).
         this is not an official release.

commit fb50cdfdb8c33dd4f14471550c7dcab93163efec
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 5 23:20:46 2001 +0000

       - markus@cvs.openbsd.org 2001/04/05 10:39:03
         [compress.c compress.h packet.c]
         reset compress state per direction when rekeying.

commit 4f3ae4c55070b1d9d94ff886156eb04418893015
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 5 23:19:21 2001 +0000

       - markus@cvs.openbsd.org 2001/04/05 10:00:06
         [compat.c]
         2.3.x does old  GEX, too; report jakob@

commit ff8b4959d922ed3a60ea8b7268fa54b2467f8c05
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Apr 5 23:05:22 2001 +0000

     - (stevesk) logintest.c: fix for systems without __progname

commit 86a52b3dc85f6af2ea2e689b64d52edf796d1f41
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Apr 5 17:15:08 2001 +0000

     - (stevesk) don't use vhangup() if defined(HAVE_DEV_PTMX); also removes
         BROKEN_VHANGUP

commit 5ba23b39bf2d8d2c9c0747b9a66f356180306691
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Apr 5 02:05:21 2001 +0000

       - markus@cvs.openbsd.org 2001/04/04 23:09:18
         [dh.c kex.c packet.c]
         clear+free keys,iv for rekeying.
         + fix DH mem leaks. ok niels@

commit 8e312f3db05059499cf6655663ce31e73d508817
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 4 23:50:21 2001 +0000

       - markus@cvs.openbsd.org 2001/04/04 22:04:35
         [kex.c kexgex.c serverloop.c]
         parse full kexinit packet.
         make server-side more robust, too.

commit 0cae04005ec358e5f64ee141af5e38eb3a756a30
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 4 23:47:52 2001 +0000

       - markus@cvs.openbsd.org 2001/04/04 20:32:56
         [auth2.c]
         we don't care about missing bannerfiles; from tsoome@ut.ee, ok deraadt@

commit be2cc43c3ad65dc7af5bdd350eccecefa05c80ff
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 4 23:46:07 2001 +0000

       - markus@cvs.openbsd.org 2001/04/04 20:25:38
         [channels.c channels.h clientloop.c kex.c kex.h serverloop.c
          sshconnect2.c sshd.c]
         more robust rekeying
         don't send channel data after rekeying is started.

commit 78c261ab4afa9236b54b51663eb35460d2fea635
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 4 23:43:26 2001 +0000

       - markus@cvs.openbsd.org 2001/04/04 15:50:55
         [compat.c]
         f-secure 1.3.2 does not handle IGNORE; from milliondl@ornl.gov

commit 8ac9106c3dfbc1f02ddf237067cccd54ffac4e8d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 4 17:57:54 2001 +0000

       - markus@cvs.openbsd.org 2001/04/04 14:34:58
         [clientloop.c kex.c kex.h serverloop.c sshconnect2.c sshd.c]
         enable server side rekeying + some rekey related clientup.
         todo: we should not send any non-KEX messages after we send KEXINIT

commit 238abf6a14d6ed038918fa35f618089230e68fd6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 4 17:52:53 2001 +0000

       - markus@cvs.openbsd.org 2001/04/04 09:48:35
         [kex.c kex.h kexdh.c kexgex.c packet.c sshconnect2.c sshd.c]
         don't sent multiple kexinit-requests.
         send newkeys, block while waiting for newkeys.
         fix comments.

commit 22b19b43e420c9fc711a38631187820573d0f047
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 4 17:39:19 2001 +0000

     - (bal) Oops.. Missed including kexdh.c and kexgex.c in OpenBSD sync.

commit f28f634a3ab81669c21fb078565c84410653b8b7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 4 02:03:04 2001 +0000

       - markus@cvs.openbsd.org 2001/04/04 00:06:54
         [clientloop.c sshconnect2.c]
         enable client rekeying
            (1) force rekeying with ~R, or
            (2) if the server requests rekeying.
         works against ssh-2.0.12/2.0.13/2.1.0/2.2.0/2.3.0/2.3.1/2.4.0

commit 2d90e003098834de493a797017f8704b2f383f67
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 4 02:00:54 2001 +0000

       - markus@cvs.openbsd.org 2001/04/03 23:32:12
         [kex.c kex.h packet.c sshconnect2.c sshd.c]
         undo parts of recent my changes: main part of keyexchange does not
         need dispatch-callbacks, since application data is delayed until
         the keyexchange completes (if i understand the drafts correctly).
         add some infrastructure for re-keying.

commit 9323d964791a8627c7733e64951d32e7d4b19f9c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 4 01:58:48 2001 +0000

       - todd@cvs.openbsd.org 2001/04/03 21:19:38
         [ssh_config]
         id_rsa1/2 -> id_rsa; ok markus@

commit 20d7c7b02c92c28007dba8b08e617a415146d1df
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 4 01:56:17 2001 +0000

       - markus@cvs.openbsd.org 2001/04/03 19:53:29
         [dh.c dh.h kex.c kex.h sshconnect2.c sshd.c]
         move kex to kex*.c, used dispatch_set() callbacks for kex. should
         make rekeying easier.

commit 86ebcb6cf55ea296a7921d157afdc03c07102933
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 4 01:53:20 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/03 13:56:11
         [sftp-glob.c ssh-agent.c ssh-keygen.c]
         free() -> xfree()

commit 0d3e8fafa46441d448cee87a0dc8f9274d137ba4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Apr 4 01:51:25 2001 +0000

       - deraadt@cvs.openbsd.org 2001/04/02 17:32:23
         [ssh-agent.1]
         grammar; slade@shore.net

commit efe5fd811bee766f4d5f5b5d0072d271bfd24f49
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Apr 3 13:02:48 2001 +0000

     - (stevesk) nchan.c: remove ostate checks and add EINVAL to
         shutdown(SHUT_RD) error() bypass for HP-UX.

commit 3704c2612acefaf588aa58d4d89116d29feef677
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 2 18:20:03 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/02 14:20:23
         [readconf.c servconf.c]
         correct comment; ok markus@

commit 55b99e35c7cf4d9a63d2c6689fc8bb0dd914f97a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Apr 2 18:18:21 2001 +0000

       - stevesk@cvs.openbsd.org 2001/04/02 14:15:31
         [sshd.8]
         typo; ok markus@

commit 6189e1905cd1347512fd8e747316684abca915d6
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Apr 2 14:02:55 2001 +0000

     - (stevesk) sshpty.h openbsd sync; PTY_H -> SSHPTY_H

commit edcd5762e24ddc6639f4b90bce3e8691bc54352e
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Apr 2 13:45:00 2001 +0000

     - (stevesk) log.c openbsd sync; missing newlines

commit cf7786b60825fb568b1de77970513f74d91c060e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 30 10:55:20 2001 +1000

    Fixup makefile after merge

commit ff75ac4d684368bcdd123dbfb621a46332cd87c7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 30 10:50:32 2001 +1000

      - OpenBSD CVS Sync
       - djm@cvs.openbsd.org 2001/03/29 23:42:01
         [sshd.c]
         Protocol 1 key regeneration log => verbose, some KNF; ok markus@

commit 9709f906844c86ec4db6fd8dd3ff377069c80573
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 30 10:50:10 2001 +1000

      - OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2001/03/29 21:17:40
         [dh.c dh.h kex.c kex.h]
         prepare for rekeying: move DH code to dh.c

commit a0ff466d804969067a684911269c380c664df21d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 30 10:49:35 2001 +1000

      - OpenBSD CVS Sync
       - stevesk@cvs.openbsd.org 2001/03/29 21:06:21
         [sshconnect2.c sshd.c]
         need to set both STOC and CTOS for SSH_BUG_BIGENDIANAES; ok markus@

commit 653ae11c4a24a50188a57f51459d795e16d1a7b8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 30 10:49:05 2001 +1000

      - OpenBSD CVS Sync
       - provos@cvs.openbsd.org 2001/03/29 14:24:59
         [sshconnect2.c]
         use recommended defaults

commit 5d57e5073034b41c11366153f3853143c9ce07c0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 30 10:48:31 2001 +1000

      - OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2001/03/28 22:43:31
         [auth.h auth2.c auth2-chall.c]
         check auth_root_allowed for kbd-int auth, too.

commit 23e526e27199f3ae079ee302581221b49d3e6772
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 30 10:47:43 2001 +1000

      - OpenBSD CVS Sync
       - provos@cvs.openbsd.org 2001/03/28 22:04:57
         [dh.c]
         more sanity checking on primes file

commit 2557bfc5d712cd3422921253be60be2fbb88a4f7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 30 10:47:14 2001 +1000

     - (djm) OpenBSD CVS Sync
       - provos@cvs.openbsd.org 2001/03/28 21:59:41
         [kex.c kex.h sshconnect2.c sshd.c]
         forgot to include min and max params in hash, okay markus@

commit d8f72ca6d5c8234699fc2c49b56837de554b2cf6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 30 10:23:17 2001 +1000

     - (djm) Another openbsd-compat/glob.c sync

commit 7de696e798c96240f9ae5c345084a008e9bed096
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 29 00:45:12 2001 +0000

       - markus@cvs.openbsd.org 2001/03/28 20:50:45
         [sshd.c]
         call refuse() before close(); from olemx@ans.pl

commit ff2618c80fdabba2a667c261426b05ce750ee6f1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 29 00:43:54 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/28 20:04:38
         [scp.c]
         usage more like rcp and add missing -B to usage; ok markus@

commit bd47226987a76f6fd704d94bcc90d81b1bece205
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 29 00:39:55 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/28 19:56:23
         [scp.c]
         start to sync scp closer to rcp; ok markus@

commit df221391e620776789e40af9a885c7c9cd945bd3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 29 00:36:16 2001 +0000

       - provos@cvs.openbsd.org 2001/03/27 17:46:50
         [compat.c compat.h dh.c dh.h ssh2.h sshconnect2.c sshd.c version.h]
         make dh group exchange more flexible, allow min and max group size,
         okay markus@, deraadt@

commit 60a4381f1a6ebc2f8eeeb2ba4e005ede91ac9af3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 29 00:32:56 2001 +0000

       - markus@cvs.openbsd.org 2001/03/27 10:57:00
         [compat.c compat.h ssh-rsa.c]
         some older systems use NID_md5 instead of NID_sha1 for RSASSA-PKCS1-v1_5
         signatures in SSH protocol 2, ok djm@

commit 425fb02f20671c332af7b718d1c0e797ad0699eb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 29 00:31:20 2001 +0000

       - markus@cvs.openbsd.org 2001/03/27 10:34:08
         [ssh-rsa.c sshd.c]
         use EVP_get_digestbynid, reorder some calls and fix missing free.

commit d09fcf5f6e6905ee2f04b81b6ad97e6d244f5c2a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 29 00:29:54 2001 +0000

       - markus@cvs.openbsd.org 2001/03/26 23:23:24
         [rsa.c rsa.h ssh-agent.c ssh-keygen.c]
         try to read private f-secure ssh v2 rsa keys.

commit c1116608967d75af5466ad487b0fd587450e5c9f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 29 00:28:37 2001 +0000

       - markus@cvs.openbsd.org 2001/03/26 23:12:42
         [authfile.c]
         KNF

commit 89b0bd66e21f3af300c3df4e0e7ff2ecbda933c0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 29 00:27:11 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/26 15:47:59
         [ssh.1]
         document more defaults; misc. cleanup.  ok markus@

commit b68af624a9bf64fcf810a16a35749f4047ebe1ef
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 28 21:05:26 2001 +1000

     - (djm) Sync openbsd-compat/glob.c

commit 98344741512e0171567409c5c7208af5cebd4fe1
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 28 14:37:06 2001 +1000

     - (djm) Rework krbIV tests to get us closer to building on Redhat. Still
       doesn't work because of conflicts between krbIV's and OpenSSL's des.h

commit 18bb473eb0509ef74cb7eb644925a9afaa8efaae
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 28 14:35:30 2001 +1000

     - (djm) Work around Solaris' broken struct dirent. Diagnosis and suggested
       fix from Philippe Levan <levan@epix.net>

commit c79bc0d75bca9367947020dd3ec806d33fa19b1b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 28 13:03:42 2001 +1000

     - (djm) Reorder tests and library inclusion for Krb4/AFS to try to
       resolve linking conflicts with libcrypto. Report and suggested fix
       from Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE>

commit f9e93009478075ec04f0ee407e8f83ab2558a892
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 27 16:12:24 2001 +1000

     - (djm) Reestablish PAM credentials (which can be supplemental group
       memberships) after initgroups() blows them away. Report and suggested
       fix from Nalin Dahyabhai <nalin@redhat.com>

commit 771bbac73327304cbac69ca37e33b5771e01fc17
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 27 16:10:22 2001 +1000

    more detail about krb4/-lcrypto conflicts

commit d0fca423fcee576f4787d01f8bad3f9c0efd62ab
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 26 13:44:06 2001 +0000

       - markus@cvs.openbsd.org 2001/03/26 08:07:09
         [authfile.c authfile.h ssh-add.c ssh-keygen.c ssh.c sshconnect.c
          sshconnect.h sshconnect1.c sshconnect2.c sshd.c]
         simpler key load/save interface, see authfile.h

commit 7bfff36ca3acf469de9fcad98826562ea6c1fbbe
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 26 05:45:53 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/25 13:16:11
         [servconf.c servconf.h session.c sshd.8 sshd_config]
         PrintLastLog option; from chip@valinux.com with some minor
         changes by me.  ok markus@

commit 6029432ec5b07eecdd1fc96cb3110d77aa7faa36
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 26 05:38:25 2001 +0000

       - djm@cvs.openbsd.org 2001/03/25 00:01:34
         [session.c]
         shorten; ok markus@

commit 9531825dd01559105b7b3c1d493e4a13d358988a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 26 05:35:33 2001 +0000

     - Fix pointer issues in waitpid() and wait() replaces.  Patch by Lutz
       Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit 8ca935655e3c0a8ddae90f8609433eca203054f0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 26 05:32:16 2001 +0000

     - Attempt sync with sshlogin.c w/ OpenBSD (mainly CVS ID)

commit b44fe0617d747c9dbf3cb074661639dccad5a3f0
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 24 15:39:38 2001 +1100

     - (djm) Pull out our own SIGPIPE hacks

commit de71cda07824ec31b5ad2965879fab123d743708
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 24 00:43:26 2001 +0000

       - markus@cvs.openbsd.org 2001/03/23 14:28:32
         [session.c sshd.c]
         ignore SIGPIPE, restore in child, fixes x11-fwd crashes; with djm@

commit 7527f8b52dea7485f28e86778ce22e611d1cb277
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 24 00:39:12 2001 +0000

       - markus@cvs.openbsd.org 2001/03/23 13:10:57
         [sftp-int.c]
         fix put, upload to _absolute_ path, ok djm@

commit 9e2057cb348058338113ce11f880ad4cbda25d59
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 24 00:37:59 2001 +0000

       - markus@cvs.openbsd.org 2001/03/23 12:02:49
         [auth1.c]
         authctxt is now passed to do_authenticated

commit c8530c7f5c6775443a1c4818f5edb8a74e59c0e6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 24 00:35:19 2001 +0000

       - djm@cvs.openbsd.org 2001/03/23 11:04:07
         [compat.c compat.h sshconnect2.c sshd.c]
         Compat for OpenSSH with broken Rijndael/AES. ok markus@

commit b94f8b2bcb41e3ecb345bcbd710ff8725f5f0e1e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 24 00:20:56 2001 +0000

     - Fixed permissions ssh-keyscan.  Thanks to Christopher Linn <celinn@mtu.edu>.

commit 69d8c077d4043b7a646b9811f7bde1f0abee3977
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 22 22:45:33 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/22 20:22:55
         [sshd.c]
         do not place linefeeds in buffer

commit d9267454caaa0fefd71a12aaa4288ee72b984292
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 22 02:06:57 2001 +0000

       - markus@cvs.openbsd.org 2001/03/21 21:06:30
         [session.c]
         missing init; from mib@unimelb.edu.au

commit f1107f5ede21a2c75b0036a444728047d39132a8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 22 02:05:32 2001 +0000

       - jakob@cvs.openbsd.org 2001/03/21 14:20:45
         [ssh-keygen.c]
         add -B flag to usage

commit 57f82e260b48273cef5d2bf4c8404448c9df25d5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 22 02:04:08 2001 +0000

     - (bal) scp.c CVS ID resync

commit b31783d5470d42f77a08acfe6513a0b209ffec1c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 22 02:02:12 2001 +0000

       - markus@cvs.openbsd.org 2001/03/21 11:43:45
         [auth1.c auth2.c session.c session.h]
         merge common ssh v1/2 code

commit fc9b07de19f8ccd94e4543ddba58e0de3748804c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 22 01:27:23 2001 +0000

       - markus@cvs.openbsd.org 2001/03/20 19:21:21
         [session.c]
         remove unused arg

commit b4c961d822fd9cc4ed04285e45bfdaac335b8b21
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 22 01:25:37 2001 +0000

       - markus@cvs.openbsd.org 2001/03/20 19:21:21
         [session.c]
         remove unused arg

commit 6b77643fd58f697d68f6f99bfa345e0197e909c6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 22 01:24:04 2001 +0000

     - OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2001/03/20 19:10:16
         [readconf.c]
         default to SSH protocol version 2

commit eebc4a2ed364bbf61028424e181908d903bc04ea
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 22 01:22:03 2001 +0000

     - (bal) auth-chall.c auth-passwd.c auth.h auth1.c auth2.c session.c CVS ID
       resync

commit ebf3d51c9615c76ca85f07224373630581ed669b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 22 01:08:39 2001 +0000

     - (bal) version.c CVS ID resync

commit bebd8be67bd8fc8e832faf0ed635f9e8a46ca126
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 22 11:58:15 2001 +1100

     - (djm) Better AIX no tty fix, spotted by Gert Doering <gert@greenie.muc.de>

commit b69407dd7ada7f0c254fc538da8357e36a1edb7a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 21 16:13:03 2001 +1100

     - (djm) Correctly handle SIA and AIX when no tty present. Spotted and
       suggested fix from Mike Battersby <mib@unimelb.edu.au>

commit 4b4e2d31d66728b06a0a5defed21c2781e0f314a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 21 13:13:40 2001 +1100

     - (djm) Generate config files before build

commit ec7e1b1d0fa042c7670122b6eb5cb59b14491fca
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 21 13:01:35 2001 +1100

     - (djm) Don't loop forever when changing password via PAM. Patch
       from Solar Designer <solar@openwall.com>

commit 2e9adb27e9f36599f160c5dd0b426d95b52237e0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 21 12:16:24 2001 +1100

     - (djm) Make sure pam_retval is initialised on call to pam_end. Patch
       from Solar Designer <solar@openwall.com>

commit 883631b73a038e6c48824492c792fbec591a429e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 21 11:12:55 2001 +1100

    todo

commit be08176963af1b75f6fff9c28e941763476eeb30
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 21 11:11:57 2001 +1100

     - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve
       VanDevender <stevev@darkwing.uoregon.edu>

commit d9d5ba2bbde89fe058d8db39d0ec3f1d4ec5e6f8
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Mar 19 20:46:50 2001 -0800

    add get_arg_max(). Use sysconf() if ARG_MAX is not defined.

commit d14d7021a14fd45705bd1f4833e2e63829c04449
Author: Tim Rice <tim@multitalents.net>
Date:   Mon Mar 19 18:31:44 2001 -0800

      change S_ISLNK macro to work for UnixWare 2.03

commit 82e7ae5bceb636ecd52189f6ec63fd3db108cd85
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 20 09:30:50 2001 +1100

     - (djm) Update RPM spec version
     - (djm) Release 2.5.2p1

commit 41be73b663b9c9d0fa62bef9834e0a275a4eae8f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 20 09:16:34 2001 +1100

       - markus@cvs.openbsd.org 2001/03/19 17:12:10
         [version.h]
         version 2.5.2

commit e7cf07c927e6065b1bba5199319fe80887607317
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 20 09:15:57 2001 +1100

       - markus@cvs.openbsd.org 2001/03/19 17:07:23
         [auth.c readconf.c]
         undo /etc/shell and proto 2,1 change for openssh-2.5.2

commit 9911f120831a46e8455d3625e2f410d0c1692621
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 19 21:29:30 2001 +0000

     - (bal) Oops.  Missed globc.h change (OpenBSD CVS).

commit 11c78f81199f191e19b8e8658a3f6dee22689c2e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 19 19:00:09 2001 +0000

     - (bal) glob.c update to set gl_pathv to NULL (OpenBSD CVS).

commit a77d641cea5fc64707bf4a27a7bff8bbb8450c69
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 19 18:58:13 2001 +0000

     - (bal) glob.c update to added GLOB_LIMITS.

commit 55fb9a9064baf6631ab33287b7c750b664b80ca4
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Mar 19 14:58:47 2001 +0000

    64-bit builds on HP-UX 11.X

commit aad56ce545962f6f301d14909460d9d0758ff53d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 19 13:42:21 2001 +0000

     - (bal) Minor NeXT fixed.  Forgot to #undef NGROUPS_MAX

commit 1e42f30c4cd89275444fbfb8030814e07854901f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 19 23:59:11 2001 +1100

       - djm@cvs.openbsd.org     2001/03/19 05:49:52
         [ssh.1]
         document PreferredAuthentications option; ok markus@

commit a243fde4773f4257feeeaf4f9a7a2e01bf68ca37
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 19 23:16:08 2001 +1100

       - djm@cvs.openbsd.org      2001/03/19 12:10:17
         [sshd.8]
         Document permitopen authorized_keys option; ok markus@

commit c2c5d9fd3b56b3209a19e5e6b3de0528812a2e7d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 19 23:16:08 2001 +1100

       - djm@cvs.openbsd.org      2001/03/19 12:10:17
         [sshd.8]
         Document permitopen authorized_keys option; ok markus@

commit 27dbe6f37e675bda22d99646e236eac1d18d36ac
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 19 22:36:20 2001 +1100

       - deraadt@cvs.openbsd.org 2001/03/18 23:30:55
         [compat.c compat.h sshd.c]
         specifically version match on ssh scanners.  do not log scan
         information to the console

commit cafff1910541b1704e80b3cb16f6926135f23ea6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 19 22:29:46 2001 +1100

     - (djm) OpenBSD CVS Sync
       - djm@cvs.openbsd.org     2001/03/19 03:52:51
         [sftp-client.c]
         Report ssh connection closing correctly; ok deraadt@

commit 03017ba638e7de9f3b9e659d2202a018d9918919
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 19 03:12:25 2001 +0000

     - (bal) NeXTStep lacks S_ISLNK.  Plus split up S_IS*

commit 8feff4542e7ed50ca698e8f24490d140c655d6c3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 19 03:09:40 2001 +0000

     - (bal) Small fix to scp.  %lu vs %ld

commit 6cabb6fd6c8bdc1afa0d0e93614fdc512d2c4c25
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 19 03:01:56 2001 +0000

     - Use 'NGROUPS' for NeXT Since 'MAX_NGROUPS' is wrapped up in -lposix
       stuff.  Change suggested by Mark Miller <markm@swoon.net>

commit d19a75abd0dc0487f9b6235b55a736f0386481c3
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Mar 18 18:27:26 2001 -0800

    move HAVE_LONG_LONG_INT where it works

commit 753b1c05a5cae0b38289d9a7d080c1d931c9ce6c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 19 12:56:14 2001 +1100

    Better fix for long long

commit ffd0e10b9c44201017d17ef4e2d4b21bdfa7b393
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 19 12:45:02 2001 +1100

     - (djm) Make scp work on systems without 64-bit ints

commit 2d70f98220c8aaac29ac6fb47b86750209dacb01
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 19 00:13:46 2001 +0000

       - markus@cvs.openbsd.org 2001/03/18 12:07:52
         [auth-options.c]
         ignore permitopen="host:port" if AllowTcpForwarding==no

commit 9de61e8c596e1f7e52f780dd87bde2df779b1237
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 19 10:09:27 2001 +1100

     - (djm) Add getusershell() functions from OpenBSD CVS

commit a2dc6030f769d7737bf481d2d4c77f82bc4b7965
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 19 10:00:53 2001 +1100

    Add missing headers

commit 60bc51735643baa1b7fb237ea56303fed454dadb
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 19 09:38:15 2001 +1100

     - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to
       do it implicitly.

commit b399be4436914e23dd066482a371e068f2724f5c
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Mar 17 18:43:16 2001 -0800

     - tim@mindrot.org 2001/03/17 18:45:25 [compat.c]
         openbsd-compat/fake-regex.h

commit d69191bb4e93374f9818ab485d1a28fbfc0d1493
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 17 23:13:27 2001 +0000

       - markus@cvs.openbsd.org 2001/03/17 17:27:59
         [auth.c]
         check /etc/shells, too

commit fea7278d901d7ee66b990f9c5d3ef7616c1a9c58
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 17 18:07:46 2001 +0000

     - (bal) Fixed scp type casing issue which causes "scp: protocol error:
       size not delimited" fatal errors when tranfering.

commit 45b14dbddc244bba8c17d71186c2bc49b355636a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 17 01:15:38 2001 +0000

     - Check for gl_matchc support in glob_t and fall back to the
       openbsd-compat/glob.[ch] support if it does not exist.

commit 7bb8b49596156b85df403d09c2195e2533ec372c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 17 00:47:54 2001 +0000

       - markus@cvs.openbsd.org 2001/03/16 19:06:30
         [auth-options.c channels.c channels.h serverloop.c session.c]
         implement "permitopen" key option, restricts -L style forwarding to
         to specified host:port pairs. based on work by harlan@genua.de

commit cf00df63443b40190d3f88c5f0a7e102540d0cac
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 17 00:37:31 2001 +0000

       - markus@cvs.openbsd.org 2001/03/16 13:44:24
         [sftp-int.c]
         discourage strcat/strcpy

commit 5df2ffaeacd5a88b144740279e310e9c373bd8df
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 17 00:36:17 2001 +0000

       - markus@cvs.openbsd.org 2001/03/16 09:55:53
         [sftp-int.c]
         fix memset and whitespace

commit c8d1c30c312003ecbeba9a383f0a61ed45ad0c04
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 17 00:34:46 2001 +0000

       - djm@cvs.openbsd.org 2001/03/16 08:16:18
         [sftp-client.c sftp-client.h sftp-glob.c sftp-int.c]
         Revise globbing for get/put to be more shell-like. In particular,
         "get/put file* directory/" now works. ok markus@

commit 86fe8686b920b7da020b96aaf2303a7b596c36a4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 17 00:32:57 2001 +0000

       - markus@cvs.openbsd.org 2001/03/15 22:07:08
         [session.c]
         pass Session to do_child + KNF

commit a4c57666b97433050287ebfca31735085c8ca0c1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 17 00:10:20 2001 +0000

       - markus@cvs.openbsd.org 2001/03/15 15:05:59
         [scp.c]
         use %lld in printf, ok millert@/deraadt@; report from ssh@client.fi

commit 168a700cc6ac55ed7b0682f60c7fe7f4d73a0116
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 17 10:29:50 2001 +1100

     - Support usrinfo() on AIX. Based on patch from Gert Doering
       <gert@greenie.muc.de>

commit c7f4ccd52c758e60e8593ebfd98a25c484a49d02
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 15 00:09:15 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/14 22:50:25
         [sftp-server.c]
         note no getopt()

commit de2273f951a52f1867488db568d1f868b4ec3972
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 14 21:30:18 2001 +0000

     - (bal) Cygwin README change by Corinna Vinschen <vinschen@redhat.com>

commit f78682d24ab65980c9858b0e563d5c6c9568cddd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 14 21:26:27 2001 +0000

       - markus@cvs.openbsd.org 2001/03/14 15:15:58
         [sftp-int.c]
         add version command

commit 54f15b6b6f10d14dd35868dcf2ea18d5617aa71e
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Mar 14 18:37:13 2001 +0000

     - (stevesk) ssh-keyscan.c: specify "openbsd-compat/fake-queue.h"

commit 025df4a1b48a0d1efbea5b39596a44942a118094
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 14 15:16:34 2001 +0000

       - markus@cvs.openbsd.org 2001/03/14 08:57:14
         [sftp-client.c]
         Wall

commit 3c02768950ba1f17dc90d9f4a9538a8eec711c4f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 14 11:39:45 2001 +1100

     - (djm) Add replacement glob() from OpenBSD libc if the system glob is
       missing or lacks the GLOB_ALTDIRFUNC extension
     - (djm) Remove -I$(srcdir)/openbsd-compat from CFLAGS, refer to headers
       relatively. Avoids conflict between glob.h and /usr/include/glob.h

commit 46e55aaabc33549b91a85052aa048dffaf061761
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 13 23:38:20 2001 +0000

     - Fix strerror() in bsd-misc.c

commit 4870afd7c73a605778794378915eab0c26e8c353
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 14 10:27:09 2001 +1100

      - djm@cvs.openbsd.org 2001/03/13 22:42:54
        [sftp-client.c sftp-client.h sftp-glob.c sftp-glob.h sftp-int.c]
        sftp client filename globbing for get, put, ch{mod,grp,own}. ok markus@

commit 056ddf7af3504a688c34f2daf50bcd20abfef3ba
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 14 10:15:20 2001 +1100

     - OpenBSD CVS Sync
      - markus@cvs.openbsd.org 2001/03/13 17:34:42
        [auth-options.c]
        missing xfree, deny key on parse error; ok stevesk@

commit cfccef96a35cb954023a31f9bc10cf3b8f9f8ed3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 13 04:57:58 2001 +0000

     - OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2001/03/12 22:02:02
         [key.c key.h ssh-add.c ssh-keygen.c sshconnect.c sshconnect2.c]
         remove old key_fingerprint interface, s/_ex//

commit 9ae2bb6790ab8d00b5cd29309889b2db50a9bef9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 12 05:16:18 2001 +0000

     - (bal) Reorder includes in Makefile.

commit 3e292fab40a750b64e86695bd6626c67eedd25df
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 12 14:47:30 2001 +1100

     - (djm) Add "static_openssl" RPM build option, remove rsh build dependency

commit 547c27620326710ce595692d2eba6c7f84e73343
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 12 14:23:52 2001 +1100

     - (djm) Bump portable version number for generating test RPMs

commit 8fd372b194672a88086562eb00f576e84a44173d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 12 03:02:17 2001 +0000

       - markus@cvs.openbsd.org 2001/03/11 22:33:24
         [ssh-keygen.1 ssh-keygen.c]
         remove -v again. use -B instead for bubblebabble. make -B consistent
         with -l and make -B work with /path/to/known_hosts. ok deraadt@

commit f0b4853d867cd3f43131e9b48124eaa7ebfab6d0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 12 02:59:31 2001 +0000

       - markus@cvs.openbsd.org 2001/03/11 18:29:51
         [key.c]
         style+cleanup

commit bee3f2224c75adfaa2276f6cc83d2f25a0a5af77
Author: Tim Rice <tim@multitalents.net>
Date:   Sun Mar 11 17:32:12 2001 -0800

      test if snprintf() supports %ll
      add /dev to search path for PRNGD/EGD socket
      fix my mistake in USER_PATH test program

commit ca0bf57f2f336af8663a98bd9e55e0fa2f9e4b08
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Mar 11 20:08:29 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/11 16:39:03
         [ssh-keygen.c]
         KNF, and SHA1 binary output is just creeping featurism

commit cbe3ad2f70e6682378cd06ce0c0236438e1ed581
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Mar 11 20:06:59 2001 +0000

       - jakob@cvs.openbsd.org 2001/03/11 15:13:09
         [key.c]
         cleanup & shorten some var names key_fingerprint_bubblebabble.

commit a8a73e62eda1c81e04c11099e0c0155164486992
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Mar 11 20:05:19 2001 +0000

       - jakob@cvs.openbsd.org 2001/03/11 15:04:16
         [ssh-keygen.1 ssh-keygen.c]
         print both md5, sha1 and bubblebabble fingerprints when using
         ssh-keygen -l -v. ok markus@.

commit 96e8ea6a31184e2ea46bc655f912bc67b6221e64
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Mar 11 20:03:44 2001 +0000

       - jakob@cvs.openbsd.org 2001/03/11 15:03:16
         [key.c key.h]
         add improved fingerprint functions. based on work by Carsten
         Raskgaard <cara@int.tele.dk> and modified by me. ok markus@.

commit b54873ad24e95c37034d1beba4873032e089cd59
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Mar 11 20:01:55 2001 +0000

       - markus@cvs.openbsd.org 2001/03/11 13:25:36
         [auth2.c key.c]
         debug

commit b9be60a722a8ae24affe68e07ef8557d00992648
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Mar 11 01:49:19 2001 +0000

       - markus@cvs.openbsd.org 2001/03/10 17:51:04
         [kex.c match.c match.h readconf.c readconf.h sshconnect2.c]
         add PreferredAuthentications

commit 7f283fcc944a8726ec610d5a11339b28fa75cd94
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Mar 10 16:52:25 2001 -0800

     - tim@mindrot.org 2001/03/10 16:33:42 [configure.in Makefile.in sshd_config]
       make sure $bindir is in USER_PATH so scp will work

commit 59ea0a0efd273671167a58108532b3c48daa3573
Author: Tim Rice <tim@multitalents.net>
Date:   Sat Mar 10 13:50:45 2001 -0800

    make sure $bindir is in USER_PATH so scp will work

commit d20d0f3e27884c7daf9d48d335168898e147b65b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 10 17:22:20 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/10 15:31:00
         [compat.c compat.h sshconnect.c]
         all known netscreen ssh versions, and older versions of OSU ssh cannot
         handle password padding (newer OSU is fixed)

commit 00261540be24b71fcd5c2b62d4ee2a7edabe081c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 10 17:17:28 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/10 15:02:05
         [ttymodes.c ttymodes.h]
         remove unused sgtty macros; ok markus@

commit 068f3dce2885753160f162d7edf1c4b4b1c434ac
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 10 17:15:39 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/10 12:53:51
         [readconf.c ssh_config]
         default to SSH2, now that m68k runs fast

commit 329782e3db938e8cc062a600133a98010d95a662
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 10 17:08:59 2001 +0000

       - markus@cvs.openbsd.org 2001/03/10 12:48:27
         [sshconnect2.c]
         ignore nonexisting private keys; report rjmooney@mediaone.net

commit 5f5419a6a2791b392525da31cd84433cbc8af2c4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 9 19:48:37 2001 +0000

     - Removed log.o from sftp client.  Not needed.

commit ca42d5fb7f48770f856ca2e3e4389f5ee1ecbe66
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 9 18:25:32 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/09 12:30:29
         [sshd.c]
         typo; slade@shore.net

commit 5fc6270fe994d9c6aa47ee3fba8bbde1c007856c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 9 18:19:24 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/09 03:14:39
         [ssh-keygen.c]
         create *.pub files with umask 0644, so that you can mv them to
         authorized_keys

commit 266dfdfd62d169c62618d73cd72df0391c072be1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 9 00:12:22 2001 +0000

       - markus@cvs.openbsd.org 2001/03/08 21:42:33
         [compat.c compat.h readconf.h ssh.c sshconnect1.c sshconnect2.c]
         implement client side of SSH2_MSG_USERAUTH_PK_OK (test public key ->
         no need to do enter passphrase or do expensive sign operations if the
         server does not accept key).

commit 283cb821cda4e05b33a1e87854db276757e9fdf8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Mar 9 00:09:02 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/08 20:44:48
         [sftp.1]
         spelling, cleanup; ok deraadt@

commit a03849879738baab97dee7ca85d3fdb3a39ba896
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 8 20:37:22 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/08 18:47:12
         [auth1.c]
         unused; ok markus@

commit 52dd46855d387f71585d6d6daf18a03da9207d87
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Mar 8 18:26:57 2001 +0000

     - (stevesk) Reliant Unix (SNI) needs HAVE_BOGUS_SYS_QUEUE_H;
       Dirk Markwardt <D.Markwardt@tu-bs.de>

commit cebc858ca27e1b3138e346b0094bcdfa08088699
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Mar 8 03:39:10 2001 +0000

     - OpenBSD CVS Sync
       - markus@cvs.openbsd.org 2001/03/08 00:15:48
         [readconf.c ssh.1]
         turn off useprivilegedports by default. only rhost-auth needs
         this. older sshd's may need this, too.

commit 058316f0f1811ac716c1cb799f50adae4af7928e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 8 10:08:49 2001 +1100

     - OpenBSD CVS Sync
      - djm@cvs.openbsd.org 2001/03/07 10:11:23
        [sftp-client.c sftp-client.h sftp-int.c sftp-server.c sftp.1 sftp.c sftp.h]
        Support for new draft (draft-ietf-secsh-filexfer-01). New symlink handling
        functions and small protocol change.

commit 8ac0a7ec448764036e1a1657013a9fd9179be860
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 7 21:38:19 2001 +1100

     - Cygwin contrib improvements from Corinna Vinschen <vinschen@redhat.com>

commit b29e34d1e491ac07ed294c51462e3611951a8379
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 7 06:08:50 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/07 04:05:58
         [ssh.1]
         removed dated comment

commit d58eb5f50e0159d40dff945a87f49ca51a5f29e8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 7 06:07:22 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/07 01:19:06
         [ssh.1 sshd.8]
         the name "secure shell" is boring, noone ever uses it

commit c9b6eabb49938442dfdfa95299e3d6f0c60080c3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 7 01:29:17 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/06 15:10:42
         [sftp.1]
         order things

commit 562c26bccf50264bb10551d81cb5cce93c2e8d6f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 7 01:26:48 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/06 06:11:44
         [sftp-int.c sftp.1 sftp.c]
         sftp -b batchfile; mouring@etoh.eviladmin.org

commit e21c4adaac7eae7b66b731defc2172a6a80a79ef
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Mar 7 01:23:30 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/06 06:11:18
         [ssh-keyscan.c]
         appease gcc

commit ebc882757b79ef9b97e6a109c78cb740d113adab
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 6 03:34:40 2001 +0000

       - millert@cvs.openbsd.org 2001/03/06 01:08:27
         [clientloop.c]
         If read() fails with EINTR deal with it the same way we treat EAGAIN

commit 884a4aca88e98b4954a061847f91cad72c87053d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 6 03:33:04 2001 +0000

       - millert@cvs.openbsd.org 2001/03/06 01:06:03
         [ssh-keyscan.c]
         Don't assume we wil get the version string all in one read().
         deraadt@ OK'd

commit b3144e58e74ad9cc3c07da94264c3ccbfccb5cf7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 6 03:31:34 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/06 00:33:04
         [authfd.c cli.c ssh-agent.c]
         EINTR/EAGAIN handling is required in more cases

commit be6a5a6dfe14c516b0982e57bb95f022bf19cf46
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 6 01:13:06 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/05 17:58:22
         [dh.c]
         spelling

commit 1e62174af12575265399dc27f3a4937109fe7b28
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 6 01:10:53 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/05 17:40:48
         [ssh.1]
         more ssh_known_hosts2 documentation; ok markus@

commit 4c4f05e09647ec68becba9664b6b84e643fc0578
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 6 01:09:20 2001 +0000

       - markus@cvs.openbsd.org 2001/03/05 17:17:21
         [kex.c kex.h sshconnect2.c sshd.c]
         generate a 2*need size (~300 instead of 1024/2048) random private
         exponent during the DH key agreement. according to Niels (the great
         german advisor) this is safe since /etc/primes contains strong
         primes only.
    
         References:
                 P. C. van Oorschot and M. J. Wiener, On Diffie-Hellman key
                 agreement with short exponents, In Advances in Cryptology
                 - EUROCRYPT'96, LNCS 1070, Springer-Verlag, 1996, pp.332-343.

commit c78a187b1776cb45c07a4a138946f8370ed6e71d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 6 01:06:58 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/05 16:07:15
         [sshd.8]
         detail default hmac setup too

commit ec26fb166788728d7ccafe85730ccf04f3a4885b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 6 01:05:23 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/05 15:56:16
         [myproposal.h ssh.1]
         switch to aes128-cbc/hmac-md5 by default in SSH2 -- faster;
         provos & markus ok

commit 35f1f4e2b833377b2a5e73d1c3f841c5e420cd29
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 6 01:02:41 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/05 15:44:51
         [servconf.c]
         sync error message; ok markus@

commit ff8b4940abe79dacaeae3a582f3ca19ccff33d9b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Mar 6 01:00:03 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/05 14:28:47
         [sshd.8]
         alpha order; jcs@rt.fm

commit 12888d1fc8bdcc2212ce61ffd523166c7e4ed5af
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Mar 5 19:50:57 2001 +0000

     - (stevesk) sftp.c: handle __progname

commit 935aa24bf41c0b77b79e6f010d482c9093a4b6d8
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Mar 5 19:46:37 2001 +0000

     - (stevesk) OpenBSD sync:
       - deraadt@cvs.openbsd.org 2001/03/05 08:37:27
         [ssh-keyscan.c]
         skip inlining, why bother

commit dd97de766cb44c48005321751577e60649d9a953
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 5 23:33:24 2001 +1100

    more

commit 30246a8f2bc6f492f0d78b65da07e78d13869591
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 5 21:23:31 2001 +1100

     - (djm) Fix up LOG_AUTHPRIV for systems that have it

commit 53f11c60b1802424f5d8817d3689750ff5c91073
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 08:18:17 2001 +0000

    Temporary disable AUTHPRIV code until it's fixed.  It is broken. =(

commit 2d9bfb17be2037ad3a735d108b3ac115527732ca
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 08:16:54 2001 +0000

     - (bal) Fix up logging since it changed.  removed log-*.c

commit 0f68db4e9e3a6c41504904079448770d13700a51
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:57:09 2001 +0000

     - (bal) Put HAVE_PW_CLASS_IN_PASSWD back into pwcopy()

commit 9727181114e080810ab12bf5d964b6c738cd94d7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:51:52 2001 +0000

    Oops.. Reverted CVS ID.

commit fd2e05b95ef3e7ba9706b589bf7d74281ce5c64a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:48:45 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/04 18:21:28
         [sshd.8]
         list SSH2 ciphers

commit 6df8ef4196f1287d4c328f09ea7f8c0995e0cab1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:47:23 2001 +0000

       - millert@cvs.openbsd.org 2001/03/04 17:42:28
         [authfd.c channels.c dh.c log.c readconf.c servconf.c sftp-int.c
          ssh.c sshconnect.c sshd.c]
         log functions should not be passed strings that end in newline as they
         get passed on to syslog() and when logging to stderr, do_log() appends
         its own newline.

commit fafea18d68f3d1a4ea412ff4618fd66c1a05b548
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:43:27 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/04 12:54:04
         [sshd.8]
         spelling

commit d9cae22d1a57e1e00bffb87ffa257ad717b90f2f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:42:03 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/04 11:16:06
         [servconf.c sshd.8]
         kill obsolete RandomSeed; ok markus@ deraadt@

commit 323c98f4a761b8ac79a7ffddca6a97f7f4c93a23
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:40:40 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/04 11:04:41
         [sshd.8]
         small cleanup and clarify for PermitRootLogin; ok markus@

commit 3d73a349313161770a5a37f02d6a8edff40c597a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:39:01 2001 +0000

       - stevesk@cvs.openbsd.org 2001/03/04 10:57:53
         [ssh.c]
         add -m to usage; ok markus@

commit 9c5324422eb0184d04a9a5bbcaf7a28169ad4f7c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:33:14 2001 +0000

     - (bal) CVS ID touch up on auth2.c, serverloop.c, session.c & sshd.c

commit b1131e9329b123b754fe4a7c70b1db85eba18267
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:27:13 2001 +0000

       - markus@cvs.openbsd.org 2001/03/04 00:03:59
         [channels.c]
         debug1->2

commit 8a432f5fe0b6a5e140ef2d72adc23b851d8d2e53
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:24:46 2001 +0000

       - markus@cvs.openbsd.org 2001/03/03 23:59:34
         [log.c ssh.c]
         log*.c -> log.c

commit 46d6e0909951021c3b16bf8ccf1778c01d370c4b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:10:47 2001 +0000

       - markus@cvs.openbsd.org 2001/03/03 23:52:22
         [sftp.c]
         clean up arg processing. based on work by Christophe_Moret@hp.com

commit 1addabd4911aca21ebc3acb06e0673b7ba9fceb8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:09:11 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/03 22:07:50
         [sftp-server.c]
         KNF

commit cb978aa057b1e36a2ac6e738cc055a70c6c48fd8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:07:49 2001 +0000

       - millert@cvs.openbsd.org 2001/03/03 21:41:07
         [packet.c]
         Dynamically allocate fd_set; deraadt@ OK

commit cb80bdf6d5c2e232e751187f86b6fa68d959fcf9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:06:12 2001 +0000

       - millert@cvs.openbsd.org 2001/03/03 21:40:30
         [sftp-server.c]
         Dynamically allocate fd_set; deraadt@ OK

commit c1e0421cb407724277dc08ab74fff26f3ee7569c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:04:38 2001 +0000

       - millert@cvs.openbsd.org 2001/03/03 21:19:41
         [ssh-keyscan.c]
         Dynamically allocate read_wait and its copies.  Since maxfd is
         based on resource limits it is often (usually?) larger than FD_SETSIZE.

commit d20b855bc6b7634575beeec572cdbdc57504d6a8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 07:01:18 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/03 06:53:12
         [ssh-keyscan.c]
         standard theo sweep

commit 92a2e38f8e71b2d7b97df1f7a5ade9efaefdb184
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:59:27 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/02 18:54:31
         [atomicio.c atomicio.h auth-chall.c auth.c auth2-chall.c crc32.h
          scp.c serverloop.c session.c sftp-server.8 sftp.1 ssh-add.1 ssh-add.c
          ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh.1 sshd.8]
         make copyright lines the same format

commit d7f5b517d5530fe0df65b23f80eb4d11732b537e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:57:23 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/02 09:42:49
         [sshd.8]
         doc the dsa/rsa key pair files

commit 49a098d1b202f9c6cc6c7a3e5e84ec9910a963db
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:55:18 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/02 06:21:01
         [sshd.8]
         explain SIGHUP better

commit 4040fe10a9fb735bf75670522d11408ee654f74d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:52:57 2001 +0000

       - markus@cvs.openbsd.org 2001/03/01 22:46:37
         [ssh.c]
         don't truncate remote ssh-2 commands; from mkubita@securities.cz
         use min, not max for logging, fixes overflow.

commit b22c2b86af40ed58621781f4ea0b3223542bcd80
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:50:47 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/01 03:38:33
         [cli.c cli.h rijndael.h ssh-keyscan.1]
         copyright notices on all source files

commit 204e48851a67d7165c7fa9fff21e92bcee448685
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:47:00 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/01 02:45:10
         [auth-rsa.c auth2.c deattack.c packet.c]
         KNF

commit 0ab2a010794017a7a1314faade2adcdb116e0544
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:45:21 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/01 02:29:04
         [ssh.c]
         shorten usage by a line

commit cf0da4067bc7dc51f3f7bef7ff08b49b3e5af448
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:42:58 2001 +0000

     - (bal) CVS ID touch up on uuencode.c

commit 66e5ecc6b292bfff0d0b31cea17db7e725ab2659
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:35:29 2001 +0000

     - (bal) CVS ID touch up on sftp-int.c

commit afd3475ddf9e215d1e1948d1ec55723b8e9d42d6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:33:23 2001 +0000

       - deraadt@cvs.openbsd.org 2001/03/01 02:11:25
         [authfd.c]
         split line so that p will have an easier time next time around

commit b40204bf22e6e9fb71db567715009fe338ab05c2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:29:44 2001 +0000

       - markus@cvs.openbsd.org 2001/02/28 21:31:32
         [channels.c]
         typo

commit e229b25a9efc4924f9b45a34de0aef491ae35d09
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:28:06 2001 +0000

       - markus@cvs.openbsd.org 2001/02/28 21:27:48
         [channels.c packet.c packet.h serverloop.c]
         use ignore message to simulate a SSH2_MSG_CHANNEL_DATA message
         use random content in ignore messages.

commit 941ac82e1624e7d7bb7091785ca525889738420b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:25:23 2001 +0000

       - markus@cvs.openbsd.org 2001/02/28 21:21:41
         [sshd.c]
         generate a fake session id, too

commit 4030442d77f13f87ecd58d2e43d688b206abb0f4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:22:01 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/28 17:52:54
         [misc.c]
         for completeness, copy pw_gecos too

commit cc74df79d79f20d685c0968430857de59320811c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:20:14 2001 +0000

       - markus@cvs.openbsd.org 2001/02/28 12:55:07
         [channels.c]
         unify debug messages

commit 5699c5f9acb09d8e210856c3dd3cdeb4078d41a4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:17:49 2001 +0000

       - markus@cvs.openbsd.org 2001/02/28 09:57:07
         [packet.c packet.h sshconnect2.c]
         in ssh protocol v2 use ignore messages for padding (instead of
         trailing \0).

commit 7fbd455c780e96065dc2bd8d96d21f0c017c0f99
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:16:11 2001 +0000

       - markus@cvs.openbsd.org 2001/02/28 08:54:55
         [channels.c nchan.c nchan.h]
         make sure remote stderr does not get truncated.
         remove closed fd's from the select mask.

commit e9613cf16d72fd78bda7ece0abd7f36c0fb266b6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:14:02 2001 +0000

       - markus@cvs.openbsd.org 2001/02/28 08:45:39
         [clientloop.c]
         fix byte counts for ssh protocol v1

commit ec19a40b94f8d229a283720ad72324d9eed32f86
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:12:01 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/28 05:36:28
         [sftp.c]
         do not kill the subprocess on termination (we will see if this helps
         things or hurts things)

commit 069090128c58d4cb7de488f2dfb3895661c59724
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:09:31 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/28 05:34:28
         [misc.c]
         pull in protos

commit 5de86cc73681bbbf6cb15e04c8c38ad1a03243d0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:08:19 2001 +0000

       - markus@cvs.openbsd.org 2001/02/27 11:00:11
         [compat.c]
         support SSH-2.0-2.1 ; from Christophe_Moret@hp.com

commit 6a5cde0eb77b3e08a2d3dc25be37a4053d5105d9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:07:00 2001 +0000

       - markus@cvs.openbsd.org 2001/02/27 10:35:27
         [packet.c]
         fix random padding

commit 4b00c8b40bfa22a8d7f68089b5b7542d23facdf0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:05:35 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/24 10:37:26
         [sshd_config]
         ssh2 rsa key before dsa key

commit b00d4fb1426fa6ac3c1e2ca78ee40e5f0e1d5d15
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:03:03 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/24 10:37:55
         [readconf.c]
         look for id_rsa by default, before id_dsa

commit eb648a749b3fb49c57167877ccc5f0ca8085cfcb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 06:00:29 2001 +0000

       - markus@cvs.openbsd.org 2001/02/23 18:15:13
         [sshd.c]
         the random session key depends now on the session_key_int
         sent by the 'attacker'
                 dig1 = md5(cookie|session_key_int);
                 dig2 = md5(dig1|cookie|session_key_int);
                 fake_session_key = dig1|dig2;
         this change is caused by a mail from anakin@pobox.com
         patch based on discussions with my german advisor niels@openbsd.org

commit f4c73112d00b970698b42765f925050447acc50a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 05:58:23 2001 +0000

       - markus@cvs.openbsd.org 2001/02/23 15:34:53
         [serverloop.c]
         debug2->3

commit 086cf214cf70cbb1658a9e966f84e7c12214554c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 05:56:40 2001 +0000

       - markus@cvs.openbsd.org 2001/02/22 21:59:44
         [auth.c auth.h auth1.c auth2.c misc.c misc.h ssh.c]
         use pwcopy in ssh.c, too

commit ebd888d91996b8328009f985d1b69d9f698e3607
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 05:49:29 2001 +0000

       - markus@cvs.openbsd.org 2001/02/22 21:57:27
         [ssh.1 sshd.8]
         typos/grammar from matt@anzen.com

commit 531a445c3a17049eabd39f0669e2e24959f062f7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 05:17:18 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/22 18:09:06
         [sshd_config]
         activate RSA 2 key

commit 7ab5117367f075a86d2558be5be62ba1daa1794b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 05:13:38 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/22 08:03:51
         [ssh-keygen.1 ssh-keygen.c]
         bye bye -d

commit b7c9232da18f3b5a0e2db38bb662828a85567f56
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 05:10:52 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/22 06:43:55
         [ssh-keygen.1 ssh-keygen.c]
         document -d, and -t defaults to rsa1

commit 33a3cc30ebdf8287ceb16f04194f02dacc30d89c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 05:07:52 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/22 04:29:37
         [servconf.c]
         grammar; slade@shore.net

commit 87af95b3e7a7e7aa3a0f5ef6135b20d28e3a0529
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 05:04:57 2001 +0000

       - stevesk@cvs.openbsd.org 2001/02/21 21:14:04
         [ssh.c]
         -i supports DSA identities now; ok markus@

commit 36592518dd0bd975de1534b0cdaee55597dcb3c8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 05:02:08 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/21 09:12:56
         [sftp-server.c]
         careful with & and &&; markus ok

commit b257cca7693dcb220e06dcab5c0f3fb458fb59d5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 04:59:27 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/21 09:05:54
         [authfile.c]
         improve fd handling

commit b0a4cd8f9174fbf14e1345a96585d19795b052c5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 04:54:49 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/21 07:37:04
         [ssh-keyscan.c]
         inline -> __inline__, and some indent

commit 53992c7cd50b2b6fea696b8593ee1fca7cef21fa
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 04:47:55 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/17 23:48:48
         [sshd.8]
         it's the OpenSSH one

commit 6ed8c043de433b9a9e0babee631776a3c5de214f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Mar 5 03:53:02 2001 +0000

     - (bal) CVS ID touch up on sshpty.[ch] and sshlogin.[ch]

commit cfb9370a3aeda822705eb50b723d80bea2b6a5c7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 3 21:43:19 2001 +0000

     - (bal) Updated contrib/README to remove 'make-ssh-known-hosts' and
       give Mark Roth credit for mdoc2man.pl

commit 59a5f9bd69a42957dfb28342fecc6d1cfa4c7afc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Mar 3 21:37:50 2001 +0000

     - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.

commit d0ccb989c2ccb190bf81819c4b6418d63c682538
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 4 00:29:20 2001 +1100

     - Allow PRNGd entropy collection from localhost TCP socket. Replace
       "--with-egd-pool" configure option with "--with-prngd-socket" and
       "--with-prngd-port" options. Debugged and improved by Lutz Jaenicke
       <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit f85b4d76705035e495545c84a922f032447414bd
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 4 00:19:00 2001 +1100

    mode doc

commit 1d66c1602eb9cae2d3f173a9d9f8d96c274518bb
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 4 00:16:20 2001 +1100

     - Document PAM ChallengeResponseAuthentication in sshd.8
     - Disable and comment ChallengeResponseAuthentication in sshd_config

commit 459ac4b688f87c5179b2d7f94dace1fd7204c568
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 3 20:00:36 2001 +1100

     - Remove make-ssh-known-hosts.pl, ssh-keyscan is better.

commit 9de5f058579079e0215c4c67958243d9d805e5dc
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 1 11:09:42 2001 +1100

     - (djm) Released 2.5.1p2

commit b5b62185371a8a2b1108dc87305f9c168fcaec39
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 1 09:48:13 2001 +1100

     - (djm) Cygwin needs pw->pw_gecos copied too. Patch from Corinna Vinschen
       <vinschen@redhat.com>

commit 882c2eed97630695c5e1acd2fd237cb5fa01fe26
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 1 09:18:57 2001 +1100

     - (djm) Force standard PAM conversation function in a few more places.
       Patch from Redhat 2.5.1p1-2 RPM, probably Nalin Dahyabhai
       <nalin@redhat.com>

commit 95aa2d60eaefc707a832d7ef2f17498fb6841ac8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 1 09:16:11 2001 +1100

     - (djm) Properly add -lcrypt if needed.

commit e854662d54b777a229d8c58f4afb68332113442b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 28 12:51:18 2001 +1100

     - (djm) Remove /tmp from EGD socket search list

commit 3d8ae61b878bc49807307a29b6f30c90636d3980
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 28 12:49:38 2001 +1100

     - (djm) EGD detection patch from Tim Rice <tim@multitalents.net>

commit efb71798150bb9faaf739e0e604a21db6c31e0cf
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 28 11:48:06 2001 +1100

     - (djm) Fully revert PAM session patch (again). All PAM session init is
       now done before the final fork().

commit c594633b492b94825c60330046a3648a2b7be565
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 28 11:46:11 2001 +1100

     - (djm) Fully revert PAM session patch. All PAM session init is now done
       before the final fork().

commit 4df5c76c2b217b3b487004731a13808ca6326bab
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 28 08:14:22 2001 +1100

     - (djm) Detect endianness in configure and use it in rijndael.c. Fixes
       "Bad packet length" bugs.

commit 6007f194839543b9f990c166fde9dfb615e94669
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 14:42:58 2001 +1100

    doh

commit 896b88acba56289efc427087ef0a0bc18043f29a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 14:42:48 2001 +1100

     - (djm) Open Server 5 doesn't need BROKEN_SAVED_UIDS. Patch from Tim Rice
       <tim@multitalents.net>
     - (djm) Avoid multiple definition of _PATH_LS. Patch from Tim Rice
       <tim@multitalents.net>

commit 0bcf9eacdf30c8bd496d39f45afa6e2cb74a2363
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 14:03:30 2001 +1100

     - (djm) Avoid warnings for missing broken IP_TOS. Patch from Mark Miller
       <markm@swoon.net>

commit 3456d32a9259038fd64d21f33d43489197bae975
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 11:00:52 2001 +1100

    avoid warning

commit 9b40580d762f660230ebbe4fc7121a94cbebae58
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 10:53:00 2001 +1100

     - (djm) Remove 'noreplace' flag from sshd_config in RPM spec files. This
       change is being made as 2.5.x configfiles are not back-compatible with
      2.3.x.

commit 7bd1c6262b059064ce71e39a883c8f0de8a25139
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 10:48:01 2001 +1100

     - (djm) Fix PAM fix

commit a66eca47ee454de6c18a0fe8af7d5f562c00c99d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 10:45:20 2001 +1100

    Bump spec versions too

commit ea5c9d4996e70ea5b6c40d9fdf831c44899d052e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 10:39:16 2001 +1100

    Bump version to 2.5.1p2 so I can generate new test RPMs

commit 248131ae9905cb3e45e8bee9246bd1b0cc96fb62
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 09:47:16 2001 +1100

     - (djm) Warning fix on entropy.c saved uid stuff. Patch from Mark Miller
       <markm@swoon.net>

commit 5a7613186bb74394912b179689190f439bfbba27
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 09:28:23 2001 +1100

     - (djm) Move PAM init to after fork for non-Solaris derived PAMs

commit 767c7fc27cac2ecbb2d8248369c0b93d8901f30f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 09:20:57 2001 +1100

     - (djm) fatal() on OpenSSL version mismatch

commit 31a501d21ef91a84a2fe09f91dda9b6a850d8840
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 09:20:48 2001 +1100

    whitspace

commit dd784b2c005d14efaddfcdaa2f37889791578ea2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Feb 26 22:11:59 2001 +0000

    Second Ooops... =) I started with the wrong date.

commit 255cae0be092d45a2afcfcf6c43d5826f4541cde
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 09:05:38 2001 +1100

    doh

commit fbd884a80d35bad7d69410096e3ab186783dd038
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 27 08:39:07 2001 +1100

     - (djm) Fix up POSIX saved uid support. Report from Mark Miller
       <markm@swoon.net>
     - (djm) Search for -lcrypt on FreeBSD too

commit 0c100870ac1c271a0a3d65099777af312e71d865
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Feb 26 20:38:53 2001 +0000

     - (bal) sshd.init support for all Redhat release.  Patch by Jim Knoble
       <jmknoble@jmknoble.cx>

commit 7603b2d244c9aeacacc78b246594bea011c48bd7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Feb 26 20:13:32 2001 +0000

       - markus@cvs.openbsd.org 2001/02/23 15:37:45
         [session.c]
         handle SSH_PROTOFLAG_SCREEN_NUMBER for buggy clients

commit 10b9bf95c07c0fb81f46b2df0e09afd7d3d1847b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Feb 26 20:04:45 2001 +0000

     - (bal) Applied shutdown() patch for sftp.c by  Corinna Vinschen
       <vinschen@redhat.com>

commit bb7c97620278ae97f52bbd50948734b6b355bcc2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 26 20:49:58 2001 +1100

     - (djm) Some systems (SCO3, NeXT) have weird saved uid semantics.
       Based on patch from Tim Rice <tim@multitalents.net>

commit 63941f9631b8316d57d54e0ef7484c66bb1c1b7d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Feb 25 23:20:40 2001 +0000

     - (bal) Fixed bsd-snprinf.c so it now honors 'BROKEN_SNPRINTF' again.

commit 416d87409493f6d2367db40a04c19c950f271613
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Feb 25 02:02:43 2001 +0000

     - (bal) Replace 'unsigned long long' to 'u_int64_t' since not every
       platform defines u_int64_t as being that.

commit 73bb058d0d9230c5594b2aee1f33b3dfdb12cb8b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 25 09:36:29 2001 +1100

     - (djm) Use %{_libexecdir} rather than hardcoded path in RPM specfile
       Patch from Adrian Ho <lexfiend@usa.net>

commit 8697e0866053dcdec35d556f8ac6adf4d79160af
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 24 21:41:10 2001 +0000

     - (bal) Missed part of the UNIX sockets patch.  Patch by Corinna
       Vinschen <vinschen@redhat.com>
     - (bal) Reorder where 'strftime' is detected to resolve linking
       issues on SCO.  Patch by Tim Rice <tim@multitalents.net>

commit bdb063d4e1d46cfff89c521d595ac90a570602a3
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Feb 24 09:00:23 2001 +0000

    cleanups.

commit 38e60935bbece7ca891bf9264366c26d7a42414e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 24 00:55:04 2001 +0000

     - (bal) Generalize lack of UNIX sockets since this also effects Cray
       not just Cygwin.  Based on patch by Wendy Palm <wendyp@cray.com>

commit 803f16cbe4acdcfaf21e87c5f655c63b85f8d1a3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 24 00:24:19 2001 +0000

     - (bal) Renamed sigaction.[ch] to sigact.[ch].  Causes problems with
       some platforms.

commit 65981156b8fb16b52903d42bd138ca4c095f9e0b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 24 00:05:29 2001 +0000

     - (bal) pam_stack fix to correctly detect between RH7 and older RHs.
       Patch by Pekka Savola <pekkas@netcore.fi>

commit 4ef92b58440b983b11d0e12b39f691ddc6b838bb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 23 05:05:53 2001 +0000

     - (bal) Double -I for OpenSSL on SCO.  Patch by Tim Rice
       <tim@multitalents.net>

commit 379f205a164ac0ede684f05635fe37fba30198b1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 23 04:55:46 2001 +0000

     - (bal) Patch to force OpenSSH rpm to require the same version of OpenSSL
       that it was compiled against.  Patch by Pekka Savola <pekkas@netcore.fi>

commit 008e29189ed5ebd2a30540a8dfdcbdc3bdbd6b1a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 23 04:45:15 2001 +0000

     - (bal) Fix --define rh7 in openssh.spec file.  Patch by Steve Tell
       <tell@telltronics.org>

commit 77aeaaf87f6527698485a3ebb46b7fb6e15d1f7d
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Feb 22 21:23:21 2001 +0000

     - (stevesk) remove erroneous #ifdef sgi code.
       Michael Stone <mstone@cs.loyola.edu>

commit e68c5670cd088254f82529162c3d2dd5df7ab91e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 22 06:20:10 2001 +0000

     - (bal) Added mdoc2man.pl from Mark Roth <roth@feep.net>
     - (bal) Removed reference to liblogin from contrib/README.  It was
       integrated into OpenSSH a long while ago.

commit e1bd29bc9edfdb6ec313c1d304cfce0b3f3823d6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Feb 21 20:00:28 2001 +0000

     - (bal) Corrected SCO luid patch by svaughan <svaughan@asterion.com>

commit ff793a27b8615f500e59811fa1c43eda909c35e6
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Feb 21 16:36:51 2001 +0000

     - (stevesk) session.c: back out to where we were before:
        - (djm) Move PAM session initialisation until after fork in sshd. Patch
          from Nalin Dahyabhai <nalin@redhat.com>

commit 94bce40720e91d184ae22272a1537edffb65f945
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Feb 21 05:53:33 2001 +0000

     - (bal) Reverted out of 2001/02/15 patch by djm below because it
       breaks Solaris.
            - (djm) Move PAM session setup back to before setuid to user.
              fixes problems on Solaris-drived PAMs.

commit 5eff0316a8bc81e43c8ca4223bc4f904bac5cbe4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Feb 21 02:35:37 2001 +0000

     - (bal) Fixed OpenSSL rework to use $saved_*.  Patch by Tim Rice
       <tim@multitalents.net>

commit 866488b3406e6ff223382eaddd4490155a3cca2f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 20 18:22:38 2001 +0000

     - (bal) Removed -L/usr/ucblib -R/usr/ucblib for Solaris platform.

commit a9a29e1bed94142db9699aeda271202543925317
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 20 01:20:47 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/19 23:09:05
         [sshd.c]
         clarify message to make it not mention "ident"

commit 4ffaad8c33eea799dc843f5b07cca7c433ea0b6d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Feb 19 19:54:43 2001 +0000

     - (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and
       getcwd.c.

commit 7387fdb6b58b8ba26e1ec7f476d2a5b57236bae1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 19 21:51:49 2001 +1100

     - Update versions in RPM spec files
     - Release 2.5.1p1

commit 225736c73acf19a3319104fe54cd9ce595924134
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 19 21:51:08 2001 +1100

     - OpenBSD CVS Sync:
       - reinhard@cvs.openbsd.org        2001/02/17 08:24:40
         [sftp.1]
         typo
       - deraadt@cvs.openbsd.org 2001/02/17 16:28:58
         [ssh.c]
         cleanup -V output; noted by millert
       - deraadt@cvs.openbsd.org 2001/02/17 16:48:48
         [sshd.8]
         it's the OpenSSH one
       - markus@cvs.openbsd.org  2001/02/18 11:33:54
         [dispatch.c]
         typo, SSH2_MSG_KEXINIT, from aspa@kronodoc.fi
       - markus@cvs.openbsd.org  2001/02/19 02:53:32
         [compat.c compat.h serverloop.c]
         ssh-1.2.{18-22} has broken handling of ignore messages; report from
         itojun@
       - markus@cvs.openbsd.org  2001/02/19 03:35:23
         [version.h]
         OpenSSH_2.5.1 adds bug compat with 1.2.{18-22}
       - deraadt@cvs.openbsd.org 2001/02/19 03:36:25
         [scp.c]
         np is changed by recursion; vinschen@redhat.com

commit ccdefb600f9d279cd17cdca79b241a036b380b21
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 19 12:56:39 2001 +1100

     - (djm) Rework search for OpenSSL location. Skip directories which don't
       exist, don't add -L$ssldir/lib if it doesn't exist. Should help SCO
       with its limit of 6 -L options.

commit d95c09cc83ec07b42feb07c4ff71d23720b37e8e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Feb 18 19:13:33 2001 +0000

     - (bal) Markus' blessing to rename login.[ch] -> sshlogin.[ch] and
       pty.[ch] -> sshpty.[ch]

commit c32a5b1a1568258481df6316dc008fc7cd3825fd
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 23:50:38 2001 +1100

    Forgot to commit Changelog
    
     - (djm) Merge BSD_AUTH support from Markus Friedl and David J. MacKenzie
       enable with --with-bsd-auth.

commit 4679f5b94f9bcfd2ad5661c6b44eb4d6ee14cf51
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Feb 18 11:34:32 2001 +0000

     - (stevesk) entropy.c: typo; should be SIGPIPE

commit 60396b060b803fd2d20aa151dc0432a344f798b0
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 17:01:00 2001 +1100

     - (djm) Merge BSD_AUTH support from Markus Friedl and David J. MacKenzie
       enable with --with-bsd-auth.

commit 75da9a9e721bf0f73aab8a28505a62224c327d18
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 15:43:07 2001 +1100

     - (djm) Update RPM spec files for 2.5.0p1

commit 877d8ea1442f92dbc5135a7e16d1bb9591abea54
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 15:29:28 2001 +1100

     - (djm) SunOS 4.x also needs to define HAVE_BOGUS_SYS_QUEUE_H as it has
       a <sys/queue.h> that lacks the TAILQ_* macros. Patch from Todd C.
       Miller <Todd.Miller@courtesan.com>

commit a1072a8e3728a044acfb96ca1e69aa0cb9c09aeb
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 15:28:11 2001 +1100

     - (djm) Move entropy.c over to mysignal()

commit 132a8fc4c9c6110e447e669afb42703fba44e703
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 15:23:10 2001 +1100

    Accidentally applied test code, revert

commit 722ccb1492a5f3aaa71eacc97a684e82d13df07b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 15:18:43 2001 +1100

     - (djm) SA_INTERRUPT is the converse of SA_RESTART, apply it only for
       SIGALRM.

commit 93c17d9eed2643e1f5ab4d2a5de46e5c7fd0fb93
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Feb 18 03:55:16 2001 +0000

     - (stevesk) scp.c: use mysignal() for updateprogressmeter() handler.

commit eff26f275eca8fb4c1dab03599ad21d79a8a55ea
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Feb 18 03:42:02 2001 +0000

     - (stevesk) misc.c: cpp rework of SA_(INTERRUPT|RESTART) handling.

commit df28802cddeb887a6fa3c4a8e8a4f208ce3652b5
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 13:07:07 2001 +1100

     - (djm) SCO needs librpc for libwrap. Patch from Tim Rice
       <tim@multitalents.net>

commit 0318e2e0fb0be94b61f618e92ddd5101d2f06d1a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 13:04:23 2001 +1100

     - (djm) Use SA_INTERRUPT along SA_RESTART if present (equivalent for
       SunOS)

commit 8609332558d7130f0e4a71eba8bcad6fdebddcd5
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 12:58:24 2001 +1100

     - (djm) Doc fixes from Pekka Savola <pekkas@netcore.fi>

commit 22d5aa7553d8d88a1662e977c8346eb155a7a044
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 12:49:57 2001 +1100

     - (djm) Swapped tests for no_libsocket and no_libnsl in configure.in.
       Patch from Marek Michalkiewicz <marekm@amelek.gda.pl>

commit 99e924357eaf5a3f63028d741071370e22746e9c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 12:49:35 2001 +1100

     - (djm) Use ttyname() to determine name of tty returned by openpty()
       rather then risking overflow. Patch from Marek Michalkiewicz
       <marekm@amelek.gda.pl>

commit b3ffc5f1d4f630521e5ad4787db1f691942b8592
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 12:44:29 2001 +1100

     - (djm) Robustify EGD/PRNGd code in face of socket closures. Patch from
       Todd C. Miller <Todd.Miller@courtesan.com>

commit 0a4e27d5832a6a2d0fdaff4a169d0c216b37eeee
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 12:36:39 2001 +1100

     - (djm) Close listen_sock on bind() failures. Patch from Arkadiusz
       Miskiewicz <misiek@pld.ORG.PL>

commit 2deb3f64f60d5fe0331f87416d99536b220d7a4f
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 18 12:30:55 2001 +1100

     - (djm) Fix my breaking of cygwin builds, Patch from Corinna Vinschen
       <vinschen@redhat.com> and myself.

commit e74ebd03c23896f3f3d3f00cf5cc44c3f16c4c43
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Feb 17 17:10:16 2001 +0000

    KNF

commit 970c009b8e9a8187e06c6627c448483765c3f1c1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 17 16:51:07 2001 +0000

     - (Bal) Patch for lack of RA_RESTART in misc.c for mysignal by
       stevesk

commit 6dc75f594d4e10cb2102562a944d5873dea28f7e
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 17 16:47:47 2001 +0000

     - (bal) Patch for fix FCHMOD reference in ftp-client.c by Tim Rice
       <tim@multitalents.net>

commit 63015fdb0b6267774cbed10517048c63df587d09
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 17 01:04:37 2001 +0000

    Removed 'build out of tree' line since it does. =)

commit 9db7d5a2a1332842649217436cd706cd28cae12a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 16 20:01:29 2001 +0000

    OpenSSH 2.5.0 went gold in the OpenBSD tree.

commit 8dcdeb84211b7bf4024317b1686c2e0fd6d01e82
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 16 16:02:14 2001 +0000

       - markus@cvs.openbsd.org 2001/02/16 14:03:43
         [session.c]
         proper payload-length check for x11 w/o screen-number

commit 813f9402aeb2b71d873c159a281b834aa5e24f6c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 16 15:56:31 2001 +0000

    - markus@cvs.openbsd.org 2001/02/16 13:38:18
      [channel.c]
      remove debug

commit 799bed85ab0a37362bcf06f3f30c55ba8d730848
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Feb 16 14:58:12 2001 +0000

     - (stevesk) set SA_RESTART flag in mysignal() for SIGCHLD;
       needed on Unixware 2.x.

commit 9646f3b3f9fa82a6f5cdf49cbb09481517dfb1c6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 16 03:36:46 2001 +0000

    #error no longer required,  dealt with in configure.in now.

commit c83de6db41324ef18cef42e1c8666428c02e92ca
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 16 14:17:59 2001 +1100

    KNF

commit 8fa2bda561b7ce6bb79eff8023198e97580b089d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 16 13:03:04 2001 +1100

    KNF comment block

commit 79438cc03040e22a053f2cb02e42483272b458df
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 16 12:34:57 2001 +1100

     - (djm) OpenBSD CVS:
       - markus@cvs.openbsd.org  2001/02/15 16:19:59
         [channels.c channels.h serverloop.c sshconnect.c sshconnect.h]
         [sshconnect1.c sshconnect2.c]
         genericize password padding function for SSH1 and SSH2.
         add stylized echo to 2, too.
     - (djm) Add roundup() macro to defines.h

commit 217f567187a9b1d32019666151d702c87332c72b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 16 12:12:41 2001 +1100

     - (djm) Set "login ID" on systems with setluid. Only enabled for SCO
       OpenServer for now. Based on patch from svaughan <svaughan@asterion.com>

commit 5dfe976cdfbc5703dfbbd0783f1328be0007eca3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 16 12:05:39 2001 +1100

     - (djm) USE_PIPES for a few more sysv platforms
     - (djm) Cleanup configure.in a little
     - (djm) Ask users to check config.log when we can't find necessary libs

commit b5e85a5d943462e81a4649617e87b7a76c645c1e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 16 11:18:58 2001 +1100

     - (djm) Make gnome-ssh-askpass handle multi-line prompts. Patch from
       Nalin Dahyabhai <nalin@redhat.com>
     - (djm) BSD license for gnome-ssh-askpass (was X11)
     - (djm) KNF on gnome-ssh-askpass

commit c547bf1930702f185fb5b077d8cce0bfd243f68a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 16 10:18:12 2001 +1100

     - (djm) Mini-configure reorder patch from Tim Rice <tim@multitalents.net>
       Fixes linking on SCO.

commit 5805513b17120e47db3317a34463609e35deafc2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 15 18:34:29 2001 +0000

     - (bal) Added DG/UX case and set that they have a broken IPTOS

commit 4e5a0aa00195ee8dd0a5dab9909d21a30e176f27
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 15 18:16:22 2001 +0000

     - (bal) added '--with-prce'  to allow overriding of system regex when
       required (tested by David Dulek <ddulek@fastenal.com>)

commit b7f036fd8c6c7b2b2e2f7540a94486cf89991b94
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Feb 15 17:27:15 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/15 01:38:04
         [serverloop.c]
         indent

commit 09214548336357cccc2c01459ea3f42ff436ad9f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 15 15:33:17 2001 +1100

     - (djm) Move to Jim's 1.2.0 X11 askpass program

commit 0a7e354f646169bd53ee85ab72f17ccf5ad81570
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 15 03:50:49 2001 +0000

     - replaced PATH_MAX in sftp-int.c w/ MAXPATHLEN.

commit 2320b1900209f7eb8baeada674c0c479fe0f2827
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 15 03:46:28 2001 +0000

    Checking for stdarg.h is not required any more.

commit 9d4f2c808caa5af966c54de9a89c4a9ce1ef48a6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 15 03:22:45 2001 +0000

      - djm@cvs.openbsd.org 2001/02/14 9:46:03
        [sftp-client.c sftp-int.c sftp.1]
        Fix and document 'preserve modes & times' option ('-p' flag in sftp);
        ok markus@

commit 6690494f2125a5576cde11f7642e5ba70c91579c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 15 03:19:56 2001 +0000

      - stevesk@cvs.openbsd.org 2001/02/12 20:53:33
        [sftp-int.c]
        lumask now works with 1 numeric arg; ok markus@, djm@

commit 5393f9360d95e42556855c184f529e7a6792f711
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 15 03:17:13 2001 +0000

      - markus@cvs.openbsd.org 2001/02/12 23:26:20
        [sshd.c]
        missing memset; from solar@openwall.com

commit c1ba31fadc1146ed56bf33ae0fca2cfe1f1b9f94
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 15 03:14:11 2001 +0000

      - markus@cvs.openssh.org 2001/02/13 22:49:40
        [auth1.c auth2.c]
        setproctitle(user) only if getpwnam succeeds

commit f9452513fcf92be881809006ce3c210805d5f2ad
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 15 03:12:08 2001 +0000

      - deraadt@cvs.openbsd.org 2001/02/12 22:56:09
         [clientloop.c packet.c ssh-keyscan.c]
         deal with EAGAIN/EINTR selects which were skipped

commit d8a9021f3652d8ab99d0fed2460420c3eb4e10a2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 15 03:08:27 2001 +0000

       - markus@cvs.openbsd.org 2001/02/12 16:16:23
         [auth-passwd.c auth.c auth.h auth1.c auth2.c servconf.c servconf.h
          ssh-keygen.c sshd.8]
         PermitRootLogin={yes,without-password,forced-commands-only,no}
         (before this change, root could login even if PermitRootLogin==no)

commit 06b33aa0e83163f3dcd679317afec1ee95910512
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 15 03:01:59 2001 +0000

       - markus@cvs.openbsd.org 2001/02/11 12:59:25
         [Makefile.in sshd.8 sshconnect2.c readconf.h readconf.c packet.c
          sshd.c ssh.c ssh.1 servconf.h servconf.c myproposal.h kex.h kex.c]
         1) clean up the MAC support for SSH-2
         2) allow you to specify the MAC with 'ssh -m'
         3) or the 'MACs' keyword in ssh(d)_config
         4) add hmac-{md5,sha1}-96
                 ok stevesk@, provos@

commit 4272ed803ff309f1fdb9c149b9cf083769f53744
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 15 02:36:46 2001 +0000

       - markus@cvs.openbsd.org 2001/02/12 12:45:06
         [sshconnect1.c]
         fix xmalloc(0), ok dugsong@

commit 646aa60b41c7630fbc4d30811419df3900743302
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 15 11:51:32 2001 +1100

     - (djm) Clean up PAM namespace. Suggested by Darren Moffat
       <Darren.Moffat@eng.sun.com>

commit e8b5b04521f33d868ac3301802e3dab1f57588fd
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 15 11:32:15 2001 +1100

     - (djm) Move PAM session setup back to before setuid to user. Fixes
       problems on Solaris-derived PAMs.

commit 7fafa5ccbe332d3c3faabd75b3354f8d149e6d09
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Feb 13 18:45:00 2001 +0000

     - (stevesk) fix for SIA patch, misplaced session_setup_sia()

commit 92ddb7d6f0d6a1942e27f75883d29dc0ea99223f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 14 01:25:23 2001 +1100

     - (djm) Split out and improve OSF SIA auth code. Patch from Chris Adams
       <cmadams@hiwaay.net> with a little modification and KNF.

commit 116b6bdda81d6647cc2742280c15b3f42ab3dd24
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 13 14:05:59 2001 +0000

     - (bal) Missing function prototype in bsd-snprintf.c patch by
       Mark Miller <markm@swoon.net>

commit 6b4146ad739da603a298474db67824532508c3b8
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 14 00:45:51 2001 +1100

     - (djm) Move PAM session initialisation until after fork in sshd. Patch
       from Nalin Dahyabhai <nalin@redhat.com>

commit 3dfeee46d710c74f48919c827b2403dc7a63c591
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 14 00:43:55 2001 +1100

     - (djm) Don't try to close PAM session or delete credentials if the
       session has not been open or credentials not set. Based on patch from
       Andrew Bartlett <abartlet@pcug.org.au>

commit bca8c8f3a14b41fc98693dbf448a873b7cd30f03
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Feb 13 11:26:21 2001 +0000

     - (stevesk) auth1.c: fix PAM passwordless check.

commit 34bb0c7431d4e41e506eb51cc4a39251110d3f49
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 13 02:40:56 2001 +0000

     - (bal) Use chown() if fchown() does not exist in ftp-server.c patch by
       Tim Rice <tim@multitalents.net>

commit 6c92dab9a1ab05426b42d7cc5dca2a9c5af52f1d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 13 02:18:50 2001 +0000

     - (bal) Cleaned out bsd-snprintf.c.  VARARGS have been banished and
       I did a base KNF over the whe whole file to make it more acceptable.
       (backed out of original patch and removed it from ChangeLog)
    
    This has been a long time coming.  If we decide that we need VARARGS support
    we should do it at a higher level, since no where else do we support VARARGS
    in the code base.

commit d8ab0d4a852e00ab9e46c7147d887b0b038d7d43
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 13 12:11:17 2001 +1100

     - (djm) Only test -S potential EGD sockets if they exist and are readable.

commit 5d8520ab76cb794358e0bc439d0d1acaabc7dbf8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Feb 12 15:57:18 2001 +0000

     - (bal) added NeXT work around for bsd-snprintf.c in bsd-nextstep.h.
     - (bal) added TODO item to clean up and sort out 'varargs' from 'stdargs'

commit 7f982bf6c93ee7ab3426a059af51d21663ed36f0
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Feb 12 15:07:52 2001 +0000

     - (stevesk) session.c: remove debugging code.

commit 603bdfd602f2004d74c39dbab8142f19af6087dd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Feb 12 07:29:45 2001 +0000

     - (bal) NCR SVR4 compatiblity provide by Don Bragg <thewizarddon@yahoo.com>

commit 61ce036c4aa0a45cac9e8d2f1e14a9169f55c6e2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 12 18:02:23 2001 +1100

     - (djm) Fix OSF SIA auth NULL pointer deref. Report from Mike Battersby
       <mib@unimelb.edu.au>

commit f172020510005e153a68aa7632de71f0d3767120
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 12 11:15:41 2001 +1100

     - (djm) Clean up PCRE text in INSTALL

commit 070ca313254f1a869ca84bfc3feb946e385b7145
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 12 09:34:17 2001 +1100

     - (djm) Update Redhat specfile to allow --define "skip_x11_askpass
       --define "skip_gnome_askpass 1", --define "rh7 1" and make the
       implicit rpm-3.0.5 dependancy explicit. Patch and suggestions fro
       Pekka Savola <pekkas@netcore.fi>

commit bcc862755d2dd0f19a0c6cb509669436193bde2d
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Feb 11 18:49:23 2001 +0000

     - (stevesk) compat.c: more friendly cpp error

commit d85bf4b57e394cb156c8eae19f43996b436822b7
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Feb 11 16:43:05 2001 +0000

       - stevesk@cvs.openbsd.org 2001/02/11 06:15:57
         [LICENSE]
         typos and small cleanup; ok deraadt@

commit fad3c513f0e2591ad22a0e340c347e80a5a03074
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Feb 11 14:34:10 2001 +0000

     - (stevesk) misc.c: ssh.h not needed.

commit d2e0d7d09190323e297f83d9eb33a40262229239
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Feb 11 14:19:40 2001 +0000

    small format sync.

commit 43cdef3ba58f4b7dd47787425c2cab8ceec64006
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Feb 11 14:12:08 2001 +0000

    missed session.c part of:
    
       - stevesk@cvs.openbsd.org 2001/02/08 10:11:23
         [session.c sftp-client.c]
         %i -> %d

commit 432768612c21549792714fbc2c4fcf5e49f22a65
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Feb 11 13:56:43 2001 +0000

    missed sshconnect.c part of:
    
       - itojun@cvs.opebsd.org 2001/02/08 10:47:05
         [sshconnect.c sshconnect1.c sshconnect2.c]
         %.30s is too short for IPv6 numeric address.  use %.128s for now.
         markus ok

commit ac2b1a52f292f6e3f65906eaa047522b8ead3af0
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 11 22:39:19 2001 +1100

    Oops - missed a bit of previous diff

commit bd5817d4ffcbd6dc29f3003725806f04e6dffe42
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 11 22:35:11 2001 +1100

     - (djm) Set PAM_RHOST earlier, patch from Andrew Bartlett
       <abartlet@pcug.org.au>

commit bf83d4b10664a6321d235b5a6a0ca72352f23730
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Feb 11 00:05:05 2001 +0000

    Oops,  #include <resolv.h> mistakenly reappeared in.

commit e055716a89f2f25924babc17c12d32c4911be927
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Feb 11 00:00:24 2001 +0000

       - itojun@cvs.opebsd.org 2001/02/08 10:47:05
         [sshconnect1.c sshconnect2.c]
         %.30s is too short for IPv6 numeric address.  use %.128s for now.
         markus ok

commit e5b3fb351e4c34d1457ffd3fa8004945be199fe7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 23:56:35 2001 +0000

     - (bal) A bit more whitespace cleanup

commit aa630def4d868c60e6d90a0f52a7d393fed78132
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 23:44:47 2001 +0000

       - 1.47 Thu Feb 8 23:11:42 GMT 2001 by dugsong
         [serverloop.c sshconnect1.c]
         mitigate SSH1 traffic analysis - from Solar Designer
         <solar@openwall.com>, ok provos@

commit f7d79c794bc0edb7f0413765c1f6b0206c10dbc9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 23:40:31 2001 +0000

    Useless CVS ID Update.

commit a905ecd994ad19a733538bb2093d919e85923b98
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 23:34:54 2001 +0000

       - deraadt 2001/02/07 8:57:26
         [xmalloc.c]
         deal with new ANSI malloc stuff
       - markus@cvs.openbsd.org 2001/02/07 16:46:08
         [xmalloc.c]
         typo in fatal()
       - itojun@cvs.openbsd.org 2001/02/07 18:04:50
         [xmalloc.c]
         fix size_t -> int cast (use u_long).  markus ok

commit 70ea46a382befd3100020b135d5ff440c51c3bd5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 23:30:16 2001 +0000

     - (bal) uuencode.c resync w/ OpenBSD tree, plus whitespace.

commit e9d044452462b0c4b84fe42f3cf165af3f0bac80
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 23:26:35 2001 +0000

       - djm@cvs.openbsd.org 2001/02/04 21:26:07
         [sshd_config]
         type: ok markus@
       - deraadt@cvs.openbsd.org 2001/02/06 22:07:50
         [sshd_config]
         enable sftp-server by default

commit b6c06d9303aedfaf0af539758243eb4b4d263459
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 23:21:09 2001 +0000

       - markus@cvs.openbsd.org 2001/02/08 22:35:30
         [sshconnect.c]
         don't connect if batch_mode is true and stricthostkeychecking set to
        'ask'

commit c791bebc2a0e15af332151502ca56c4d7f15ebc1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 23:18:11 2001 +0000

       - itojun@cvs.openbsd.org 2001/02/07 18:04:50
         [ssh-keyscan.c]
         fix size_t -> int cast (use u_long).  markus ok
       - markus@cvs.openbsd.org 2001/02/07 22:43:16
         [ssh-keyscan.c]
         s/getline/Linebuf_getline/; from roumen.petrov@skalasoft.com
       - itojun@cvs.openbsd.org 2001/02/09 9:04:59
         [ssh-keyscan.c]
         do not assume malloc() returns zero-filled region.  found by
         malloc.conf=AJ.

commit 28072eb10c8a45f7dbe2deb08f6db8c3461d8022
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 23:13:41 2001 +0000

       - itojun@cvs.openbsd.org 2001/02/08 19:30:52
         sync with netbsd tree changes.
         - more strict prototypes, include necessary headers
         - use paths.h/pathnames.h decls
         - size_t typecase to int -> u_long

commit 77788dc824b96ea74c9c5510a960d8cf5ba7dec9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 23:10:33 2001 +0000

    Sync CVS ID w/ OpenBSD

commit be80af7c17c77a34d4a2d7da6c53ecb826f88774
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 23:06:02 2001 +0000

    Synced w/ OpenBSD

commit e8e9fd5f9c38af0e1501a489d6d9711f02efa367
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 23:02:23 2001 +0000

    missed type casing with %8llu change

commit 7e9aff55bcf6c6f45dd8e2afd6c7d59a47ebe1d2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 23:00:22 2001 +0000

     - (bal) sftp-sever.c  '%8lld' to '%8llu' (OpenBSD Sync)

commit afed4d90bfea0f43d265c7779c4810754a9a4beb
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 22:57:44 2001 +0000

    CVS Sync with OpenBSD

commit 4f7a64a64fb5de0f9642074915dd39bd7167fbd4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 22:50:09 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/08 14:39:36
         [readconf.c]
         snprintf

commit 9d3a859e8cafcc1de4908a17caeeaab52d491b03
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 22:44:12 2001 +0000

       - markus@cvs.openbsd.org 2001/02/06 22:43:02
         [clientloop.h]
         remove confusing callback code

commit b3211a85894b06bd3060a1e2b3b18c3fba536da9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 22:33:19 2001 +0000

       - markus@cvs.openbsd.org 2001/02/08 21:58:28
         [channels.c]
         nuke sprintf, ok deraadt@

commit 36d7bd00f9fe2b704e85d6f90da18835412b11e0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 22:27:19 2001 +0000

       - markus@cvs.openbsd.org 2001/02/09 13:38:07
         [auth-options.c]
         reset options if no option is given; from han.holl@prismant.nl

commit a1ebd89d243fb079b6c3b89e14dd6af47ef11161
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 22:19:23 2001 +0000

    Sync w/ OpenBSD

commit 03df5bde9c6ae82168098b9be5775b42d02ad8e5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 22:16:41 2001 +0000

       - markus@cvs.openbsd.org 2001/02/06 22:26:17
         [sshconnect2.c]
         do not ask for passphrase in batch mode; report from ejb@ql.org
       - itojun@cvs.opebsd.org 2001/02/08 10:47:05
         [sshconnect2.c]
         %.30s is too short for IPv6 numeric address.  use %.128s for now.
         markus ok
       - markus@cvs.openbsd.org 2001/02/09 12:28:35
         [sshconnect2.c]
         do not free twice, thanks to /etc/malloc.conf
       - markus@cvs.openbsd.org 2001/02/09 17:10:53
         [sshconnect2.c]
         partial success: debug->log; "Permission denied" if no more auth methods
       - markus@cvs.openbsd.org 2001/02/10 12:09:21
         [sshconnect2.c]
         remove some lines

commit 8fd10b0f1346e21286f026adde95b553bba84752
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 22:11:13 2001 +0000

       - markus@cvs.openbsd.org 2001/02/10 1:46:28
         [ssh.c]
         remove mapping of argv[0] -> hostname

commit 5ab6ae1282286f71b18e6fc5737c908a4a5ddf70
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 22:08:03 2001 +0000

     - (bal) Synced ssh.1 w/ OpenBSD

commit 27cb1d061dc1695f681ebf567761afbb5868df56
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 21:59:35 2001 +0000

       - djm@cvs.openbsd.org 2001/02/10 0:45:52
         [scp.1]
         Mention that you can quote pathnames with spaces in them

commit 33390fc4e5ad40e1b647a252034998d24e008867
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 21:56:08 2001 +0000

    CVS ID Sync w/ OpenBSD

commit 10ac33f2546b4de58f7ce73d3e5a8be395f25643
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 21:53:40 2001 +0000

     - (bal) Minor correction to sftp-client.c I made.  Should return 'status'
       instead of '0'  (from the OpenBSD tree)

commit 550bc54cbaecf306fbc487cb82a955f143dc36ae
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 21:50:00 2001 +0000

       - danh@cvs.openbsd.org 2001/02/10 0:12:43
         [scp.c]
         revert a small change to allow -r option to work again; ok deraadt@
       - danh@cvs.openbsd.org 2001/02/10 15:14:11
         [scp.c]
         fix memory leak; ok markus@

commit fdc9ab08f7a013fe57edd69503a512687dc3407a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 21:45:02 2001 +0000

       - markus@cvs.openbsd.org 2001/02/10 12:44:02
         [cli.c]
         don't call vis() for \r

commit 874a0b364c64beda0cb8e55a7b684d76b592c91c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 21:39:49 2001 +0000

       - markus@cvs.openbsd.org 2001/02/10 1:33:32
         [canohost.c]
         add debug message, since sshd blocks here if DNS is not available

commit 075390a3f8ea4f56265d8776c762ab4dc10d8227
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 21:34:46 2001 +0000

       - markus@cvs.openbsd.org 2001/02/8 22:37:10
         [canohost.c]
         remove last call to sprintf; ok deraadt@

commit d1f20ec3683183332f78ef82487a982b929c60cc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 21:31:53 2001 +0000

       - markus@cvs.openbsd.org 2001/02/10 12:52:02
         [auth2.c]
         offer passwd before s/key

commit f79aeffe3b8f58c3d7da0fba28f8eba867079e6d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 21:27:11 2001 +0000

       - markus@cvs.openbsd.org 2001/02/07 22:35:46
         [auth1.c auth2.c sshd.c]
         move k_setpag() to a central place; ok dugsong@

commit c5dbf7fdc94708670b941c84815b78f61e2cb329
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 10 00:37:17 2001 +0000

     - (bal) sftp-client.c replace NULL w/ 0 in do_ls() (pending in OpenBSD tree)

commit 137465b67ce6d5e6a3e99b8b97aed25296a27d96
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 10 00:47:59 2001 +1100

    Missed these log messages.
    
    Past my bedtime :)

commit d7686fd1fbe842baa8ce77f018c040d5e1d3438a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Feb 10 00:40:03 2001 +1100

     - (djm) Sync sftp and scp stuff from OpenBSD:
       - djm@cvs.openbsd.org     2001/02/07 03:55:13
         [sftp-client.c]
         Don't free handles before we are done with them. Based on work from
         Corinna Vinschen <vinschen@redhat.com>. ok markus@
       - djm@cvs.openbsd.org     2001/02/06 22:32:53
         [sftp.1]
         Punctuation fix from Pekka Savola <pekkas@netcore.fi>
       - deraadt@cvs.openbsd.org 2001/02/07 04:07:29
         [sftp.1]
         pretty up significantly
       - itojun@cvs.openbsd.org  2001/02/07 06:49:42
         [sftp.1]
         .Bl-.El mismatch.  markus ok
       - djm@cvs.openbsd.org     2001/02/07 06:12:30
         [sftp-int.c]
         Check that target is a directory before doing ls; ok markus@
       - itojun@cvs.openbsd.org  2001/02/07 11:01:18
         [scp.c sftp-client.c sftp-server.c]
         unsigned long long -> %llu, not %qu.  markus ok
       - stevesk@cvs.openbsd.org 2001/02/07 11:10:39
         [sftp.1 sftp-int.c]
         more man page cleanup and sync of help text with man page; ok markus@
       - markus@cvs.openbsd.org  2001/02/07 14:58:34
         [sftp-client.c]
         older servers reply with SSH2_FXP_NAME + count==0 instead of EOF
       - djm@cvs.openbsd.org     2001/02/07 15:27:19
         [sftp.c]
         Don't forward agent and X11 in sftp. Suggestion from Roumen Petrov
         <roumen.petrov@skalasoft.com>
       - stevesk@cvs.openbsd.org 2001/02/07 15:36:04
         [sftp-int.c]
         portable; ok markus@
       - stevesk@cvs.openbsd.org 2001/02/07 15:55:47
         [sftp-int.c]
         lowercase cmds[].c also; ok markus@
       - markus@cvs.openbsd.org  2001/02/07 17:04:52
         [pathnames.h sftp.c]
         allow sftp over ssh protocol 1; ok djm@
       - deraadt@cvs.openbsd.org 2001/02/08 07:38:55
         [scp.c]
         memory leak fix, and snprintf throughout
       - deraadt@cvs.openbsd.org 2001/02/08 08:02:02
         [sftp-int.c]
         plug a memory leak
       - stevesk@cvs.openbsd.org 2001/02/08 10:11:23
         [session.c sftp-client.c]
         %i -> %d
       - stevesk@cvs.openbsd.org 2001/02/08 10:57:59
         [sftp-int.c]
         typo
       - stevesk@cvs.openbsd.org 2001/02/08 15:28:07
         [sftp-int.c pathnames.h]
         _PATH_LS; ok markus@
       - djm@cvs.openbsd.org     2001/02/09 04:46:25
         [sftp-int.c]
         Check for NULL attribs for chown, chmod & chgrp operations, only send
         relevant attribs back to server; ok markus@
     - (djm) Update makefile.in for _PATH_SFTP_SERVER

commit 4192c467916f96668fad5b53d90d83dfbfdcacb5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 9 22:55:16 2001 +1100

     - (djm) Define _PATH_TTY for systems that don't. Report from Lutz
       Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit 288cc3970cd22cbbb6a3b9ba74cd25442c938ee5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 9 02:58:04 2001 +0000

       - djm@cvs.openbsd.org 2001/02/06 23:30:28
         [sftp-client.c]
         replace arc4random with counter for request ids; ok markus@

commit 1e7d30611bc8d7c2383fc59133996363f84a5911
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 9 02:36:43 2001 +0000

       - markus@cvs.openbsd.org 2001/02/06 22:07:42
         [ssh.c]
         fatal() if subsystem fails
       - markus@cvs.openbsd.org 2001/02/06 22:43:02
         [ssh.c]
         remove confusing callback code
       - jakob@cvs.openbsd.org 2001/02/06 23:03:24
         [ssh.c]
         add -1 option (force protocol version 1). ok markus@
       - jakob@cvs.openbsd.org 2001/02/06 23:06:21
         [ssh.c]
         reorder -{1,2,4,6} options. ok markus@

commit b0407fc670012c2f299978ad9e971697437fd006
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 9 02:23:10 2001 +0000

     - (bal) Missing 'const' in readpass.h

commit 31ca54aa86a90052f8fe73fda66c7f39fd5079bc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 9 02:11:24 2001 +0000

       - itojun@cvs.openbsd.org 2001/02/08 19:30:52
         sync with netbsd tree changes.
         - more strict prototypes, include necessary headers
         - use paths.h/pathnames.h decls
         - size_t typecase to int -> u_long

commit e9cf357a99dcd2db14635974289e04f5f0808123
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 9 12:55:35 2001 +1100

     - (djm) Add CVS Id's to files that we have missed

commit 5b828322227d9d07a8640c2df2946d5a1908505b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 9 01:34:36 2001 +0000

       - markus@cvs.openbsd.org 2001/02/06 22:43:02
         [clientloop.c]
         remove confusing callback code

commit f6b7b09a4e1b60594c34eea1a2ef8408460491bf
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 9 01:23:39 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/08 14:38:54
         [scp.c]
         memory leak fix, and snprintf throughout

commit af13ccacaca76646b3e937ed4a8bf48ae9fb2638
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Feb 9 12:01:51 2001 +1100

     - (djm) Update spec files

commit 4abe4def70f501b504b9bf47645b07e4976514eb
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Feb 8 19:16:32 2001 +0000

     - (stevesk) OpenBSD sync:
       - markus@cvs.openbsd.org  2001/02/08 11:20:01
         [auth2.c]
         strict checking
       - markus@cvs.openbsd.org  2001/02/08 11:15:22
         [version.h]
         update to 2.3.2
       - markus@cvs.openbsd.org  2001/02/08 11:12:30
         [auth2.c]
         fix typo

commit fc032bbf2f9fc60cb9014f4400c235c79a1e74f7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 8 18:40:09 2001 +0000

     - (bal) double entry in configure.in.  Pointed out by Lutz Jaenicke
       <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit 40f4151e9f69fb58b990c16ee9eefba59b3ae29d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 8 18:05:17 2001 +0000

     - (bal) .c.o rule in openbsd-compat/Makefile.in did not make it to the
       main tree while porting forward.  Pointed out by Lutz Jaenicke
       <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit efe35aad529ea752a6301addb39b46eaf5be7af2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 8 16:34:56 2001 +0000

     - (bal) patch to vis.c to deal with HAVE_VIS right by Robert Mooney
       <rjmooney@mediaone.net>

commit b8b8ecf87d432b857bbf41a51454791cafc6e3d7
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 8 10:47:43 2001 +1100

    Add replace test -S

commit 4864e8f9c023509845e772b43bbd98fdf81d6e72
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 8 10:07:08 2001 +1100

     - (djm) Fix linking of sftp, don't need arc4random any more.
     - (djm) Try to use shell that supports "test -S" for EGD socket search.
       Based on patch from Tim Rice <tim@multitalents.net>

commit 3d0a7d59cb18c33ab7e72acf0761c6c7aa469e66
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 8 08:22:47 2001 +1100

     - (djm) Don't delete external askpass program in make uninstall target.
       Report and fix from Roumen Petrov <roumen.petrov@skalasoft.com>

commit 4855ae9874af2633abb68b49d2462cca7ca4654e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 7 23:21:31 2001 +1100

    Cleanup, fix dates

commit 63dc3e90e5988d510c2bbddb46408f2e9220ec16
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 7 12:58:33 2001 +1100

     - (djm) Much KNF on PAM code
     - (djm) Revise auth-pam.c conversation function to be a little more readable.
     - (djm) Revise kbd-int PAM conversation function to fold all text messages
       to before first prompt. Fixes hangs if last pam_message did not require
       a reply.
     - (djm) Fix password changing when using PAM kbd-int authentication

commit 582d3983d22c714588ca54bdd6c4b92aae450919
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 6 22:54:30 2001 +0000

     - (bal) Save the whole path to AR in configure.  Some Solaris 2.7 installs
       seem lose track of it while in openbsd-compat/  (two confirmed reports)

commit 4d408d3ae76ca9259f2402e87aa02ed9e7d17508
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Feb 6 04:03:33 2001 +0000

    * Remove HP/UX ssh2 signal comment.
    * Added Todo item to verify groupaccess truly works under NeXTStep before
      enabling it since it is enclosed around POSIX wrappers.

commit 2b725a056a5b27739e22cec422667d8f90afd6ec
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Feb 5 18:16:28 2001 +0000

    RCSID

commit 28a7f26d03e4579ec62b9983f8f1d63a59ee63ab
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Feb 5 15:43:59 2001 +0000

    RCSID; whitespace

commit ec1c1409276d7fbcd43828db19496cab36079c01
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Feb 5 15:39:22 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/04 08:23:08
         [sftp-client.c sftp-server.c]
         make gcc on the alpha even happier

commit e27a5e05b3638737e8c50c24c8e955d38e31e02e
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Feb 5 15:15:27 2001 +0000

       - markus@cvs.openbsd.org  2001/01/31 13:48:09
         [sshconnect2.c]
         unused

commit 12057500cc6b2efedca40812cd5541a84e137270
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Feb 5 14:54:34 2001 +0000

       - markus@cvs.openbsd.org  2001/01/31 13:37:24
         [channels.c channels.h serverloop.c ssh.c]
         do not disconnect if local port forwarding fails, e.g. if port is already in
         use
       - markus@cvs.openbsd.org  2001/02/01 14:58:09
         [channels.c]
         use ipaddr in channel messages, ietf-secsh wants this
       - markus@cvs.openbsd.org  2001/01/31 12:26:20
         [channels.c]
         ssh.com-2.0.1x does not send additional info in CHANNEL_OPEN_FAILURE messages;
         bug report from edmundo@rano.org

commit adf74cdeca7e96e9cdcc63342c3290fbd0578ff3
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Feb 5 14:22:50 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/04 16:56:23
         [scp.c sshd.c]
         alpha happiness
       - stevesk@cvs.openbsd.org 2001/02/04 15:12:17
         [sshd.c]
         precedence; ok markus@
        - deraadt@cvs.openbsd.org 2001/02/04 08:14:15
         [ssh.c sshd.c]
         make the alpha happy

commit 0afcc9f942e697e7c11d03a47a993dc34d9239ee
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Feb 5 13:57:36 2001 +0000

       - stevesk@cvs.openbsd.org 2001/02/04 06:30:12
         [auth2.c authfd.c packet.c]
         remove duplicate #include's; ok markus@

commit 3c034ae01a7ed8997ff1c8c6c81ed7a099ee038d
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Feb 5 13:47:11 2001 +0000

       - markus@cvs.openbsd.org  2001/02/04 08:10:44
         [ssh.1]
         typo; dpo@club-internet.fr

commit 62c45db52688273493960b46fe07bae1acb3021d
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Feb 5 13:42:43 2001 +0000

       - deraadt@cvs.openbsd.org 2001/02/04 17:02:32
         [sftp-int.c]
         ? == help
       - deraadt@cvs.openbsd.org 2001/02/04 16:47:46
         [sftp-int.c]
         sort commands, so that abbreviations work as expected
       - stevesk@cvs.openbsd.org 2001/02/04 15:17:52
         [sftp-int.c]
         debugging sftp: precedence and missing break.  chmod, chown, chgrp
         seem to be working now.
       - markus@cvs.openbsd.org 2001/02/04 14:41:21
         [sftp-int.c]
         use base 8 for umask/chmod
       - markus@cvs.openbsd.org 2001/02/04 11:11:54
         [sftp-int.c]
         fix LCD

commit 8e74393416d9829c463c22db8243f189e5f8f474
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Feb 5 13:24:35 2001 +0000

       - stevesk@cvs.openbsd.org 2001/02/04 15:21:19
         [sftp-server.c]
         SSH2_FILEXFER_ATTR_UIDGID support; ok markus@

commit ef4eea9badfb65f05ac24f786b710cc3f27f0e43
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Feb 5 12:42:17 2001 +0000

       - stevesk@cvs.openbsd.org 2001/02/04 08:32:27
         [many files; did this manually to our top-level source dir]
         unexpand and remove end-of-line whitespace; ok markus@

commit d2ddda4efab29fd8663757634773fa10e557e0f3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Feb 4 21:57:11 2001 +0000

     - (bal) AIX patch for auth1.c by William L. Jones <jones@hpc.utexas.edu>

commit 03f07b45cdf700a39c879b1d3ace2a72611c4e33
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Feb 4 20:44:01 2001 +0000

    Oops.. =) mispelt NGROUPS_MAX.

commit 75713c9da77714484249dca8c6441e8266094bb0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Feb 4 20:27:44 2001 +0000

    20010105
     - (bal) Disable groupaccess by setting NGROUP_MAX to 0 for platforms
       that don't have NGROUP_MAX.

commit 849e288b8a466c3bd4c050034d9dba0fe442eaa3
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 5 01:01:55 2001 +1100

     - (djm) Use setvbuf() instead of setlinebuf(). Suggest from stevek@

commit 6d98656e589e8bd5f57cd9af2e82922b9fb4a481
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 5 00:54:23 2001 +1100

    doh - Makefile.in

commit f4d4654a422220bf32cc9339ca45dfbbf043d642
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 5 00:49:03 2001 +1100

    More makefile.in stuff for sftp

commit b6e773acc9f27118b215a892ba704123a6df7b72
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Feb 4 13:20:36 2001 +0000

     - (stevesk) add mysignal() wrapper and use it for the protocol 2
       SIGCHLD handler.

commit b797b92237276b87bb758648d61ef71579befc5b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 4 23:27:00 2001 +1100

     - (djm) Makefile.in fixes

commit 33804263583e82fb7e6e36477fe63ebd14f15ecb
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Feb 4 23:20:18 2001 +1100

    NB: big update - may break stuff. Please test!
    
     - (djm) OpenBSD CVS sync:
       - markus@cvs.openbsd.org  2001/02/03 03:08:38
         [auth-options.c auth-rh-rsa.c auth-rhosts.c auth.c canohost.c]
         [canohost.h servconf.c servconf.h session.c sshconnect1.c sshd.8]
         [sshd_config]
         make ReverseMappingCheck optional in sshd_config; ok djm@,dugsong@
       - markus@cvs.openbsd.org  2001/02/03 03:19:51
         [ssh.1 sshd.8 sshd_config]
         Skey is now called ChallengeResponse
       - markus@cvs.openbsd.org  2001/02/03 03:43:09
         [sshd.8]
         use no-pty option in .ssh/authorized_keys* if you need a 8-bit clean
         channel. note from Erik.Anggard@cygate.se (pr/1659)
       - stevesk@cvs.openbsd.org 2001/02/03 10:03:06
         [ssh.1]
         typos; ok markus@
       - djm@cvs.openbsd.org     2001/02/04 04:11:56
         [scp.1 sftp-server.c ssh.1 sshd.8 sftp-client.c sftp-client.h]
         [sftp-common.c sftp-common.h sftp-int.c sftp-int.h sftp.1 sftp.c]
         Basic interactive sftp client; ok theo@
     - (djm) Update RPM specs for new sftp binary
     - (djm) Update several bits for new optional reverse lookup stuff. I
       think I got them all.

commit 45cb2937bc8a74c1e1f7da3b35ad4319d3033baf
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Feb 4 09:41:33 2001 +0000

     - (bal) next-posix.h changed to bsd-nextstep.h

commit b0c2eeb96cabdec6bb6df9f3124f4aa89bbc1471
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 3 22:15:00 2001 +0000

     - (bal) Changed order of LIB="" in -with-skey due to library resolving.

commit 1c56a01c87d6051bc0da2d0567304d757e092f0d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 3 21:58:12 2001 +0000

     - (bal) openbsd-compat/Makefile minor fix.  Ensure dependancies are done
       right.

commit 684ba4cdd8f98b84df36f8de67427a4a59ef4114
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 3 21:53:47 2001 +0000

     - (bal) Minor Makefile fix

commit 7044253f3ff41aead8c2192f35d5710244549e89
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 3 21:31:22 2001 +0000

     - (bal) I think this is the last of the bsd-*.h that don't belong.

commit e6b3b7ba6621fe51eb53bc23378c61400099b4ed
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Feb 3 00:33:04 2001 +0000

     - (bal) Minor Makefile.in tweak.  dirname may not exist on some
       platforms so builds fail.  (NeXT being a well known one)

commit 6413635b01d7479db7990e4f7e3d8dc28bd10c44
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 2 19:03:13 2001 +0000

     - (bal) renamed queue.h to fake-queue.h (even if it's an OpenBSD
       based file) to ensure #include space does not get confused.

commit dd5c5a3ffe39267bc885a6ee23d5621df787427c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 2 18:58:33 2001 +0000

     - (bal) Cygwin clean up by Corinna Vinschen <vinschen@redhat.com>

commit 25a7785a3099b60289ee01f593aad2b988f0dfae
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 2 10:17:46 2001 +0000

     - (bal) Makefile fix to use $(MAKE) instead of 'make'  for platforms
       that use 'gmake'.   Patch by Tim Rice <tim@multitalents.net>

commit 2ffbbe6fc9788eeccb077c0d025c6b92fbbc527c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Feb 2 00:00:54 2001 +0000

     - (bal) Makefile fix where sourcedir != builddir by Corinna Vinschen
       <vinschen@redhat.com>

commit e03c85d9430b31a1bed14e5e3d78bb493c747bca
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 1 14:06:11 2001 +0000

     - (bal) Minor fix to Makefile to stop rebuilding executables if no
       changes have occured to any of the supporting code.  Patch by
       Roumen Petrov <roumen.petrov@skalasoft.com>

commit 00fef50cbcee7e70500e3790ca69c2942fd2d1dd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Feb 1 00:44:48 2001 +0000

    Updated to do and removed entry for the reordering non-openbsd code.

commit ee8c938193de8ab15dbcb89a90bbcfd47e99ac7d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jan 31 22:19:26 2001 +0000

     - (bal) Reorder.  Move all bsd-*, fake-*, next-*, and cygwin* stuff to
       openbsd-compat/.  And resolve all ./configure and Makefile.in issues
       assocated.
    
    .. Oops.. Missed one ..

commit 3c06f6a0b234822c7b2d6c63ef1aaf554af7167b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jan 31 21:52:01 2001 +0000

     - (bal) Reorder.  Move all bsd-*, fake-*, next-*, and cygwin* stuff to
       openbsd-compat/.  And resolve all ./configure and Makefile.in issues
       assocated.
    
    Logic:
    
    * All OpenBSD functions should have the same filename as in the OpenBSD
      tree
    
    * All 'home brew' functions have bsd-* infront of them.
    
    * All 'not really implemented' functions have fake-* infront of them.

commit bf75776d415126a415ac92fb767c70dc67feba4f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 31 10:50:49 2001 +1100

     - (djm) Don't log SSH2 PAM KbdInt responses to debug, they may contain
       passwords.

commit 709528ab6a271ce39155fc494d40689f578f9d38
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 31 09:57:55 2001 +1100

     - (djm) Fix autoconf logic for --with-lastlog=no Report and diagnosis from
       Philipp Buehler <lists@fips.de> and Kevin Steves <stevesk@sweden.hp.com>
       respectively.

commit 3c4659cb6ffb68ef0e81813eb737a3a3544e726c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 31 09:52:43 2001 +1100

     - (djm) OpenBSD CVS Sync:
       - djm@cvs.openbsd.org     2001/01/30 15:48:53
         [sshconnect.c]
         Make warning message a little more consistent. ok markus@

commit b6b4a7a29a06ea869dc163799caa3493f7fc934d
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Jan 30 18:31:43 2001 +0000

     - (stevesk) configure.in: remove duplicate PROG_LS

commit e142d41ce6557880b871d1797aa88d54e88b8f44
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 30 20:03:08 2001 +1100

    speeling

commit 832562e9ba9052d41c257af2419621350ca2af01
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 30 09:30:01 2001 +1100

       - djm@cvs.openbsd.org     2001/01/29 05:36:11
         [ssh.1 ssh.c]
         Allow invocation of sybsystem by commandline (-s); ok markus@

commit 7650bc68420a227212ba0ff5cd4a0d133471b872
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 30 09:27:26 2001 +1100

     - (djm) OpenBSD CVS Sync:
       - markus@cvs.openbsd.org  2001/01/29 12:47:32
         [rsa.c rsa.h ssh-agent.c sshconnect1.c sshd.c]
         handle rsa_private_decrypt failures; helps against the Bleichenbacher
         pkcs#1 attack

commit d83ff35d66e11978e0b821ecbfa07011ddcb8868
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 30 09:19:34 2001 +1100

     - (djm) OpenBSD CVS Sync:
       - markus@cvs.openbsd.org  2001/01/29 12:42:35
         [canohost.c canohost.h channels.c clientloop.c]
         add get_peer_ipaddr(socket), x11-fwd in ssh2 requires ipaddr, not DNS

commit 5e953217f13b340d8a5fbcd771a1dbaf43354f20
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 30 09:14:00 2001 +1100

     - (djm) OpenBSD CVS Sync:
       - markus@cvs.openbsd.org  2001/01/29 09:55:37
         [channels.c channels.h clientloop.c serverloop.c]
         fix select overflow; ok deraadt@ and stevesk@

commit b71eb58ff44f0f2d9c918dc2d17e765269d21c8c
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Jan 29 16:57:27 2001 +0000

     - (stevesk) sftp-server.c: use %lld vs. %qd

commit 6d40c0f8067713f0a152c132a03964133b40309f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 29 09:02:24 2001 +0000

      - (bal) Minor auth2.c resync.  Whitespace and moving of an #include.

commit a73335004e679a97e4b518aac61032da1ada57e8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 29 08:44:03 2001 +0000

       - stevesk@cvs.openbsd.org 2001/01/28 20:43:25
         [sshd.8]
         spelling.  ok markus@

commit c12a6b7066ed6ae7be439b20e7d55c1a3c7459bc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 29 08:41:05 2001 +0000

       - markus@cvs.openbsd.org 2001/01/28 10:37:26
         [sshd.c sshd.8]
         remove -Q, no longer needed

commit 8eec2c8f06e164ecdadca7b4c5a4eed5d34a3fdc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 29 08:39:16 2001 +0000

       - markus@cvs.openbsd.org 2001/01/28 10:24:04
         [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8]
         cleanup AUTHORS sections

commit eb930d4432ecdbb8187d9e9b7cd894c3e0e9d0ef
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 29 08:37:08 2001 +0000

       - stevesk@cvs.openbsd.org 2001/01/28 20:36:16
         [readconf.c ssh.1]
         ``StrictHostKeyChecking ask'' documentation and small cleanup.
         ok markus@

commit 035782e71284c2d424f605b20d720c00797b3733
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 29 08:34:16 2001 +0000

       - markus@cvs.openbsd.org 2001/01/28 10:24:04
         [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1]
         cleanup AUTHORS sections

commit 91fd62af63cc3b7660930240042e71cff85abcb2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 29 08:10:11 2001 +0000

       - stevesk@cvs.openbsd.org 2001/01/28 20:53:21
         [xmalloc.c]
         use size_t for strlen() return.  ok markus@

commit d53902049e467f68490aae4988e466fc9a99abee
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 29 08:07:43 2001 +0000

       - markus@cvs.openbsd.org 2001/01/28 10:37:26
         [sshd.c]
         remove -Q, no longer needed

commit 5ed8acd3e327562e7f2fc87c82cb85111d72cbce
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 29 08:00:54 2001 +0000

       - stevesk@cvs.openbsd.or 2001/01/28 20:36:16
         [readconf.c]
         ``StrictHostKeyChecking ask'' documentation and small cleanup.
         ok markus@

commit ef1cf5d8ea9423d5b120638c2d2ca7609426d5e2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 29 07:55:07 2001 +0000

       - markus@cvs.openbsd.org 2001/01/28 10:15:34
         [dispatch.c]
         re-keying is not supported; ok deraadt@

commit 1170d71b5d93f7674f490d6109e8913e6ac237f0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 29 07:51:26 2001 +0000

       - stevesk@cvs.openbsd.org 2001/01/28 22:27:05
         [authfile.c]
         spelling.  use sizeof vs. strlen().  ok markus@

commit 36579d3daa83a41059adaea84a9e75693185b51c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 29 07:39:26 2001 +0000

       - niklas@cvs.openbsd.org 2001/01/2001
         [atomicio.h canohost.h clientloop.h deattack.h dh.h dispatch.h
          groupaccess.c groupaccess.h hmac.h hostfile.h includes.h kex.h
          key.h log.h login.h match.h misc.h myproposal.h nchan.ms pathnames.h
          radix.h readpass.h rijndael.h serverloop.h session.h sftp.h ssh-add.1
          ssh-dss.h ssh-keygen.1 ssh-keyscan.1 ssh-rsa.h ssh1.h ssh_config
          sshconnect.h sshd_config tildexpand.h uidswap.h uuencode.h]
         $OpenBSD$

commit 49af82bd7e93f9b213a12bbd3a69262335875560
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jan 27 20:43:57 2001 +0000

     - (bal) Put USE_PIPES back into sco3.2v5

commit 77808aba58d6527f4f26f8924ce836a9619e55ac
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jan 26 05:10:34 2001 +0000

       - deraadt@cvs.openbsd.org 2001/01/25 8:06:33
         [ssh-agent.c]
         call _exit() in signal handler

commit 27eebe6c1b9f608000188614d9a209f1281be2a2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jan 25 23:04:22 2001 +0000

     - (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen
       Petrov <roumen.petrov@skalasoft.com>

commit 87b147f539f10df7fa370b36daee54eb0896fb41
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jan 25 00:41:12 2001 +0000

     - (bal) OpenBSD Resync
       - stevesk@cvs.openbsd.org 2001/01/24 21:03:50
         [channels.c]
         missing freeaddrinfo(); ok markus@

commit ec3830ae6e1df691933ec65d4524e409bf160298
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jan 25 00:07:33 2001 +0000

     - (bal) AC_FUNC_STRFTIME added to autoconf

commit 0736c4df83628dcac567d94a73726771706f978e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 25 10:51:46 2001 +1100

     - (djm) Mention PRNGd in documentation, it is nicer than EGD
     - (djm) Automatically search for "well-known" EGD/PRNGd sockets in autoconf

commit 2a5c1cede026faec14b0903a0cdcc4e7ef554e32
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 25 10:32:00 2001 +1100

     - (djm) Sync bsd-* support files:
       - deraadt@cvs.openbsd.org 2000/01/26 03:43:20
         [rresvport.c bindresvport.c]
         new bindresvport() semantics that itojun, shin, jean-luc and i have
         agreed on, which will be happy for the future. bindresvport_sa() for
         sockaddr *, too.  docs later..
       - deraadt@cvs.openbsd.org 2000/01/24 02:24:21
         [bindresvport.c]
         in bindresvport(), if sin is non-NULL, example sin->sin_family for
         the actual family being processed

commit 12aaa04e96be85a684d3f90db46bb62689796a93
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jan 24 21:23:39 2001 +0000

    whitespace sync, cleanup

commit f7ffab3ca8e8fff8a6567ca0aa8560401825ada5
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jan 24 20:11:06 2001 +0000

     - (stevesk) sftp-server.c: KNF

commit b6b37ba475ef89dadefd00f952a4311101dc2036
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jan 24 20:01:44 2001 +0000

     - (stevesk) sftp-server.c: fix chmod() mode mask

commit 2926586a426bd9f2d227a496b70efd910a85b9de
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jan 24 14:06:28 2001 +0000

    whitespace sync

commit 0c69615e351f366d031d56f0079074b7afb7b566
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jan 24 13:47:43 2001 +0000

    whitespace sync

commit 54286c58dae86d07e449f8ec1416f77fceaf7d36
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Jan 24 13:10:56 2001 +0000

    whitespace sync

commit 2396b30d9598bad07fe282e9626779967c4e14b8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jan 23 16:54:29 2001 +0000

     - (bal) #ifdef around S_IFSOCK if platform does not support it.
       patch by Tim Rice <tim@multitalents.net>
     - (bal) fake-regex.h cleanup based on Tim Rice's patch.

commit 16a86be01aa1f097c5ceaea9ea96253e55d9a016
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jan 23 16:26:52 2001 +0000

     - (bal) no 64bit support patch from  Tim Rice <tim@multitalents.net>

commit bda5bdcf8d1238b75e29094155da16e058b6e33b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jan 23 16:09:51 2001 +0000

    20010124
     - (bal) OpenBSD Resync
       - markus@cvs.openbsd.org 2001/01/23 10:45:10
         [ssh.h]
         nuke comment

commit 95fb2dde7777c6afbffd80eba79a88811db55290
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jan 23 03:12:10 2001 +0000

       - markus@cvs.openbsd.org 2001/01/22 23:06:39
         [auth1.c auth2.c readconf.c readconf.h servconf.c servconf.h
          sshconnect1.c sshconnect2.c sshd.c]
         rename skey -> challenge response.
         auto-enable kbd-interactive for ssh2 if challenge-reponse is enabled.

commit b1985f727950dbb3d5c7de863ae0e2181ace53f8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jan 23 00:19:15 2001 +0000

     - (bal) OpenBSD Resync
       - markus@cvs.openbsd.org 2001/01/22 8:15:00
         [auth-krb4.c sshconnect1.c]
         only AFS needs radix.[ch]
       - markus@cvs.openbsd.org 2001/01/22 8:32:53
         [auth2.c]
         no need to include; from mouring@etoh.eviladmin.org
       - stevesk@cvs.openbsd.org 2001/01/22 16:55:21
         [key.c]
         free() -> xfree(); ok markus@
       - stevesk@cvs.openbsd.org 2001/01/22 17:22:28
         [sshconnect2.c sshd.c]
         fix memory leaks in SSH2 key exchange; ok markus@

commit 9dffa01368369d4ce4af3787aa3e254bb015e2fc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 22 21:22:14 2001 +0000

    A bit of this patch was in the last commit
     - (bal) SSH_ASKPASS_DEFAULT to _PATH_SSH_ASKPASS_DEFAULT

commit cb577331b4c30cf33c4811a3f6065d4c076deaa7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 22 21:06:19 2001 +0000

    20010123
     - (bal) regexp.h typo in configure.in.  Should have been regex.h
     - (bal) SSH_USER_DIR to _PATH_SSH_USER_DIR patch by stevesk@

commit 226cfa03781466907dd252916aeade6879e376b8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 22 05:34:40 2001 +0000

    Hopefully things did not get mixed around too much.  It compiles under
    Linux and works.  So that is at least a good sign. =)
    20010122
     - (bal) OpenBSD Resync
       - markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus
         [servconf.c ssh.h sshd.c]
         only auth-chall.c needs #ifdef SKEY
       - markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus
         [auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
          auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c
          packet.c pathname.h readconf.c scp.c servconf.c serverloop.c
          session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h
          ssh1.h sshconnect1.c sshd.c ttymodes.c]
         move ssh1 definitions to ssh1.h, pathnames to pathnames.h
       - markus@cvs.openbsd.org 2001/01/19 16:48:14
         [sshd.8]
         fix typo; from stevesk@
       - markus@cvs.openbsd.org 2001/01/19 16:50:58
         [ssh-dss.c]
         clear and free digest, make consistent with other code (use dlen); from
         stevesk@
       - markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus
         [auth-options.c auth-options.h auth-rsa.c auth2.c]
         pass the filename to auth_parse_options()
       - markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001
         [readconf.c]
         fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com
       - stevesk@cvs.openbsd.org 2001/01/20 18:20:29
         [sshconnect2.c]
         dh_new_group() does not return NULL.  ok markus@
       - markus@cvs.openbsd.org 2001/01/20 21:33:42
         [ssh-add.c]
         do not loop forever if askpass does not exist; from
         andrew@pimlott.ne.mediaone.net
       - djm@cvs.openbsd.org 2001/01/20 23:00:56
         [servconf.c]
         Check for NULL return from strdelim; ok markus
       - djm@cvs.openbsd.org 2001/01/20 23:02:07
         [readconf.c]
         KNF; ok markus
       - jakob@cvs.openbsd.org 2001/01/21 9:00:33
         [ssh-keygen.1]
         remove -R flag; ok markus@
       - markus@cvs.openbsd.org 2001/01/21 19:05:40
         [atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c
          auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
          auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c
          bufaux.c  bufaux.h buffer.c canahost.c canahost.h channels.c
          cipher.c cli.c clientloop.c clientloop.h compat.c compress.c
          deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c
          key.c key.h log-client.c log-server.c log.c log.h login.c login.h
          match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c
          readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h
          session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c
          ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h
          sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h
          ttysmodes.c uidswap.c xmalloc.c]
         split ssh.h and try to cleanup the #include mess. remove unnecessary
         #includes.  rename util.[ch] -> misc.[ch]
     - (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree
     - (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve
       conflict when compiling for non-kerb install
     - (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes
       on 1/19.

commit 401d58f3612fa030f309d01df9815a2fc1d3c6de
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jan 19 17:11:43 2001 +0000

     - (bal) Slight auth2-pam.c clean up.
     - (bal) Includes a fake-regexp.h to be only used if regcomp() is found,
       but no 'regexp.h' found (SCO OpenServer 3 lacks the header).

commit cf0809d6444bcc0030c9cb82ebc592a261023fe4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jan 19 15:44:10 2001 +0000

    Removed one more 'ISSUE' comment in auth1.c
    20010120
     - (bal) OpenBSD Resync
       - markus@cvs.openbsd.org 2001/01/19 12:45:26
         [ssh-chall.c servconf.c servconf.h ssh.h sshd.c]
         only auth-chall.c needs #ifdef SKEY

commit 5dc81502cbac042e3e66e9f31bd932623ca43e31
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jan 19 06:10:29 2001 +0000

     - (bal) Minor cygwin patch to auth1.c.  Suggested by djm.

commit b100ec95429daa986cb31834e462083adc22e8b6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jan 19 05:37:32 2001 +0000

     - (bal) Updated contrib/cygwin/ by Corinna Vinschen <vinschen@redhat.com>
    Also removed some of the 'ISSUES' comments that have been verified by djm.

commit 22e22bf9bab94862c860ad4ed652f308dda63f81
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 19 15:46:38 2001 +1100

     - (djm) Merge patch from Tim Waugh (via Nalin Dahyabhai <nalin@redhat.com>)
       to fix NULL pointer deref and fake authloop breakage in PAM code.

commit f569241db2e79b0bd7d1be6e288f2bd25e9c7ab4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jan 19 04:29:23 2001 +0000

    Oops.. missed theses in the merge.

commit db65e8fdedadaf79df2d8393a4d43e9094c80649
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jan 19 04:26:52 2001 +0000

    Please grep through the source and look for 'ISSUE' comments and verify
    that I was able to get all the portable bits in the right location.  As for
    the SKEY comment there is an email out to Markus as to how it should be
    resolved.  Until then I just #ifdef SKEY/#endif out the whole block.
    
     - (bal) OpenBSD Resync
       - markus@cvs.openbsd.org 2001/01/18 16:20:21
         [log-client.c log-server.c log.c readconf.c servconf.c ssh.1 ssh.h
          sshd.8 sshd.c]
         log() is at pri=LOG_INFO, since LOG_NOTICE goes to /dev/console on many
         systems
       - markus@cvs.openbsd.org 2001/01/18 16:59:59
         [auth-passwd.c auth.c auth.h auth1.c auth2.c serverloop.c session.c
          session.h sshconnect1.c]
         1) removes fake skey from sshd, since this will be much
            harder with /usr/libexec/auth/login_XXX
         2) share/unify code used in ssh-1 and ssh-2 authentication (server side)
         3) make addition of BSD_AUTH and other challenge reponse methods
            easier.
       - markus@cvs.openbsd.org 2001/01/18 17:12:43
         [auth-chall.c auth2-chall.c]
         rename *-skey.c *-chall.c since the files are not skey specific

commit 5aa80596f76ce36dee4623a00a55548834c3328d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 19 14:03:40 2001 +1100

     - (djm) Update versions in RPM specfiles

commit bf555ba6210532f8598ff0f96961e82bcda3f09b
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jan 18 02:04:35 2001 +0000

    NOTE: This update changes the RSA key generation.  *NEW RSA KEYS
          NEED TO BE GENERATED*  =)  Refer to to entry "2001/01/16 19:20:06"
          for more details.
    
    20010118
     - (bal) Super Sized OpenBSD Resync
       - markus@cvs.openbsd.org 2001/01/11 22:14:20 GMT 2001 by markus
         [sshd.c]
         maxfd+1
       - markus@cvs.openbsd.org 2001/01/13 17:59:18
         [ssh-keygen.1]
         small ssh-keygen manpage cleanup; stevesk@pobox.com
       - markus@cvs.openbsd.org 2001/01/13 18:03:07
         [scp.c ssh-keygen.c sshd.c]
         getopt() returns -1 not EOF; stevesk@pobox.com
       - markus@cvs.openbsd.org 2001/01/13 18:06:54
         [ssh-keyscan.c]
         use SSH_DEFAULT_PORT; from stevesk@pobox.com
       - markus@cvs.openbsd.org 2001/01/13 18:12:47
         [ssh-keyscan.c]
         free() -> xfree(); fix memory leak; from stevesk@pobox.com
       - markus@cvs.openbsd.org 2001/01/13 18:14:13
         [ssh-add.c]
         typo, from stevesk@sweden.hp.com
       - markus@cvs.openbsd.org 2001/01/13 18:32:50
         [packet.c session.c ssh.c sshconnect.c sshd.c]
         split out keepalive from packet_interactive (from dale@accentre.com)
         set IPTOS_LOWDELAY TCP_NODELAY IPTOS_THROUGHPUT for ssh2, too.
       - markus@cvs.openbsd.org 2001/01/13 18:36:45
         [packet.c packet.h]
         reorder, typo
       - markus@cvs.openbsd.org 2001/01/13 18:38:00
         [auth-options.c]
         fix comment
       - markus@cvs.openbsd.org 2001/01/13 18:43:31
         [session.c]
         Wall
       - markus@cvs.openbsd.org 2001/01/13 19:14:08
         [clientloop.h clientloop.c ssh.c]
         move callback to headerfile
       - markus@cvs.openbsd.org 2001/01/15 21:40:10
         [ssh.c]
         use log() instead of stderr
       - markus@cvs.openbsd.org 2001/01/15 21:43:51
         [dh.c]
         use error() not stderr!
       - markus@cvs.openbsd.org 2001/01/15 21:45:29
         [sftp-server.c]
         rename must fail if newpath exists, debug off by default
       - markus@cvs.openbsd.org 2001/01/15 21:46:38
         [sftp-server.c]
         readable long listing for sftp-server, ok deraadt@
       - markus@cvs.openbsd.org 2001/01/16 19:20:06
         [key.c ssh-rsa.c]
         make "ssh-rsa" key format for ssh2 confirm to the ietf-drafts; from
         galb@vandyke.com.  note that you have to delete older ssh2-rsa keys,
         since they are in the wrong format, too. they must be removed from
         .ssh/authorized_keys2 and .ssh/known_hosts2, etc.
         (cd; grep -v ssh-rsa .ssh/authorized_keys2 > TMP && mv TMP
         .ssh/authorized_keys2) additionally, we now check that
         BN_num_bits(rsa->n) >= 768.
       - markus@cvs.openbsd.org 2001/01/16 20:54:27
         [sftp-server.c]
         remove some statics. simpler handles; idea from nisse@lysator.liu.se
       - deraadt@cvs.openbsd.org 2001/01/16 23:58:08
         [bufaux.c radix.c sshconnect.h sshconnect1.c]
         indent
     - (bal) Added bsd-strmode.[ch] since some non-OpenBSD platforms may
       be missing such feature.

commit 01fa6380e815a37ac5ffcf03b04c93d7b52ce765
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 17 11:23:39 2001 +1100

     - (djm) Add --with-pam to RPM spec files

commit 92e78f8c6424f0d466e1df673228870ef009105b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 17 11:10:48 2001 +1100

     - (djm) Avoid warning in PAM code by making read_passphrase arguments const

commit a64b57a157068c793ac7be2ad276b208a7d10a90
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 17 10:44:13 2001 +1100

     - (djm) Make PAM support optional, enable with --with-pam
     - (djm) Try to use libcrypt on Linux, but link it after OpenSSL (which
       provides a crypt() of its own)
     - (djm) Avoid a warning in bsd-bindresvport.c
     - (djm) Try to avoid adding -I/usr/include to CPPFLAGS during SSL tests. This
       can cause weird segfaults errors on Solaris

commit 21de45085360271197f24b872320fa231c96810b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 17 09:37:15 2001 +1100

    - (djm) Only write random seed file at exit

commit 42202bc8cffb0932ac7e6c1eb483cd20176c01c9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 15 02:34:37 2001 +0000

     - (bal) utimes() support via utime() interface on machine that lack utimes().

commit 200e3c9c9adfeafe431c7af1aeb7a3dd9d4ac130
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 15 01:56:46 2001 +0000

    20010115
     - (bal) sftp-server.c change to use chmod() if fchmod() does not exist.

commit 7b61cfa1ec06d6ad8026818d1f3c81443cc53b67
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jan 14 19:11:00 2001 +0000

     - (stevesk) complete:
       - markus@cvs.openbsd.org  2001/01/13 11:56:48
         [auth.c sshd.8]
         support supplementary group in {Allow,Deny}Groups
         from stevesk@pobox.com

commit 886b06ce67f9fda0121ec4a3875970bc2316e780
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jan 14 00:35:19 2001 +0000

     - (stevesk) initial work for OpenBSD "support supplementary group in
       {Allow,Deny}Groups" patch:
       - import getgrouplist.c from OpenBSD (bsd-getgrouplist.c)
       - add bsd-getgrouplist.h
       - new files groupaccess.[ch]
       - build but don't use yet (need to merge auth.c changes)

commit 2f959b4cd1d1afcd241d7ffa06a34646c0c89969
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jan 11 06:20:23 2001 +0000

    20010112
     - (bal) OpenBSD Sync
       - markus@cvs.openbsd.org 2001/01/10 22:56:22
         [bufaux.h bufaux.c sftp-server.c sftp.h getput.h]
         cleanup sftp-server implementation:
                 add buffer_get_int64, buffer_put_int64, GET_64BIT, PUT_64BIT
                 parse SSH2_FILEXFER_ATTR_EXTENDED
                 send SSH2_FX_EOF if readdir returns no more entries
                 reply to SSH2_FXP_EXTENDED message
                 use #defines from the draft
                 move #definations to sftp.h
         more info:
         http://www.ietf.org/internet-drafts/draft-ietf-secsh-filexfer-00.txt
       - markus@cvs.openbsd.org 2001/01/10 19:43:20
         [sshd.c]
         XXX - generate_empheral_server_key() is not safe against races,
         because it calls log()
       - markus@cvs.openbsd.org 2001/01/09 21:19:50
         [packet.c]
         allow TCP_NDELAY for ipv6; from netbsd via itojun@

commit fd9885e3264ea16c75b61812d17ed64ca8dfd308
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 10 08:16:53 2001 +1100

    20010110
     - (djm) SNI/Reliant Unix needs USE_PIPES and $DISPLAY hack. Report from
       Bladt Norbert <Norbert.Bladt@adi.ch>

commit 69f8fb35757aa7e848792bb4c11ef1b606ee5389
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Jan 9 18:09:13 2001 +0000

     - (stevesk) defines.h: remove spurious ``;''

commit 8ee4f695606fa1cb92228120c93c61f8f6863b73
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Jan 9 15:28:46 2001 +0000

     - (stevesk) sshd_config: sync

commit 50c9c207cfaff897242cb3df7f43785314f81a6a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jan 9 00:54:58 2001 +0000

    Real remove of the news4-posix.h .. Too bad I can't do the same
    to next-posix.h yet.

commit 0d5af6017e4549c8b622b505c6a7dd80b24df512
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jan 9 00:50:29 2001 +0000

      - (bal) Detect if clock_t structure exists, if not define it.
      - (bal) Detect if O_NONBLOCK exists, if not define it.
      - (bal) removed news4-posix.h (now empty)
      - (bal) changed bsd-bindresvport.c and bsd-rresvport.c to use 'socklen_t'
        instead of 'int'

commit 48bd7c118a25b950842864c7eb87ef666cbc342d
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jan 9 00:35:42 2001 +0000

     - (bal) OpenBSD Sync
       - markus@cvs.openbsd.org 2001/01/08 22:29:05
         [auth2.c compat.c compat.h servconf.c servconf.h sshd.8
          sshd_config version.h]
         implement option 'Banner /etc/issue.net' for ssh2, move version to
         2.3.1 (needed for bugcompat detection, 2.3.0 would fail if Banner
         is enabled).
       - markus@cvs.openbsd.org 2001/01/08 22:03:23
         [channels.c ssh-keyscan.c]
         O_NDELAY -> O_NONBLOCK; thanks stevesk@pobox.com
       - markus@cvs.openbsd.org 2001/01/08 21:55:41
         [sshconnect1.c]
         more cleanups and fixes from stevesk@pobox.com:
         1) try_agent_authentication() for loop will overwrite key just
            allocated with key_new(); don't alloc
         2) call ssh_close_authentication_connection() before exit
            try_agent_authentication()
         3) free mem on bad passphrase in try_rsa_authentication()
       - markus@cvs.openbsd.org 2001/01/08 21:48:17
         [kex.c]
         missing free; thanks stevesk@pobox.com

commit 99a0563fd59e1d3e1b79a1a9dd38ce9f6b5059ee
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Jan 8 20:54:36 2001 +0000

     - (stevesk) auth1.c: free should be after WITH_AIXAUTHENTICATE
       code.

commit 4b27a5377ef95630e9d409ad8c5a01dc23929a00
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 8 13:55:14 2001 +0000

    20010109
     - (bal) Resync CVS ID of cli.c

commit 48b2f730053721081d2d6a4d1cef2a96462a5886
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 8 06:20:38 2001 +0000

    Updated TODO to reflect that sftp-server should be fixed to support
    32bits int if 64bits don't exist.

commit a383baac4604a7de1710e87fba0403e4a56d5472
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Jan 8 06:13:41 2001 +0000

    20010108
     - (bal) Fixed another typo in cli.c
     - (bal) OpenBSD Sync
       - markus@cvs.openbsd.org 2001/01/07 21:26:55
         [cli.c]
         typo
       - markus@cvs.openbsd.org 2001/01/07 21:26:55
         [cli.c]
         missing free, stevesk@pobox.com
       - markus@cvs.openbsd.org 2001/01/07 19:06:25
         [auth1.c]
         missing free, stevesk@pobox.com
       - markus@cvs.openbsd.org 2001/01/07 11:28:04
         [log-client.c log-server.c log.c readconf.c servconf.c ssh.1
          ssh.h sshd.8 sshd.c]
         rename SYSLOG_LEVEL_INFO->SYSLOG_LEVEL_NOTICE
         syslog priority changes:
                 fatal() LOG_ERR  -> LOG_CRIT
                 log()   LOG_INFO -> LOG_NOTICE

commit 9ce907c3d60637943dfa46a4542164498be19ea8
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jan 7 11:53:40 2001 +0000

    complete sshd -g manpage default merge

commit fcd5d60a951f8129c3bf690310520169d17a2f3f
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Jan 7 11:45:22 2001 +0000

    complete _PATH_BSHELL merge

commit d26dcf3371657e64dddc7c86c61a89666d4e7053
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Jan 6 15:18:16 2001 +0000

    20010107
     - (bal) OpenBSD Sync
       - markus@cvs.openbsd.org 2001/01/06 11:23:27
         [ssh-rsa.c]
         remove unused
       - itojun@cvs.openbsd.org 2001/01/05 08:23:29
         [ssh-keyscan.1]
         missing .El
       - markus@cvs.openbsd.org 2001/01/04 22:41:03
         [session.c sshconnect.c]
         consistent use of _PATH_BSHELL; from stevesk@pobox.com
       - djm@cvs.openbsd.org 2001/01/04 22:35:32
         [ssh.1 sshd.8]
         Mention AES as available SSH2 Cipher; ok markus
       - markus@cvs.openbsd.org 2001/01/04 22:25:58
         [sshd.c]
         sync usage()/man with defaults; from stevesk@pobox.com
       - markus@cvs.openbsd.org 2001/01/04 22:21:26
         [sshconnect2.c]
         handle SSH2_MSG_USERAUTH_BANNER; fixes bug when connecting to a server
         that prints a banner (e.g. /etc/issue.net)

commit 8835a8910513621a4c20a0ede9a4bdeee947cbd4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Jan 5 06:09:52 2001 +0000

     - (bal) bsd-getcwd.c and bsd-setenv.c changed from bcopy() to memmove()

commit 91c2a985f9d00247ba2fda6aebbffaeac609f328
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Jan 4 22:54:50 2001 +0000

    20010105
     - (bal) contrib/caldera/ provided by Tim Rice <tim@multitalents.net>

commit f1aa21f18f381b3dbc9c619699baa62298364072
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 5 09:30:32 2001 +1100

    Jim Knoble has changed his email address

commit d54e55cf5c98bcc2d6397f7bfe4362c562d4515c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 4 09:07:12 2001 +1100

     - (djm) Fix memory leak on systems with BROKEN_GETADDRINFO. Based on
       work by Chris Vaughan <vaughan99@yahoo.com>

commit 3ad650a88d44bd189b1489256e872d561739e13a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jan 3 06:02:51 2001 +0000

     - (bal) UnixWare 2.0 fixes by Tim Rice <tim@multitalents.net>
     - (bal) Disable sftp-server if no 64bit int support exists.  Based on
       patch by Tim Rice <tim@multitalents.net>
     - (bal) Makefile.in changes to uninstall: target to remove sftp-server
       and sftp-server.8 manpage.

commit 70c4dce2fe0759cd0eb0b15f9a48f4607f651287
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jan 3 05:30:55 2001 +0000

     - (bal) authfile.c: Synced CVS ID tag

commit 5c1fbabc5d2cd082add2c5cdbbf3749c81d61892
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Jan 3 03:51:15 2001 +0000

    20010103
     - (bal) fixed up sshconnect.c so it was closer inline with the OpenBSD
       tree (mainly positioning)
     - (bal) OpenSSH CVS Update
       - markus@cvs.openbsd.org 2001/01/02 20:41:02
         [packet.c]
         log remote ip on disconnect; PR 1600 from jcs@rt.fm
       - markus@cvs.openbsd.org 2001/01/02 20:50:56
         [sshconnect.c]
         strict_host_key_checking for host_status != HOST_CHANGED &&
         ip_status == HOST_CHANGED

commit 88c33974b2a8ace947fa012348cb1e12e04cf615
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Jan 2 04:55:52 2001 +0000

    20010102
     - (bal) OpenBSD CVS Update
       - markus@cvs.openbsd.org 2001/01/01 14:52:49
         [scp.c]
         use shared fatal(); from stevesk@pobox.com

commit 321ae73a1fa8b10baee39fa6fdb57d9afc80346c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Dec 31 15:00:23 2000 +0000

     - (bal) Reverted out of a partial NeXT patch.

commit fa2d2236f6e4bbd9cd413d20642d9fc82924f8ea
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Dec 31 07:11:04 2000 +0000

    20001231
     - (bal) Reverted out of MAXHOSTNAMELEN.  This should be set per OS.
       for multiple reasons.

commit 59f68794f4639bdd2e2dc1c01a5d46877ef7d368
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Dec 30 03:50:04 2000 +0000

    <Whistle> Umm.. Made a minor mistake put -o instead of -c in .c.o section.
    Wonder why I did not catch it during the test compile on TWO different
    platforms!

commit 6c3ae2ba053d7d9e615af5df72162ce912051c2a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Dec 30 03:25:14 2000 +0000

     - (bal) OpenBSD CVS Update
       - markus@cvs.openbsd.org 2000/12/29 22:19:13
         [channels.c]
         missing xfree; from vaughan99@yahoo.com

commit f5410351c360e484a7831650458724f2cc084688
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Dec 29 21:37:22 2000 +0000

     - (bal) Add in '.c.o' section to Makefile.in to address make programs that
       don't honor CPPFLAGS by default.  Suggested by Lutz Jaenicke
       <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit beac3b434110265fe46b798ed3be5cb01e4530ee
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Dec 29 21:21:26 2000 +0000

     - (bal) if no MAXHOSTNAMELEN is defined.  Default to 64 character defination.
       Suggested by Christian Kurz <shorty@debain.org>

commit 0a8397e00c3fde74555f4f02cc08a0b557312e12
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Dec 29 18:50:50 2000 +0000

    whitespace sync with openbsd

commit da6cd59b1d30cddde0cb81d9142728b3a51670bd
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Dec 29 18:41:21 2000 +0000

    whitespace sync with openbsd

commit 2941f119e61091b94e11754e8b28398645cb9fa1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Dec 29 16:50:13 2000 +0000

    20001230
     - (bal) OpenBSD CVS Update
       - markus@cvs.openbsd.org 2000/12/28 18:58:30
         [ssh-keygen.c]
         enable 'ssh-keygen -l -f ~/.ssh/{authorized_keys,known_hosts}{,2}
     - (bal) Resynced CVS ID with OpenBSD for channel.c and uidswap.c

commit e76524075efba18358b371bf7c18ea95acf13aae
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Dec 28 22:16:00 2000 +0000

     - (stevesk) compress.[ch] sync with openbsd; missed in prototype
       fix merge.

commit 4dccfa5fb73853e6c9281beac2c42a31391acdc7
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 28 16:40:05 2000 +0000

     - (bal) OpenBSD CVS Update
       - markus@cvs.openbsd.org 2000/12/28 14:25:51
         [auth.h auth2.c]
         count authentication failures only
       - markus@cvs.openbsd.org 2000/12/28 14:25:03
         [sshconnect.c]
         fingerprint for MITM attacks, too.
       - markus@cvs.openbsd.org 2000/12/28 12:03:57
         [sshd.8 sshd.c]
         document -D
       - markus@cvs.openbsd.org 2000/12/27 14:19:21
         [serverloop.c]
         less chatty
       - markus@cvs.openbsd.org 2000/12/27 12:34
         [auth1.c sshconnect2.c sshd.c]
         typo
       - markus@cvs.openbsd.org 2000/12/27 12:30:19
         [readconf.c readconf.h ssh.1 sshconnect.c]
         new option: HostKeyAlias: allow the user to record the host key
         under a different name. This is useful for ssh tunneling over
         forwarded connections or if you run multiple sshd's on different
         ports on the same machine.
       - markus@cvs.openbsd.org 2000/12/27 11:51:53
         [ssh.1 ssh.c]
         multiple -t force pty allocation, document ORIGINAL_COMMAND
       - markus@cvs.openbsd.org 2000/12/27 11:41:31
         [sshd.8]
         update for ssh-2

commit 42717bf8fff94146edf43ea266113f1a54456c62
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 28 15:46:20 2000 +0000

    20001229
     - (bal) Fixed spelling of 'authorized_keys' in ssh-copy-id.1 by Christian
       Kurz <shorty@debain.org>
    
    20001228
     - (bal) SCO patch to not include <sys/queue.h> since it's unrelated
       header.  Patch by Tim Rice <tim@multitalents.net>
     - Updated TODO w/ known HP/UX issue
     - (bal) removed extra <netdb.h> noticed by Kevin Steves and removed the
       bad reference to 'NeXT including it else were' on the #ifdef version.

commit 9fa07d6318538147f9d41a42760a4eacaa4499bb
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 28 14:57:27 2000 +1100

    Update to new x11-askpass in RPM spec

commit e2fb8d3b0272f9d854449fda115792174112672a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 28 00:07:07 2000 +0000

    20001228
     - (bal) Patch to add libutil.h to loginrec.c only if the platform has
       libutil.h.  Suggested by Pekka Savola <pekka@netcore.fi>

commit 981eeed1be3050fbb00a6368fc20ba916f7442e0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 27 19:06:05 2000 +1100

     - (djm) Remove *.Ylonen files. They are no longer in the OpenBSD tree,
       the info in COPYING.Ylonen has been moved to the start of each
       SSH1-derived file and README.Ylonen is well out of date.

commit 5adbad22cb626a0156edff3a93321a6580990218
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Dec 27 07:06:21 2000 +0000

    This should bring NeXTStep back into the family of supported operating
    systems.
     - (bal) Fixed NeXT's lack of CPPFLAGS honoring.
     - (bal) ssh-keyscan.c: NeXT (and older BSDs) don't support getrlimit() w/
       'RLIMIT_NOFILE'

commit fa610a17a3d8251bec7b0a869eae6aadb1ea3c55
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 27 16:44:51 2000 +1100

     - (djm) Fix catman-do target for non-bash

commit 2c467a20f4f82000908b7c3d158e8a7960d3bad1
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Dec 27 04:57:41 2000 +0000

    20001227
     - (bal) Typo in configure.in: entut?ent should be endut?ent.  Suggested by
       Takumi Yamane <yamtak@b-session.com>
     - (bal) Checks for getrlimit(), sysconf(), and setdtablesize().  Patch
       by Corinna Vinschen <vinschen@redhat.com>

commit 3deda8b091e571f5577ae50b75b89a21caed6aee
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Dec 22 20:27:43 2000 +0000

    20001223
     - (bal) Fixed Makefile.in to support recompile of all ssh and sshd objects
       if a change to config.h has occurred.  Suggested by Gert Doering
       <gert@greenie.muc.de>
     - (bal) OpenBSD CVS Update:
       - markus@cvs.openbsd.org 2000/12/22 16:49:40
         [ssh-keygen.c]
         fix ssh-keygen -x -t type > file; from Roumen.Petrov@skalasoft.com

commit 46c162204b5a6f7471525c2f75cb2c607c88b83f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Dec 22 01:43:59 2000 +0000

    One way to massive patch.  <sigh>  It compiles and works under Linux..
    And I think I have all the bits right from the OpenBSD tree.
    20001222
     - Updated RCSID for pty.c
     - (bal) OpenBSD CVS Updates:
      - markus@cvs.openbsd.org 2000/12/21 15:10:16
        [auth-rh-rsa.c hostfile.c hostfile.h sshconnect.c]
        print keyfile:line for changed hostkeys, for deraadt@, ok deraadt@
      - markus@cvs.openbsd.org 2000/12/20 19:26:56
        [authfile.c]
        allow ssh -i userkey for root
      - markus@cvs.openbsd.org 2000/12/20 19:37:21
        [authfd.c authfd.h kex.c sshconnect2.c sshd.c uidswap.c uidswap.h]
        fix prototypes; from stevesk@pobox.com
      - markus@cvs.openbsd.org 2000/12/20 19:32:08
        [sshd.c]
        init pointer to NULL; report from Jan.Ivan@cern.ch
      - markus@cvs.openbsd.org 2000/12/19 23:17:54
        [auth-krb4.c auth-options.c auth-options.h auth-rhosts.c auth-rsa.c
         auth1.c auth2-skey.c auth2.c authfd.c authfd.h authfile.c bufaux.c
         bufaux.h buffer.c canohost.c channels.c clientloop.c compress.c
         crc32.c deattack.c getput.h hmac.c hmac.h hostfile.c kex.c kex.h
         key.c key.h log.c login.c match.c match.h mpaux.c mpaux.h packet.c
         packet.h radix.c readconf.c rsa.c scp.c servconf.c servconf.h
         serverloop.c session.c sftp-server.c ssh-agent.c ssh-dss.c ssh-dss.h
         ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh-rsa.h ssh.c ssh.h  uuencode.c
         uuencode.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c]
        replace 'unsigned bla' with 'u_bla' everywhere. also replace 'char
        unsigned' with u_char.

commit a074feb65d6f1fcad02e80b751e2287fd6230b09
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Dec 21 22:33:45 2000 +0000

     - (stevesk) OpenBSD CVS updates:
       - markus@cvs.openbsd.org 2000/12/19 15:43:45
         [authfile.c channels.c sftp-server.c ssh-agent.c]
         remove() -> unlink() for consistency
       - markus@cvs.openbsd.org 2000/12/19 15:48:09
         [ssh-keyscan.c]
         replace <ssl/x.h> with <openssl/x.h>
       - markus@cvs.openbsd.org 2000/12/17 02:33:40
         [uidswap.c]
         typo; from wsanchez@apple.com

commit 82cf0ceea899d4c7a47bdec79eea6dc2a8576bc7
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 20 13:34:48 2000 +1100

     - (djm) Workaround PAM inconsistencies between Solaris derived PAM code
       and Linux-PAM. Based on report and fix from Andrew Morgan
       <morgan@transmeta.com>

commit 28bfc0da69166bc1afe33cfb1a61dadce01169e2
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Dec 18 19:58:57 2000 +0000

     - (bal) split CFLAGS into CFLAGS and CPPFLAGS in configure.in and Makefile.
       Suggested by Wilfredo Sanchez <wsanchez@apple.com>

commit 1004c7eb9e08fed606d0d22f10cc6a3d93557011
Author: Kevin Steves <stevesk@pobox.com>
Date:   Mon Dec 18 18:55:28 2000 +0000

     - (stevesk) rsa.c: entropy.h not needed.

commit 8daed1824fdc992d8d59626d20bea87f4982f461
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Dec 16 19:21:03 2000 +0000

     - (stevesk) OpenBSD CVS updates:
       - markus@cvs.openbsd.org 2000/12/16 02:53:57
         [scp.c]
         allow + in usernames; request from Florian.Weimer@RUS.Uni-Stuttgart.DE
       - markus@cvs.openbsd.org 2000/12/16 02:39:57
         [scp.c]
         unused; from stevesk@pobox.com

commit e2737523bd49ef4a78301fdd0b19ab957ee9ecd4
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Dec 15 23:47:30 2000 +0000

     - (stevesk) Old OpenBSD patch wasn't completely applied:
       - markus@cvs.openbsd.org 2000/01/24 22:11:20
         [scp.c]
         allow '.' in usernames; from jedgar@fxp.org

commit 6b875869654af5b5f83f9e360a4d91010b624728
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Dec 15 23:31:01 2000 +0000

       - provos@cvs.openbsd.org 2000/12/15 10:30:15
         [kex.c kex.h sshconnect2.c sshd.c]
         compute diffie-hellman in parallel between server and client. okay markus@

commit 48d0d257220f4ef1ce9c916d76ae56860b7dddda
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Dec 15 23:05:57 2000 +0000

    type cpp comment

commit 7d00ba4d7210a0cde5d758049cdca31cb9b28854
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Dec 15 23:03:10 2000 +0000

       - deraadt@cvs.openbsd.org 2000/12/11 10:27:33
         [scp.c]
         when copying 0-sized files, do not re-print ETA time at completion

commit 7aa1d0008a98850eac43b2692bfc93bb1112c2dc
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Dec 15 20:23:47 2000 +0000

    update RCSID

commit fcec7f82bb394762afce0801f43bad6d2a4b4a86
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Dec 15 19:55:48 2000 +0000

       - markus@cvs.openbsd.org 2000/12/12 14:45:21
         [sshd.c]
         source port < 1024 is no longer required for rhosts-rsa since it
         adds no additional security.
       - markus@cvs.openbsd.org 2000/12/12 16:11:49
         [ssh.1 ssh.c]
         rhosts-rsa is no longer automagically disabled if ssh is not privileged.
         UsePrivilegedPort=no disables rhosts-rsa _only_ for old servers.
         these changes should not change the visible default behaviour of the ssh client.

commit fa72ddac73e3549cf5d399fae31bfb5a293ed0cc
Author: Kevin Steves <stevesk@pobox.com>
Date:   Fri Dec 15 18:39:12 2000 +0000

     - (stevesk) OpenBSD CVS updates:
       - markus@cvs.openbsd.org 2000/12/13 16:26:53
         [ssh-keyscan.c]
         fatal already adds \n; from stevesk@pobox.com
       - markus@cvs.openbsd.org 2000/12/13 16:25:44
         [ssh-agent.c]
         remove redundant spaces; from stevesk@pobox.com
       - ho@cvs.openbsd.org 2000/12/12 15:50:21
         [pty.c]
         When failing to set tty owner and mode on a read-only filesystem, don't
         abort if the tty already has correct owner and reasonably sane modes.
         Example; permit 'root' to login to a firewall with read-only root fs.
         (markus@ ok)
       - deraadt@cvs.openbsd.org 2000/12/13 06:36:05
         [pty.c]
         KNF

commit de41bc6caaa986f6e65629f5e926ea5ce140d8e7
Author: Kevin Steves <stevesk@pobox.com>
Date:   Thu Dec 14 00:04:08 2000 +0000

    s@\t\n@\n

commit ec84dc12db39c58e79b18928d75382ce31a9ee09
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Dec 13 17:45:15 2000 +0000

     - (stevesk) OpenSSH CVS update:
       - markus@cvs.openbsd.org 2000/12/12 15:30:02
         [ssh-keyscan.c ssh.c sshd.c]
         consistently use __progname; from stevesk@pobox.com

commit 152cea206a2c0aba018be8a299e9b028fae2d3bc
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 13 19:21:51 2000 +1100

     - (djm) Make sure we reset the SIGPIPE disposition after we fork. Report
       from Andreas M. Kirchwitz <amk@krell.zikzak.de>

commit e918d7966fcc34bb9e56a29096dcae202f71ba73
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Dec 12 00:08:12 2000 +0000

    change my e-mail to a portable one.

commit a65c78a743d3c54fda4bc1d4eef956e2ee06d906
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Dec 10 22:57:30 2000 +0000

     - (bal) OpenBSD CVS update
       - markus@cvs.openbsd.org 2000/12/10 17:01:53
         [sshconnect1.c]
         always request new challenge for skey/tis-auth, fixes interop with
         other implementations; report from roth@feep.net

commit 4cc90a492e9f0eee49e77e192a2c1226260fe4f3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Dec 10 22:12:54 2000 +0000

    20001211
     - (bal) Applied patch to include ssh-keyscan into Redhat's package, and
       patch to install ssh-keyscan manpage.  Patch by Pekka Savola
       <pekka@netcore.fi>

commit 971c97317fd535b363ff6414d6f266325f7a3842
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Dec 10 02:01:50 2000 +0000

    Another CVS sync w/ OpenBSD
       - provos@cvs.openbsd.org 2000/12/09 23:51:11
         [compat.c]
         remove unnecessary '\n'

commit fa1b3d08421d263694d5fb3989d796a57d714f2a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Dec 10 01:55:37 2000 +0000

    20001210
     - (bal) OpenBSD CVS updates
       - markus@cvs.openbsd.org 2000/12/09 13:41:51
         [cipher.c cipher.h rijndael.c rijndael.h rijndael_boxes.h]
         undo rijndael changes
       - markus@cvs.openbsd.org 2000/12/09 13:48:31
         [rijndael.c]
         fix byte order bug w/o introducing new implementation
       - markus@cvs.openbsd.org 2000/12/09 14:08:27
         [sftp-server.c]
         "" -> "." for realpath; from vinschen@redhat.com
       - markus@cvs.openbsd.org 2000/12/09 14:06:54
         [ssh-agent.c]
         extern int optind; from stevesk@sweden.hp.com

commit a688561ef4bf78651e60b112960b099c2bee1d90
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Dec 9 03:45:32 2000 +0000

    20001209
     - (bal) OpenSSH CVS updates:
       - djm@cvs.openbsd.org 2000/12/07 4:24:59
         [ssh.1]
         Typo fix from Wilfredo Sanchez <wsanchez@apple.com>; ok theo

commit 01f8463b15ead597f8ecf0052fd7569240dcaab9
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 7 05:57:27 2000 +0000

       - markus@cvs.openbsd.org 2000/12/06 23:10:39
         [rijndael.c]
         unexpand(1)
       - markus@cvs.openbsd.org 2000/12/06 23:05:43
         [cipher.c cipher.h rijndael.c rijndael.h rijndael_boxes.h]
         new rijndael implementation. fixes endian bugs

commit a14ee47f2eee3030cd784b93985a4de417a4b14c
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Dec 7 01:24:58 2000 +0000

    20001207
     - (bal) OpenSSH CVS updates:
       - markus@cvs.openbsd.org 2000/12/06 22:58:14
         [compat.c compat.h packet.c]
         disable debug messages for ssh.com/f-secure 2.0.1x, 2.1.0

commit fc74af43ce005c9220bfb110a2fbf3a48c36c148
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Dec 6 22:47:55 2000 +0000

     - (stevesk) OpenSSH CVS update:
       - markus@cvs.openbsd.org 2000/12/06 19:57:48
         [ssh-keyscan.c]
         err(3) -> internal error(), from stevesk@sweden.hp.com

commit 2c65ada57319d01c5ba2a670e68f8c0167b83823
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Dec 6 22:25:40 2000 +0000

     - (stevesk) Import <sys/queue.h> from OpenBSD for systems that don't
       have it (used in ssh-keyscan).

commit 7ad971033417ac7d0fc49ccba89f70b3dec93b64
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Dec 6 01:42:49 2000 +0000

    20001206
     - (bal) OpenSSH CVS updates:
       - markus@cvs.openbsd.org 2000/12/05 20:34:09
         [channels.c channels.h clientloop.c serverloop.c]
         async connects for -R/-L; ok deraadt@
       - todd@cvs.openssh.org 2000/12/05 16:47:28
         [sshd.c]
         tweak comment to reflect real location of pid file; ok provos@

commit 3c51676a565badf61cb30def91d7a910e8ae41b7
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Dec 6 00:48:05 2000 +0000

     - (stevesk) fix typos in contrib/hpux/README

commit b6434ae0e89c6614645a6e8ef50be1c5884beaf5
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Dec 5 01:15:09 2000 +0000

    20001205
     - (bal) OpenSSH CVS updates:
       - markus@cvs.openbsd.org 2000/12/04 19:24:02
         [ssh-keyscan.c ssh-keyscan.1]
         David Maziere's ssh-keyscan, ok niels@
     - (bal) Updated Makefile.in to include ssh-keyscan that was just added
       to the recent OpenBSD source tree.

commit d121f613708c3c9c82465b0788550943a918d5c8
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Dec 3 17:00:47 2000 +0000

    20001204
     - (bal) More C functions defined in NeXT that are unaccessable without
       defining -POSIX.
     - (bal) OpenBSD CVS updates:
       - markus@cvs.openbsd.org 2000/12/03 11:29:04
         [compat.c]
         remove fallback to SSH_BUG_HMAC now that the drafts are updated
       - markus@cvs.openbsd.org 2000/12/03 11:27:55
         [compat.c]
         correctly match "2.1.0.pl2 SSH" etc; from pekkas@netcore.fi/bugzilla.redhat
       - markus@cvs.openbsd.org 2000/12/03 11:15:03
         [auth2.c compat.c compat.h sshconnect2.c]
         support f-secure/ssh.com 2.0.12; ok niels@

commit b84815880e453346667d6d2b3f02904674848a7a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 3 11:51:51 2000 +1100

     - (djm) Added patch from Nalin Dahyabhai <nalin@redhat.com> to enable
       PAM authentication using KbdInteractive.
     - (djm) Added another TODO

commit c72745afa96a87d41a22804f48499db12d95dfcd
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Dec 2 19:03:54 2000 +0000

    20001203
    - (bal) OpenBSD CVS updates:
      - markus@cvs.openbsd.org 2000/11/30 22:54:31
        [channels.c]
        debug->warn if tried to do -R style fwd w/o client requesting this;
        ok neils@
      - markus@cvs.openbsd.org 2000/11/29 20:39:17
        [cipher.c]
        des_cbc_encrypt -> des_ncbc_encrypt since it already updates the IV
      - markus@cvs.openbsd.org 2000/11/30 18:33:05
        [ssh-agent.c]
        agents must not dump core, ok niels@
      - markus@cvs.openbsd.org 2000/11/30 07:04:02
        [ssh.1]
        T is for both protocols
      - markus@cvs.openbsd.org 2000/12/01 00:00:51
        [ssh.1]
        typo; from green@FreeBSD.org
      - markus@cvs.openbsd.org 2000/11/30 07:02:35
        [ssh.c]
        check -T before isatty()
      - provos@cvs.openbsd.org 2000/11/29 13:51:27
        [sshconnect.c]
        show IP address and hostname when new key is encountered. okay markus@
      - markus@cvs.openbsd.org 2000/11/30 22:53:35
        [sshconnect.c]
        disable agent/x11/port fwding if hostkey has changed; ok niels@
      - marksu@cvs.openbsd.org 2000/11/29 21:11:59
        [sshd.c]
        sshd -D, startup w/o deamon(), for monitoring scripts or inittab;
        from handler@sub-rosa.com and eric@urbanrange.com; ok niels@

commit a15e39b05fa013e16bbe293244cb49b0f27e2901
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Dec 2 04:58:57 2000 +0000

    Added in Linux's select issue to TODO.  Which may have to do with the
    shell/sshd not sending a -TERM/-HUP to the grandchildren at the right
    time in the exiting process.

commit 75214f9c195e0d65b5640ba236e7b6113142f561
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Dec 1 21:19:51 2000 +0000

    20001202
     - (bal) Backed out of part of Alain St-Denis' loginrec.c patch.
     - (bal) Irix need some sort of mansubdir, patch by Michael Stone
       <mstone@cs.loyola.edu>
    
    Also removed a finished entry in TODO, and changed my address in the
    CREDITS file to match my new home address.

commit 43dc8da75cf671fdae296667c1238f223145a528
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 29 15:55:17 2000 +1100

     - (djm) Back out all the serverloop.c hacks. sshd will now hang again
       if there are background children with open fds.

commit 6dbfef63559c7ac29aa7a3fe27a12d814fbd0e83
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 29 13:51:06 2000 +1100

     - (djm) Add Redhat RPM patch for AUTHPRIV SyslogFacility

commit a19cf47b0fa5cd16c1e471792109ce06023c9757
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 29 13:28:50 2000 +1100

     - (djm) Patch from Pekka Savola <Pekka.Savola@netcore.fi> to include a few
       more manpage paths in fixpaths calls
     - (djm) Also add xauth path at Pekka's suggestion.

commit dadc05126872b4335d0c71b271c4431340162400
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 29 12:51:14 2000 +1100

    Fix Haruyama-san's email address

commit e39cacc5793b19e74319b3c33c5e3b9fed0c18ff
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 29 12:18:44 2000 +1100

     - (djm) OpenBSD CVS updates:
       - provos@cvs.openbsd.org  2000/11/22 08:38:31
         [sshd.8]
         talk about /etc/primes, okay markus@
       - markus@cvs.openbsd.org  2000/11/23 14:03:48
         [ssh.c sshconnect1.c sshconnect2.c]
         complain about invalid ciphers for ssh1/ssh2, fall back to reasonable
         defaults
       - markus@cvs.openbsd.org  2000/11/25 09:42:53
         [sshconnect1.c]
         reorder check for illegal ciphers, bugreport from espie@
       - markus@cvs.openbsd.org  2000/11/25 10:19:34
         [ssh-keygen.c ssh.h]
         print keytype when generating a key.
         reasonable defaults for RSA1/RSA/DSA keys.

commit 3f62abaee876bb4ef7450799cdee1081297aae51
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 29 11:56:35 2000 +1100

     - (djm) bsd-rresvport.c bzero -> memset
     - (djm) Don't fail in defines.h on absence of 64 bit types (we will
       still fail during compilation of sftp-server).
     - (djm) Fail if ar is not found during configure

commit a2e53ccb64c42a635b4618b592e470a02c0142b0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 29 11:26:45 2000 +1100

     - (djm) Fix(?) the ssh hang-on-logout/data-from-child race

commit d592b632968fbec154c81b93c99b283200b257b6
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 25 10:09:32 2000 +1100

    give up privs when reading seed file

commit 14920293713ff4a5bbe45b495694bfd925d73894
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Nov 21 21:24:55 2000 +0000

    20001123
     - (bal) Merge OpenBSD changes:
       - markus@cvs.openbsd.org  2000/11/15 22:31:36
         [auth-options.c]
         case insensitive key options; from stevesk@sweeden.hp.com
       - markus@cvs.openbsd.org  2000/11/16 17:55:43
         [dh.c]
         do not use perror() in sshd, after child is forked()
       - markus@cvs.openbsd.org  2000/11/14 23:42:40
         [auth-rsa.c]
         parse option only if key matches; fix some confusing seen by the client
       - markus@cvs.openbsd.org  2000/11/14 23:44:19
         [session.c]
         check no_agent_forward_flag for ssh-2, too
       - markus@cvs.openbsd.org  2000/11/15
         [ssh-agent.1]
         reorder SYNOPSIS; typo, use .It
       - markus@cvs.openbsd.org  2000/11/14 23:48:55
         [ssh-agent.c]
         do not reorder keys if a key is removed
       - markus@cvs.openbsd.org  2000/11/15 19:58:08
         [ssh.c]
         just ignore non existing user keys
       - millert@cvs.openbsd.org  200/11/15 20:24:43
         [ssh-keygen.c]
         Add missing \n at end of error message.

commit 4a1d91646d4248c111f573e496cc0d10ba62e274
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Nov 21 10:45:31 2000 +0000

    20001122
     - (bal) Minor patch to ensure platforms lacking IRIX job limit supports
       are compilable.
     - (bal) Updated TODO as of 11/18/2000 with known things to resolve.

commit 49a79c09762613f29601ef2470d13952168021be
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Nov 17 03:47:20 2000 +0000

     - (stevek) Reworked progname support.
     - (bal) Misplaced #include "includes.h" in bsd-setproctitle.c.  Patch by
       Shinichi Maruyama <marya@st.jip.co.jp>
    
    I assume the progname patch was finished.  I believe stevek is on vacation,
    but it passes compiling under Linux and NeXTStep.

commit baaa2c05dd789bdce64fa7eb5697a5f969d68288
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Nov 17 00:22:17 2000 +0000

    20001117
     - (bal) Changed from 'primes' to 'primes.out' for consistancy sake.  It
       has no affect the output.  Patch by Corinna Vinschen <vinschen@redhat.com>

commit 65571526b685d63cdae0e74b75ebf3553eb648dc
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Nov 16 02:46:20 2000 +0000

    20001116
     - (bal) Added in MAXSYMLINK test in bsd-realpath.c.  Required for some SCO
       releases.
     - (bal) Make builds work outside of source tree.  Patch by Mark D. Roth
       <roth@feep.net>

commit 457b5a2bed618a406d19b702ef3e03a5e150f761
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 13 23:17:53 2000 +1100

     - (djm) fixpaths to DSA and RSA keys too

commit ee188d323c685e73d044e1acd0d20b43a355fc92
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 13 23:13:55 2000 +1100

    doh

commit d1446d84c0f1201fd52cd970bf677a31685de78f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 13 22:58:22 2000 +1100

    doh

commit 49deec69d3f826c2f0bb064a6e8b5e2bf5974b9a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 13 22:57:51 2000 +1100

     - (djm) Change to interim version

commit 0bc1bd814e3c2b5e92d6f595930051960d17f47f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 13 22:57:25 2000 +1100

     - (djm) Merge OpenBSD changes:
       - markus@cvs.openbsd.org  2000/11/06 16:04:56
         [channels.c channels.h clientloop.c nchan.c serverloop.c]
         [session.c ssh.c]
         agent forwarding and -R for ssh2, based on work from
         jhuuskon@messi.uku.fi
       - markus@cvs.openbsd.org  2000/11/06 16:13:27
         [ssh.c sshconnect.c sshd.c]
         do not disabled rhosts(rsa) if server port > 1024; from
         pekkas@netcore.fi
       - markus@cvs.openbsd.org  2000/11/06 16:16:35
         [sshconnect.c]
         downgrade client to 1.3 if server is 1.4; help from mdb@juniper.net
       - markus@cvs.openbsd.org  2000/11/09 18:04:40
         [auth1.c]
         typo; from mouring@pconline.com
       - markus@cvs.openbsd.org  2000/11/12 12:03:28
         [ssh-agent.c]
         off-by-one when removing a key from the agent
       - markus@cvs.openbsd.org  2000/11/12 12:50:39
         [auth-rh-rsa.c auth2.c authfd.c authfd.h]
         [authfile.c hostfile.c kex.c kex.h key.c key.h myproposal.h]
         [readconf.c readconf.h rsa.c rsa.h servconf.c servconf.h ssh-add.c]
         [ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh.1 ssh.c ssh_config]
         [sshconnect1.c sshconnect2.c sshd.8 sshd.c sshd_config ssh-dss.c]
         [ssh-dss.h ssh-rsa.c ssh-rsa.h dsa.c dsa.h]
         add support for RSA to SSH2.  please test.
         there are now 3 types of keys: RSA1 is used by ssh-1 only,
         RSA and DSA are used by SSH2.
         you can use 'ssh-keygen -t rsa -f ssh2_rsa_file' to generate RSA
         keys for SSH2 and use the RSA keys for hostkeys or for user keys.
         SSH2 RSA or DSA keys are added to .ssh/authorised_keys2 as before.
     - (djm) Fix up Makefile and Redhat init script to create RSA host keys
     - (djm) Change to interim version

commit 559d383037b0872fcde4e6c40188b649c574be74
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 13 20:59:05 2000 +1100

     - (djm) Add pointer to http://www.imasy.or.jp/~gotoh/connect.c to
       contrib/README

commit 6c0d627e86a455dbf46128eb31397824a907e3d4
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Nov 12 09:22:29 2000 +0000

     - (stevesk) pty.c: HP-UX 10 and 11 don't define TIOCSCTTY.  Add error() to
        failed ioctl(TIOCSCTTY) call.

commit 980754ce49de5fe7b8a61fceb5c31c29beeea1d3
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Nov 12 00:04:24 2000 +0000

    20001112
     - (bal) SCO Patch to add needed libraries for configure.in.  Patch by
       Phillips Porch <root@theporch.com>
     - (bal) IRIX patch to adding Job Limits.  Patch by Denis Parker <dcp@sgi.com>

commit afeaca953772e7141842a8bf057a329bef789b89
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 11 09:09:57 2000 +1100

     - (djm) Hardware sysconfdir in RPM spec files as some RPM versions get
       it wrong. Report from Bennett Todd <bet@rahul.net>

commit 9f4f7552ee994634cc79a6f90ae4e9347f536cec
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 11 09:03:32 2000 +1100

     - (djm) Fix vsprintf("%h") in bsd-snprintf.c, short int va_args are
       promoted to type int. Report and fix from Dan Astoorian
       <djast@cs.toronto.edu>

commit 29abb1b6a91dbda9bd7f6b9d4ae8ff4164d2f2d1
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 11 08:51:40 2000 +1100

    stupid ; misplacement

commit 895f2386726172f0fd1a2ebb6da405282a5d37e1
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 11 08:47:18 2000 +1100

     - (djm) Fix new Makefile.in warnings

commit 0986b55a601066b1dc896c4508a55e905ea8d0ea
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 11 08:36:38 2000 +1100

     - (djm) Added /etc/primes for kex DH group neg, fixup Makefile.in and
       packaging files

commit dcca981e88978f84e404ef718e0e997b518403f0
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Nov 10 03:28:31 2000 +0000

    Two Ooops. =)
     - INSTALL minor correction for s/key
     - and I forgot to submit loginrec.c  even after I put it in the ChangeLog =)

commit 305fb0018a1485a040eac264527b3fd4557a461a
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Fri Nov 10 02:41:30 2000 +0000

    20001110
     - (bal) Fixed dropped answer from skey_keyinfo() in auth1.c
     - (bal) Changed from --with-skey to --with-skey=PATH in configure.in
     - (bal) Added in check to verify S/Key library is being detected in
       configure.in
     - (bal) next-posix.h - added another prototype wrapped in POSIX ifdef/endif.
       Patch by Mark Miller <markm@swoon.net>
     - (bal) Added 'util.h' header to loginrec.c only if HAVE_UTIL_H is defined
       to remove warnings under MacOS X.  Patch by Mark Miller <markm@swoon.net>
     - (bal) Fixed LDFLAG mispelling in configure.in for --with-afs

commit dbcea870630e6e6cedc6937d33da4e2e4c6d5390
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Nov 8 01:07:51 2000 +0000

     - (bal) fixpaths fixed to stop it from quitely failing. Patch by
       Mark D. Roth <roth@feep.net>

commit 89ef41a7848612af76b477b9018d178e38edb415
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Tue Nov 7 16:41:41 2000 +0000

     - (bal) acconfig.in - removed the double "USE_PIPES" entry. Patch by
       Mark Miller <markm@swoon.net>
     - (bal) sshd.init files corrected to assign $? to RETVAL.  Patch by
       Jarno Huuskonen <jhuuskon@messi.uku.fi>

commit df4a7aee788cb35d50ea049c490c16ea257c4496
Author: Kevin Steves <stevesk@pobox.com>
Date:   Tue Nov 7 14:47:51 2000 +0000

    HP-UX 11 supports PAM.

commit 2ed9818ed96364ac37ca5a6432a075e83e6d9c56
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Nov 6 07:15:43 2000 +0000

     - (bal) typo in configure.in in regards to --with-ldflags from Marko
       Asplund <aspa@kronodoc.fi>
     - (bal) fixed next-posix.h.  Forgot prototype of getppid().

commit 6bad177e2fef129e0f8981d54bdb38fa36d88879
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 6 14:17:38 2000 +1100

    Prepare for release

commit 2b023d881c49206e4eb5c7a3a425e7157ebf4ee1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 6 13:07:45 2000 +1100

    Whoops, forgot changelog

commit 969c07e0f3fc27039dd710800534400ae841740e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 6 13:06:43 2000 +1100

     - (djm) Fix multiple dependancy on gnome-libs from Pekka Savola
       <pekkas@netcore.fi>
     - (djm) Don't need X11-askpass in RPM spec file if building without it
       from Pekka Savola <pekkas@netcore.fi>

commit ab3605011854ca78531c87fd814031cd6b36c97e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 6 12:52:25 2000 +1100

    Remove UPGRADING from spec files

commit 6604fadbdd4dd5371aef4c3f83e87402d8fb8924
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 6 12:48:54 2000 +1100

     - (djm) Remove UPGRADING document in favour of a link to the better
       maintained FAQ on www.openssh.com

commit 389edc4ce4f96ae1e8066a8d9f97d062b88e94ce
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 6 12:39:34 2000 +1100

     - (djm) Manually fix up missed diff hunks (mainly RCS idents)

commit c78abaa1090f7da97ee8a6462830698bf66b23f1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 6 12:07:21 2000 +1100

     - (djm) Use Jim's new 1.0.3 askpass in Redhat RPMs

commit e4c82b57b2f6bef8f13a2aa3956da10dddfc6651
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Nov 5 21:13:45 2000 +0000

     - (bal) Missed auth-skey.o in Makefile.in and minor correction to
       bsd-waitpid.c

commit 85b3db6bcabfd6fd3fd97c871f4e29053a3338f3
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Nov 5 15:31:36 2000 +0000

     - (stevesk) pty.c: use __hpux to identify HP-UX.

commit 67e21e1eb2366f4598f8ee483dfbacc92010a687
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Nov 5 09:08:45 2000 +0000

     - (bal) Reworked NEWS-OS and NeXT ports to extract waitpid() and
       setsid() into more common files

commit fd496053df95abd3046a46729b1a12ae540b07ad
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Nov 5 07:52:55 2000 +0000

     - (bal) auth2-skey.c - Checked in.  Missing from portable tree.

commit f2de06ba2827fda9c737fd39330b53df648e4f04
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Nov 5 05:42:36 2000 +0000

     - (bal) Sync with OpenBSD:
       - markus@cvs.openbsd.org 2000/10/31 9:31:58
         [compat.c]
         handle all old openssh versions
       - markus@cvs.openbsd.org 2000/10/31 13:1853
         [deattack.c]
         so that large packets do not wrap "n"; from netbsd
     - (bal) rijndel.c - fix up RCSID to match OpenBSD tree

commit 2791cd5254283ac9b245061ed1760b7f83d84137
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Mon Oct 30 05:33:55 2000 +0000

     - (bal) next-posix.h - spelling and forgot a prototype

commit 23e1371d9d3893afd4b32cd408971d830b594746
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Oct 29 22:49:19 2000 +0000

     - (bal) Resolved more $xno and $xyes issues in configure.in

commit 9be6e267b5769f0783fdb83b38a19418c6bd83d1
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Oct 29 19:18:49 2000 +0000

     - (stevesk) Create contrib/cygwin/ directory; patch from
       Corinna Vinschen <vinschen@redhat.com>

commit a58e0af1bd608c94314821d050d0c31c1484e490
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sun Oct 29 14:38:55 2000 +0000

     - (stevesk) Fix typo in auth.c: USE_PAM not PAM

commit 95c7b4dd6ebec7fe40de4d51eda1767152d6d900
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 28 21:06:28 2000 +1100

    fix

commit d425d4da7073ed18e943346d862ca87789daee47
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 28 21:05:57 2000 +1100

     - (djm) authctxt->pw may be NULL. Fix from Markus Friedl
       <markus.friedl@informatik.uni-erlangen.de>

commit 69b69aa50d0effadc8b7e9c564f7a2ee223ac6b5
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 28 14:19:58 2000 +1100

     - (djm) Sync with OpenBSD:
       - markus@cvs.openbsd.org  2000/10/16 15:46:32
         [ssh.1]
         fixes from pekkas@netcore.fi
       - markus@cvs.openbsd.org  2000/10/17 14:28:11
         [atomicio.c]
         return number of characters processed; ok deraadt@
       - markus@cvs.openbsd.org  2000/10/18 12:04:02
         [atomicio.c]
         undo
       - markus@cvs.openbsd.org  2000/10/18 12:23:02
         [scp.c]
         replace atomicio(read,...) with read(); ok deraadt@
       - markus@cvs.openbsd.org  2000/10/18 12:42:00
         [session.c]
         restore old record login behaviour
       - deraadt@cvs.openbsd.org 2000/10/19 10:41:13
         [auth-skey.c]
         fmt string problem in unused code
       - provos@cvs.openbsd.org  2000/10/19 10:45:16
         [sshconnect2.c]
         don't reference freed memory. okay deraadt@
       - markus@cvs.openbsd.org  2000/10/21 11:04:23
         [canohost.c]
         typo, eramore@era-t.ericsson.se; ok niels@
       - markus@cvs.openbsd.org  2000/10/23 13:31:55
         [cipher.c]
         non-alignment dependent swap_bytes(); from
         simonb@wasabisystems.com/netbsd
       - markus@cvs.openbsd.org  2000/10/26 12:38:28
         [compat.c]
         add older vandyke products
       - markus@cvs.openbsd.org  2000/10/27 01:32:19
         [channels.c channels.h clientloop.c serverloop.c session.c]
         [ssh.c util.c]
         enable non-blocking IO on channels, and tty's (except for the
         client ttys).
       - markus@cvs.openbsd.org  2000/10/27 01:48:22
         channels.c channels.h clientloop.c
         deny agent/x11 forwarding unless requested; thanks to jwl@pobox.com

commit c05e01875bab590584f51bbeb464dd23c64f27fa
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 28 13:38:34 2000 +1100

     - (djm) Fix mangled AIXAUTHENTICATE code

commit 6bd90df4909b90143093536254fce86342f63eaa
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 28 13:30:55 2000 +1100

     - (djm) fix select hack in serverloop.c from Philippe WILLEM
       <Philippe.WILLEM@urssaf.fr>

commit e95b52e90bc1c3b411c9ce309cbc6291c8ec77ad
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 28 13:22:06 2000 +1100

    Change of employer :)

commit 656d71754122aeeaff1e17e8e115017b04239fb2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 27 09:27:32 2000 +1100

     - (djm) Increase REKEY_BYTES to 2^24 for arc4random

commit 76020ba5c0360b9e9adf619d4249f82d1e3b83b6
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 25 16:55:00 2000 +0000

     - (bal) Added USE_PIPS defined to NeXT configure.in since scp hangs randomly.
     - (bal) Apply fixes to configure.in pointed out by Pavel Roskin
       <proski@gnu.org>

commit df1b6452ee4d70b73b665d8a85e2580f82bb15d5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 25 14:47:35 2000 +1100

    Reword

commit 6f9c337401d455b92d85913432f0fc1129812b1f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 25 10:06:04 2000 +1100

     - (djm) Added WARNING.RNG file and modified configure to ask users of the
       builtin entropy code to read it.
     - (djm) Prefer builtin regex to PCRE.

commit e5a8525242deb13d5263d2da46365053f05262d4
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Thu Oct 19 23:43:24 2000 +0000

     - (bal) Imported NEWS-OS waitpid() macros into NeXT.  Since implementation
       is more correct then current version.

commit 81fa28abaab971695cb4a855e9363bc766613d18
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 20 09:14:04 2000 +1100

     - (djm) Don't define _REENTRANT for SNI/Reliant Unix

commit ac0966548ed0d313c8b7c149272cd0badb303f70
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Oct 18 19:41:14 2000 +0000

    formatting change for contrib/hpux/README

commit ee184dae24a9da5ca419e3f1367536e6c509fe9b
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Oct 18 13:45:40 2000 +0000

     - (stevesk) Add egd startup scripts to contrib/hpux/

commit 8848b249ff1f6059271480c4abcedc9a3762f9c6
Author: Kevin Steves <stevesk@pobox.com>
Date:   Wed Oct 18 13:11:44 2000 +0000

     - (stevesk) Add initial support for setproctitle().  Current
        support is for the HP-UX pstat(PSTAT_SETCMD, ...) method.

commit b5628647ad1e48d026064e5acc0d8dc0b8021cfa
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Wed Oct 18 00:02:25 2000 +0000

     - (bal) Changed from GNU rx to PCRE on suggestion from djm.
     - (bal) Integrated Sony NEWS-OS patches from NAKAJI Hirouyuki
       <nakaji@tutrp.tut.ac.jp>

commit 2594de81d301188108c1accbd4f937a86d70db1c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 17 23:22:28 2000 +1100

     - (djm) Don't rely on atomicio's retval to determine length of askpass
       supplied passphrase. Problem report from Lutz Jaenicke
       <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit ef767acfb7b5f379739802aacd22ff0abbb8c810
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Oct 17 23:14:08 2000 +1100

     - (djm) Add -lregex to cywin libs from Corinna Vinschen
       <vinschen@cygnus.com>

commit 52dc96b717fe2d2cd536ab73b728de60d931dd6a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 16 20:13:43 2000 +1100

     - (djm) Make inability to read/write PRNG seedfile non-fatal

commit ff649d888076a94033ebce016c85c5419a2c290b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 16 13:35:19 2000 +1100

     - (djm) Merge some of Nalin Dahyabhai <nalin@redhat.com> changes from the
       Redhat 7.0 spec file

commit 2b2cf52471efcff7d5cef4bbf6d724f8c84b0f39
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 16 12:25:17 2000 +1100

     - Added condrestart to Redhat init script. Patch from Pekka Savola
       <pekkas@netcore.fi>
     - Update version in Redhat spec file

commit cd57198b3e0857218ba461b174063d763dcc9d81
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 16 12:21:36 2000 +1100

    oops - forgot to commit

commit 50a41ed079629fdcd9a1d2a781b73170422fc73a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 16 12:14:42 2000 +1100

     - (djm) Sync with OpenBSD:
       - markus@cvs.openbsd.org  2000/10/14 04:01:15
         [cipher.c]
         debug3
       - markus@cvs.openbsd.org  2000/10/14 04:07:23
         [scp.c]
         remove spaces from arguments; from djm@mindrot.org
       - markus@cvs.openbsd.org  2000/10/14 06:09:46
         [ssh.1]
         Cipher is for SSH-1 only
       - markus@cvs.openbsd.org  2000/10/14 06:12:09
         [servconf.c servconf.h serverloop.c session.c sshd.8]
         AllowTcpForwarding; from naddy@
       - markus@cvs.openbsd.org  2000/10/14 06:16:56
         [auth2.c compat.c compat.h sshconnect2.c version.h]
         OpenSSH_2.3; note that is is not complete, but the version number
         needs to be changed for interoperability reasons
       - markus@cvs.openbsd.org  2000/10/14 06:19:45
         [auth-rsa.c]
         do not send RSA challenge if key is not allowed by key-options; from
         eivind@ThinkSec.com
       - markus@cvs.openbsd.org  2000/10/15 08:14:01
         [rijndael.c session.c]
         typos; from stevesk@sweden.hp.com
       - markus@cvs.openbsd.org  2000/10/15 08:18:31
         [rijndael.c]
         typo
     - Copy manpages back over from OpenBSD - too tedious to wade through diffs

commit 5993935f76e66c957f02efaa8fc0c8ff8a3f92c9
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 15 12:21:32 2000 +1100

     - (djm) Fix ssh2 hang on background processes at logout.

commit b4df15d1e119994ad1f3e73c1283414d2eb30a5f
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sun Oct 15 00:17:36 2000 +0000

     - (bal) Add support for realpath and getcwd for platforms with broken
       or missing realpath implementations for sftp-server.
     - (bal) Corrected mistake in INSTALL in regards to GNU rx library

commit ca1c2a0bac6e3ceab5c232ab800a1085db346144
Author: Ben Lindstrom <mouring@eviladmin.org>
Date:   Sat Oct 14 21:33:19 2000 +0000

    Add support for GNU rx library for those lacking regexp support

commit e0f49143d3eb0519339997a0711e1d62fdd26db1
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Oct 14 17:51:48 2000 +0000

     - (stevesk) Display correct path to ssh-askpass in configure output.
       Report from Lutz Jaenicke.

commit c368a3c93995be732f95be2afadbe4a42977b6bd
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Oct 14 16:10:06 2000 +0000

    comparing against buf and not hostname; openbsd tree has this
    problem also.

commit 8d3ebb418af75277ac8ed3fccc2ab8d73c6bced3
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Oct 14 15:31:35 2000 +0000

    get_last_login_time() called twice.

commit 6beac8c5a0b4ecbb92b252d49dc92528340ff993
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Oct 14 15:08:49 2000 +0000

    function prototype and definition consistency cleanup.

commit 092f2effc5a50e6aeb5059d2b02d5e7b9c03fb42
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Oct 14 13:36:13 2000 +0000

     - (stevesk) ~/.hushlogin shouldn't cause required password change to
        be bypassed.

commit f16b9d277383693fe7db29702a0b9763f9f14569
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Oct 14 10:57:04 2000 +0000

     - (stevesk) rijndael.c: cleanup missing declaration warnings.

commit cee23de1530f51b235776822cde011889518eb52
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Oct 14 10:51:18 2000 +0000

     - (stevesk) Include config.h in rijndael.c so we define intXX_t and
        u_intXX_t types on all platforms.

commit e4041c9d81e55cedcc4567f3840116900b5db85e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 14 17:45:58 2000 +1100

     - (djm) Fix scp user@host handling
     - (djm) Don't clobber ssh_prng_cmds on install

commit 874d77bb134a21a5cf625956b60173376a993ba8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 14 16:23:11 2000 +1100

     - (djm) Big OpenBSD sync:
       - markus@cvs.openbsd.org  2000/09/30 10:27:44
         [log.c]
         allow loglevel debug
       - markus@cvs.openbsd.org  2000/10/03 11:59:57
         [packet.c]
         hmac->mac
       - markus@cvs.openbsd.org  2000/10/03 12:03:03
         [auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c]
         move fake-auth from auth1.c to individual auth methods, disables s/key in
         debug-msg
       - markus@cvs.openbsd.org  2000/10/03 12:16:48
         ssh.c
         do not resolve canonname, i have no idea why this was added oin ossh
       - markus@cvs.openbsd.org  2000/10/09 15:30:44
         ssh-keygen.1 ssh-keygen.c
         -X now reads private ssh.com DSA keys, too.
       - markus@cvs.openbsd.org  2000/10/09 15:32:34
         auth-options.c
         clear options on every call.
       - markus@cvs.openbsd.org  2000/10/09 15:51:00
         authfd.c authfd.h
         interop with ssh-agent2, from <res@shore.net>
       - markus@cvs.openbsd.org  2000/10/10 14:20:45
         compat.c
         use rexexp for version string matching
       - provos@cvs.openbsd.org  2000/10/10 22:02:18
         [kex.c kex.h myproposal.h ssh.h ssh2.h sshconnect2.c sshd.c dh.c dh.h]
         First rough implementation of the diffie-hellman group exchange.  The
         client can ask the server for bigger groups to perform the diffie-hellman
         in, thus increasing the attack complexity when using ciphers with longer
         keys.  University of Windsor provided network, T the company.
       - markus@cvs.openbsd.org  2000/10/11 13:59:52
         [auth-rsa.c auth2.c]
         clear auth options unless auth sucessfull
       - markus@cvs.openbsd.org  2000/10/11 14:00:27
         [auth-options.h]
         clear auth options unless auth sucessfull
       - markus@cvs.openbsd.org  2000/10/11 14:03:27
         [scp.1 scp.c]
         support 'scp -o' with help from mouring@pconline.com
       - markus@cvs.openbsd.org  2000/10/11 14:11:35
         [dh.c]
         Wall
       - markus@cvs.openbsd.org  2000/10/11 14:14:40
         [auth.h auth2.c readconf.c readconf.h readpass.c servconf.c servconf.h]
         [ssh.h sshconnect2.c sshd_config auth2-skey.c cli.c cli.h]
         add support for s/key (kbd-interactive) to ssh2, based on work by
         mkiernan@avantgo.com and me
       - markus@cvs.openbsd.org  2000/10/11 14:27:24
         [auth.c auth1.c auth2.c authfile.c cipher.c cipher.h kex.c kex.h]
         [myproposal.h packet.c readconf.c session.c ssh.c ssh.h sshconnect1.c]
         [sshconnect2.c sshd.c]
         new cipher framework
       - markus@cvs.openbsd.org  2000/10/11 14:45:21
         [cipher.c]
         remove DES
       - markus@cvs.openbsd.org  2000/10/12 03:59:20
         [cipher.c cipher.h sshconnect1.c sshconnect2.c sshd.c]
         enable DES in SSH-1 clients only
       - markus@cvs.openbsd.org  2000/10/12 08:21:13
         [kex.h packet.c]
         remove unused
       - markus@cvs.openbsd.org  2000/10/13 12:34:46
         [sshd.c]
         Kludge for F-Secure Macintosh < 1.0.2; appro@fy.chalmers.se
       - markus@cvs.openbsd.org  2000/10/13 12:59:15
         [cipher.c cipher.h myproposal.h  rijndael.c rijndael.h]
         rijndael/aes support
       - markus@cvs.openbsd.org  2000/10/13 13:10:54
         [sshd.8]
         more info about -V
       - markus@cvs.openbsd.org  2000/10/13 13:12:02
         [myproposal.h]
         prefer no compression

commit 89d9796fbedef4eed6956a2c095c7cc25330c28d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 14 12:37:19 2000 +1100

    - (djm) Add workaround for Linux 2.4's gratuitious errno change. Patch
      from Martin Johansson <fatbob@acc.umu.se>

commit 15b2952cd83522051bafd23766ca1b75edfed124
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 14 12:33:48 2000 +1100

     - (djm) Revert SSH2 serverloop hack, will find a better way.

commit 60819b44bdd81b08844a29c9c70c32b19594b40b
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 14 11:16:12 2000 +1100

     - (djm) Don't accept PAM_PROMPT_ECHO_ON messages during initial auth

commit 48b7cc0dd7d166ea0ea76c6c2a1da26923e7ac32
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Oct 7 13:24:00 2000 +0000

     - (stevesk) Fix detection of pw_class struct member in configure;
        patch from KAMAHARA Junzo <kamahara@cc.kshosen.ac.jp>

commit cccca2789073abe1aa781978d25d1d2e7736aad4
Author: Kevin Steves <stevesk@pobox.com>
Date:   Sat Oct 7 11:16:55 2000 +0000

     - (stevesk) Print PAM return value in PAM log messages to aid
        with debugging.

commit e68f92bbf3241b00b4e16bda5f077843078587f6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Oct 2 21:42:15 2000 +1100

     - (djm) Add host system and CC to end-of-configure report. Suggested by
       Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit 05dd7950f9b05db92e138d3ddb0bdec7636000e2
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Oct 1 00:42:48 2000 +1100

     - (djm) Cygwin fixes from Corinna Vinschen <vinschen@cygnus.com>

commit 87f43ff889dba4377ea7f9052884b17e334089a2
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 30 21:36:54 2000 +1100

    Forgot to commit changelog from loginrec changes
    
     - (djm) Fix 9 character passphrase failure with gnome-ssh-askpass.
       Problem was caused by interrupted read in ssh-add. Report from Donald
       J. Barry <don@astro.cornell.edu>

commit f5a81473a9b9fbe90353eb72c49fb9fd2529c54a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 30 21:34:44 2000 +1100

     - (djm) Irix strips "/dev/tty" from [uw]tmp entries (other systems only
       strip "/dev/"). Fix loginrec.c based on patch from Alain St-Denis
       <Alain.St-Denis@ec.gc.ca>

commit 51155a70e74443e085b016a8c3fbfbf71ae56c76
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 30 14:41:38 2000 +1100

     - (djm) Add LICENSE to RPM spec files

commit 7294baaf6ab389fd206899d68a1ad400ba2f4508
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 30 14:40:39 2000 +1100

     - (djm) Forgot to cvs add LICENSE file

commit b27ef9e17a7a23f3e4eecee47b0345ad7a5fd361
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 30 14:29:44 2000 +1100

     - (djm) Add recent InitScripts as a RPM dependancy for openssh-server
       patch from Pekka Savola <pekkas@netcore.fi>

commit 29d646935cea43348f3a6c48147005eb9a188a9f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 30 14:20:11 2000 +1100

    forgot this

commit d344494346f60d8f8d94ed71f126f6541a80babc
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 30 14:20:03 2000 +1100

     - (djm) CVS OpenBSD sync:
       - markus@cvs.openbsd.org  2000/09/26 13:59:59
         [clientloop.c]
         use debug2
       - markus@cvs.openbsd.org  2000/09/27 15:41:34
         [auth2.c sshconnect2.c]
         use key_type()
       - markus@cvs.openbsd.org  2000/09/28 12:03:18
         [channels.c]
         debug -> debug2 cleanup

commit cf3888d396899f82a8ab1f60c6579cbc7887672c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 30 14:17:52 2000 +1100

     - (djm) Ignore SIGPIPEs from serverloop to child. Fixes crashes with
       very short lived X connections. Bug report from Tobias Oetiker
       <oetiker@ee.ethz.ch>. Fix from Markus Friedl <markus@cvs.openbsd.org>

commit b88532e38960cf3600591d92bc84e7d1cc21656f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 30 09:53:59 2000 +1100

    oops, forgot changelog

commit 3dfb0dd7fd3e792e73e27a213f53b3fe452b8e45
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 30 09:49:08 2000 +1100

     - (djm) Support in bsd-snprintf.c for long long conversions from
       Ben Lindstrom <mouring@pconline.com>
     - (djm) Cleanup NeXT support from Ben Lindstrom <mouring@pconline.com>

commit bea034a5bfcce67b1149b28a57c58a605170e68f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 30 09:43:32 2000 +1100

    oops

commit 190d5a8f3385b29d18761327b11312507ba97b26
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 30 09:43:19 2000 +1100

     - (djm) Irix ssh_prng_cmds path fix from Pekka Savola <pekkas@netcore.fi>

commit 78315eb6d6bf411b07d9e0bc1ede41fae9484f25
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 29 23:01:36 2000 +1100

     - (djm) Merged big SCO portability patch from Tim Rice
       <tim@multitalents.net>

commit cb5e44a440c1b310a9dc5b8b5abe32fe11ed479b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 29 12:12:36 2000 +1100

     - (djm) Clean up. Strip some unnecessary differences with OpenBSD's code,
       tidy necessary differences. Use Markus' new debugN() in entropy.c

commit 280e71bcb631d205fec33b1dd695263e2696a3f1
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 29 10:59:28 2000 +1100

    Forgot the changelog

commit e9edd7c3b57b3db9b85ff7ddde4593b19d5ea176
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 29 10:59:14 2000 +1100

     - (djm) Another off-by-one fix from Pavel Kankovsky
       <peak@argo.troja.mff.cuni.cz>

commit 15e7d4b64c237243657742cb50fead1062bbb92e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 29 10:57:35 2000 +1100

     - (djm) Fix SSH2 not terminating until all background tasks done problem.

commit ecf5830e8aff013f4274fafcfe77853749a69bf7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 26 13:13:26 2000 +1100

    fix fix

commit e772b684ccb1d7e8507059ba9cd86b1bc0c8609a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 26 13:10:37 2000 +1100

     - (djm) Security: fix off-by-one buffer overrun in fake-getnameinfo.c.
       Report and fix from Pavel Kankovsky <peak@argo.troja.mff.cuni.cz>

commit b2033a41a171641e52cc7ed942d9928470a8bbd2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 26 12:18:31 2000 +1100

     - (djm) Define _REENTRANT

commit 96f0c725fcaad49f6a5630f4d82e3902ef77e9f1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 26 12:09:48 2000 +1100

     - (djm) Update X11-askpass to 1.0.2 in RPM spec file

commit 89d3bd701b746b615dddd6d12efe3caa71ab209d
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 24 11:50:49 2000 +1100

    doh

commit 80ecfe8fb8dbbb89ba9edba6b0159ce9adea3f3e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 24 11:21:31 2000 +1100

     - (djm) Include strtok_r() from OpenBSD libc. Fixes report from Mark Miller
       <markm@swoon.net>

commit 72c9a7e958689740cb3449df5732e0956d52ef5b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 24 11:10:13 2000 +1100

     - (djm) Merged cleanup patch from Mark Miller <markm@swoon.net>
     - (djm) A bit more cleanup - created cygwin_util.h

commit 62cee00753ef8ce31b322ce6a14318cb974e883d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 23 17:15:56 2000 +1100

     - (djm) OpenBSD CVS sync:
       - markus@cvs.openbsd.org  2000/09/17 09:38:59
         [sshconnect2.c sshd.c]
         fix DEBUG_KEXDH
       - markus@cvs.openbsd.org  2000/09/17 09:52:51
         [sshconnect.c]
         yes no; ok niels@
       - markus@cvs.openbsd.org  2000/09/21 04:55:11
         [sshd.8]
         typo
       - markus@cvs.openbsd.org  2000/09/21 05:03:54
         [serverloop.c]
         typo
       - markus@cvs.openbsd.org  2000/09/21 05:11:42
         scp.c
         utime() to utimes(); mouring@pconline.com
       - markus@cvs.openbsd.org  2000/09/21 05:25:08
         sshconnect2.c
         change login logic in ssh2, allows plugin of other auth methods
       - markus@cvs.openbsd.org  2000/09/21 05:25:35
         [auth2.c channels.c channels.h clientloop.c dispatch.c dispatch.h]
         [serverloop.c]
         add context to dispatch_run
       - markus@cvs.openbsd.org  2000/09/21 05:07:52
         authfd.c authfd.h ssh-agent.c
         bug compat for old ssh.com software

commit f056e23dd6f7fad96afb9e0f5a64dce4f6045cc7
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 23 14:58:32 2000 +1100

     - (djm) Use printf %lld instead of %qd in sftp-server.c. Fix from
       Michael Stone <mstone@cs.loyola.edu>

commit b9c2ce8b3bbe71cf9cb5a127ed6d1cad633fc9f8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 23 14:52:50 2000 +1100

     - (djm) NeXT patch from Ben Lindstrom <mouring@pconline.com>

commit 62dd94b375446eb04aed1550c17eaf79717423d4
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 23 14:26:32 2000 +1100

     - (djm) Tweak password expiry checking at suggestion of Kevin Steves
       <stevesk@sweden.hp.com>

commit 578783e6bfb3cb81a63aa580f5641af010d73c72
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 23 14:12:24 2000 +1100

     - (djm) Seperate tests for int64_t and u_int64_t types

commit 9600233f0ff7a15c41da766da2f62b9e76565d71
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 23 14:00:09 2000 +1100

     - (djm) Redhat spec and manpage fixes from Pekka Savola <pekkas@netcore.fi>

commit d6f204d71f49d8c82794aa59c1dfe13157c58d69
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 23 13:57:27 2000 +1100

     - (djm) Fix address logging in utmp from Kevin Steves
       <stevesk@sweden.hp.com>

commit 337cf323f4332440b786366a879534db8b007549
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 23 13:55:03 2000 +1100

    Cleanup

commit f13f75da2e675ac6dd212c590828e358e9b29ecb
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Sep 21 21:51:07 2000 +1100

     - (djm) Fix bad path substitution. Report from Andrew Miner
       <asminer@cs.iastate.edu>

commit a1b61e11a71ffc371272a2ecb516e52cc6e32fa9
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 16 17:02:16 2000 +1100

     - (djm) Fix SSL search order from Lutz Jaenicke
       <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit 2efcd3c35426df7f57ab2c5890c1fa3fd5a3e1e4
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 16 16:30:55 2000 +1100

     - (djm) New SuSE spec from Corinna Vinschen <corinna@vinschen.de>

commit f3b1c54844f9364b25b343d7399dd1ee5740d28d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 16 16:25:24 2000 +1100

    bye bye

commit b70b61f5fecf37d95e031414849745030fa8a420
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 16 16:25:12 2000 +1100

     - (djm) Update CygWin support from Corinna Vinschen <vinschen@cygnus.com>

commit 52cbcbf0bb5ee685f77449f68c59926320bfe85f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 16 16:21:28 2000 +1100

     - (djm) Use a real struct sockaddr inside the fake struct sockaddr_storage.
       Patch from Larry Jones <larry.jones@sdrc.com>

commit aeaa1264b5e95bb6aa2fc8eabf115c28d7c02398
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 16 16:10:56 2000 +1100

    Fix fixprogs

commit 9d5705a4b34f09a02cffb751d0be076bf667c8bc
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 16 16:09:27 2000 +1100

     - (djm) Add Steve VanDevender's <stevev@darkwing.uoregon.edu> PAM
       password change patch.
     - (djm) Bring licenses on my stuff in line with OpenBSD's

commit 8a1e6a629e6c712a0f24451b93c293536ad864e6
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 16 15:55:52 2000 +1100

     - (djm) Cleanup auth-passwd.c and unify HP/UX authentication. Patch from
       Kevin Steves <stevesk@sweden.hp.com>

commit 606f880e0fd1a31f5beb3b37ece0c12317a9ed61
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 16 15:39:56 2000 +1100

     - (djm) Shadow expiry check fix from Pavel Troller <patrol@omni.sinus.cz>
     - (djm) Re-enable int64_t types - we need them for sftp
     - (djm) Use libexecdir from configure , rather than libexecdir/ssh
     - (djm) Update Redhat SPEC file accordingly
     - (djm) Add Kevin Steves <stevesk@sweden.hp.com> HP/UX contrib files
     - (djm) Add Charles Levert <charles@comm.polymtl.ca> getpgrp patch
     - (djm) Fix password auth on HP/UX 10.20. Patch from Dirk De Wachter
       <Dirk.DeWachter@rug.ac.be>
     - (djm) Fixprogs and entropy list fixes from Larry Jones
       <larry.jones@sdrc.com>
     - (djm) Fix for SuSE spec file from Takashi YOSHIDA
       <tyoshida@gemini.rc.kyushu-u.ac.jp>

commit e4340be5b3ff16f4d9ba5e3ea7e449dc1b6fa7a8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 16 13:29:08 2000 +1100

     - (djm) Merge OpenBSD changes:
       - markus@cvs.openbsd.org  2000/09/05 02:59:57
         [session.c]
         print hostname (not hushlogin)
       - markus@cvs.openbsd.org  2000/09/05 13:18:48
         [authfile.c ssh-add.c]
         enable ssh-add -d for DSA keys
       - markus@cvs.openbsd.org  2000/09/05 13:20:49
         [sftp-server.c]
         cleanup
       - markus@cvs.openbsd.org  2000/09/06 03:46:41
         [authfile.h]
         prototype
       - deraadt@cvs.openbsd.org 2000/09/07 14:27:56
         [ALL]
         cleanup copyright notices on all files.  I have attempted to be
         accurate with the details.  everything is now under Tatu's licence
         (which I copied from his readme), and/or the core-sdi bsd-ish thing
         for deattack, or various openbsd developers under a 2-term bsd
         licence.  We're not changing any rules, just being accurate.
       - markus@cvs.openbsd.org  2000/09/07 14:40:30
         [channels.c channels.h clientloop.c serverloop.c ssh.c]
         cleanup window and packet sizes for ssh2 flow control; ok niels
       - markus@cvs.openbsd.org  2000/09/07 14:53:00
         [scp.c]
         typo
       - markus@cvs.openbsd.org  2000/09/07 15:13:37
         [auth-options.c auth-options.h auth-rh-rsa.c auth-rsa.c auth.c]
         [authfile.h canohost.c channels.h compat.c hostfile.h log.c match.h]
         [pty.c readconf.c]
         some more Copyright fixes
       - markus@cvs.openbsd.org  2000/09/08 03:02:51
         [README.openssh2]
         bye bye
       - deraadt@cvs.openbsd.org 2000/09/11 18:38:33
         [LICENCE cipher.c]
         a few more comments about it being ARC4 not RC4
       - markus@cvs.openbsd.org  2000/09/12 14:53:11
         [log-client.c log-server.c log.c ssh.1 ssh.c ssh.h sshd.8 sshd.c]
         multiple debug levels
       - markus@cvs.openbsd.org  2000/09/14 14:25:15
         [clientloop.c]
         typo
       - deraadt@cvs.openbsd.org 2000/09/15 01:13:51
         [ssh-agent.c]
         check return value for setenv(3) for failure, and deal appropriately

commit f384c366d33cb435627743f7ea0ed3f966543d40
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Sep 13 10:43:26 2000 +1100

     - (djm) Fix server not exiting with jobs in background.

commit bac2d8aa5e642a70045e713853b13d020b9c5d57
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 5 16:13:06 2000 +1100

     - (djm) Merge cygwin support from Corinna Vinschen <vinschen@cygnus.com>

commit 676092fad0b6edca8f1fe731d7c3a000465a9bef
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 5 14:16:18 2000 +1100

    Fix spec files

commit 7b28dc5eb0b4d766ddbf5c1955de7e4edbe50e7c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Sep 5 13:34:53 2000 +1100

    20000905
     - (djm) Import OpenBSD CVS changes
       - markus@cvs.openbsd.org  2000/08/31 15:52:24
         [Makefile sshd.8 sshd_config sftp-server.8 sftp-server.c]
         implement a SFTP server. interops with sftp2, scp2 and the windows
         client from ssh.com
       - markus@cvs.openbsd.org  2000/08/31 15:56:03
         [README.openssh2]
         sync
       - markus@cvs.openbsd.org  2000/08/31 16:05:42
         [session.c]
         Wall
       - markus@cvs.openbsd.org  2000/08/31 16:09:34
         [authfd.c ssh-agent.c]
         add a flag to SSH2_AGENTC_SIGN_REQUEST for future extensions
       - deraadt@cvs.openbsd.org 2000/09/01 09:25:13
         [scp.1 scp.c]
         cleanup and fix -S support; stevesk@sweden.hp.com
       - markus@cvs.openbsd.org  2000/09/01 16:29:32
         [sftp-server.c]
         portability fixes
       - markus@cvs.openbsd.org  2000/09/01 16:32:41
         [sftp-server.c]
         fix cast; mouring@pconline.com
       - itojun@cvs.openbsd.org  2000/09/03 09:23:28
         [ssh-add.1 ssh.1]
         add missing .El against .Bl.
       - markus@cvs.openbsd.org  2000/09/04 13:03:41
         [session.c]
         missing close; ok theo
       - markus@cvs.openbsd.org  2000/09/04 13:07:21
         [session.c]
         fix get_last_login_time order; from andre@van-veen.de
       - markus@cvs.openbsd.org  2000/09/04 13:10:09
         [sftp-server.c]
         more cast fixes; from mouring@pconline.com
       - markus@cvs.openbsd.org  2000/09/04 13:06:04
         [session.c]
         set SSH_ORIGINAL_COMMAND; from Leakin@dfw.nostrum.com, bet@rahul.net
     - (djm) Cleanup after import. Fix sftp-server compilation, Makefile

commit 123cbe8e86b1f6e4c4dc016e76dcac1616971089
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Sep 3 19:14:58 2000 +1100

    Fix init script

commit 1a425f3eeb6e9745ee117669b47053459361d714
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Sep 2 10:08:09 2000 +1100

    Missing OpenBSD diff hunks

commit 50f14f87478f3b9a22e9c91a29b9be6df8e5be3b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Sep 1 14:14:37 2000 +1100

     - (djm) Pick up Jim's new X11-askpass
     - (djm) Release 2.2.0p1

commit efcd54a51d59aa7f5a0a1688dbfc421372257c69
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 31 11:53:44 2000 +1100

    Pickup version update

commit b5c42d98b308d2c0c8590f23bb903159299ce262
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 31 11:13:10 2000 +1100

     - (djm) Pick up new version (2.2.0) from OpenBSD CVS

commit 238a9fa8d04dca849201b8f664cb447f2f841c5d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Aug 31 09:20:05 2000 +1100

     - (djm) Workaround SIGPIPE problems on SCO. Fix from Aran Cox
       <acox@cv.telegroup.com>

commit 250ee8b3ef36a9116360c088c7a73bc77bf81afd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 14:06:35 2000 +1100

     - (djm) Fix doh in bsd-arc4random.c

commit 77aba9d02490a7cac75c15d44ef6f9a9a79d3fbf
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 10:11:30 2000 +1100

     - (djm) NeXT patch from Ben Lindstrom <mouring@pconline.com>

commit 9a94734d25ff8a632fd1dd3114d64e79a99474ba
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 10:03:33 2000 +1100

     - (djm) Fix printing of $DISPLAY hack if set by system type. Report from
       Kevin Steves <stevesk@sweden.hp.com>

commit 7cfaaf234f5fad764962462508293a81dc577782
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 09:57:49 2000 +1100

     - (djm) Quieten the pam delete credentials error message

commit 5552d7addf529138b4772974afb2ce2a37de33bc
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 09:53:24 2000 +1100

     - (djm) HPUX 11 needs USE_PIPES as well: Kevin Steves
       <stevesk@sweden.hp.com>

commit c30d35ce3234371c20a388d81b4bafd389d3019f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 09:40:09 2000 +1100

     - (djm) Periodically rekey arc4random
     - (djm) Clean up diff against OpenBSD.

commit 87d29ed405ce6a6aa56660c9c696f6b78a709034
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 30 09:21:22 2000 +1100

     - (djm) Compile warning fixes from Mark Miller <markm@swoon.net>

commit e5192fafbfbc49afaa64c7b9f3c8d90efe2f1297
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 29 14:30:37 2000 +1100

     - (djm) NeXT tweaks from Ben Lindstrom <mouring@pconline.com>

commit 6d8c11f627d75f5e48dfcb23c0fe9e65a7b522eb
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 29 11:52:38 2000 +1100

     - (djm) Check for SCO pty naming style (ptyp%d/ttyp%d). Based on fix from
       Bastian Trompetter <btrompetter@firemail.de>

commit caf6dd6d219e916e2784b3c884a7f2ce8784df37
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 29 11:33:50 2000 +1100

     - More OpenBSD updates:
       - deraadt@cvs.openbsd.org 2000/08/24 15:46:59
         [scp.c]
         off_t in sink, to fix files > 2GB, i think, test is still running ;-)
       - deraadt@cvs.openbsd.org 2000/08/25 10:10:06
         [session.c]
         Wall
       - markus@cvs.openbsd.org  2000/08/26 04:33:43
         [compat.c]
         ssh.com-2.3.0
       - markus@cvs.openbsd.org  2000/08/27 12:18:05
         [compat.c]
         compatibility with future ssh.com versions
       - deraadt@cvs.openbsd.org 2000/08/27 21:50:55
         [auth-krb4.c session.c ssh-add.c sshconnect.c uidswap.c]
         print uid/gid as unsigned
       - markus@cvs.openbsd.org  2000/08/28 13:51:00
         [ssh.c]
         enable -n and -f for ssh2
       - markus@cvs.openbsd.org  2000/08/28 14:19:53
         [ssh.c]
         allow combination of -N and -f
       - markus@cvs.openbsd.org  2000/08/28 14:20:56
         [util.c]
         util.c
       - markus@cvs.openbsd.org  2000/08/28 14:22:02
         [util.c]
         undo
       - markus@cvs.openbsd.org  2000/08/28 14:23:38
         [util.c]
         don't complain if setting NONBLOCK fails with ENODEV

commit 4e0f5e1ec9b6318ef251180dbca50eaa01f74536
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 29 11:05:50 2000 +1100

     - (djm) Fix ^C ignored issue on Solaris. Diagnosis from Gert
       Doering <gert@greenie.muc.de>, John Horne <J.Horne@plymouth.ac.uk> and
       Garrick James <garrick@james.net>

commit f3df05248675a2be76c72a0cd92f3b8f8f26af7b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 23 15:31:41 2000 +1000

     - (djm) Don't reseed arc4random everytime it is used

commit 37e7f186a51198d355af8bc806ebd2d2f7d99030
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 23 10:52:50 2000 +1000

     - (djm) Add local version to version.h

commit ad833b3e65c1887674714d514eb818d862bb499a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 23 10:46:23 2000 +1000

     - (djm) Pick up LOGIN_PROGRAM from environment or PATH if not set by headers
     - (djm) OpenBSD CVS updates:
       - deraadt@cvs.openbsd.org 2000/08/18 20:07:23
         [ssh.c]
         accept remsh as a valid name as well; roman@buildpoint.com
       - deraadt@cvs.openbsd.org 2000/08/18 20:17:13
         [deattack.c crc32.c packet.c]
         rename crc32() to ssh_crc32() to avoid zlib name clash.  do not move to
         libz crc32 function yet, because it has ugly "long"'s in it;
         oneill@cs.sfu.ca
       - deraadt@cvs.openbsd.org 2000/08/18 20:26:08
         [scp.1 scp.c]
         -S prog support; tv@debian.org
       - deraadt@cvs.openbsd.org 2000/08/18 20:50:07
         [scp.c]
         knf
       - deraadt@cvs.openbsd.org 2000/08/18 20:57:33
         [log-client.c]
         shorten
       - markus@cvs.openbsd.org  2000/08/19 12:48:11
         [channels.c channels.h clientloop.c ssh.c ssh.h]
         support for ~. in ssh2
       - deraadt@cvs.openbsd.org 2000/08/19 15:29:40
         [crc32.h]
         proper prototype
       - markus@cvs.openbsd.org  2000/08/19 15:34:44
         [authfd.c authfd.h key.c key.h ssh-add.1 ssh-add.c ssh-agent.1]
         [ssh-agent.c ssh-keygen.c sshconnect1.c sshconnect2.c Makefile]
         [fingerprint.c fingerprint.h]
         add SSH2/DSA support to the agent and some other DSA related cleanups.
         (note that we cannot talk to ssh.com's ssh2 agents)
       - markus@cvs.openbsd.org  2000/08/19 15:55:52
         [channels.c channels.h clientloop.c]
         more ~ support for ssh2
       - markus@cvs.openbsd.org  2000/08/19 16:21:19
         [clientloop.c]
         oops
       - millert@cvs.openbsd.org 2000/08/20 12:25:53
         [session.c]
         We have to stash the result of get_remote_name_or_ip() before we
         close our socket or getpeername() will get EBADF and the process
         will exit.  Only a problem for "UseLogin yes".
       - millert@cvs.openbsd.org 2000/08/20 12:30:59
         [session.c]
         Only check /etc/nologin if "UseLogin no" since login(1) may have its
         own policy on determining who is allowed to login when /etc/nologin
         is present.  Also use the _PATH_NOLOGIN define.
       - millert@cvs.openbsd.org 2000/08/20 12:42:43
         [auth1.c auth2.c session.c ssh.c]
         Add calls to setusercontext() and login_get*().  We basically call
         setusercontext() in most places where previously we did a setlogin().
         Add default login.conf file and put root in the "daemon" login class.
       - millert@cvs.openbsd.org 2000/08/21 10:23:31
         [session.c]
         Fix incorrect PATH setting; noted by Markus.

commit b078567bf5de1dcf12d265d98acb4dc9eba8b325
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 23 09:10:39 2000 +1000

     - (djm) Define USE_PIPES to avoid socketpair problems on HPUX 10 and SunOS 4
       Avoids "scp never exits" problem. Reports from Lutz Jaenicke
       <Lutz.Jaenicke@aet.TU-Cottbus.DE> and Tamito KAJIYAMA
       <kajiyama@grad.sccs.chukyo-u.ac.jp>

commit 3241fa15eab83af79bfda709ffe6d235705d614d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 18 14:59:59 2000 +1000

     - (djm) SUN_LEN macro for systems which lack it

commit a7f58293f7340fc022c025b482614d5bd8dada50
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 18 14:43:41 2000 +1000

     - (djm) Add Solaris package support from Rip Loomis <loomisg@cist.saic.com>

commit 681062a6b347383768ddf62c30ca468c2829c329
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 18 14:38:43 2000 +1000

    forgot to remove

commit c1132e77590706c9e8bf56673a05f1a8b668bc76
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 18 14:08:38 2000 +1000

     - (djm) Lastlog was not getting closed after writing login entry

commit 61c51508615381765249e6ef1f9f843de2f3d5b6
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 18 14:01:04 2000 +1000

    Forgot to add

commit 942da039d2a05e6f491883f50b516175a6dbb20f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Aug 18 13:59:06 2000 +1000

     - (djm) OpenBSD CVS changes:
       - markus@cvs.openbsd.org  2000/07/22 03:14:37
         [servconf.c servconf.h sshd.8 sshd.c sshd_config]
         random early drop; ok theo, niels
       - deraadt@cvs.openbsd.org 2000/07/26 11:46:51
         [ssh.1]
         typo
       - deraadt@cvs.openbsd.org 2000/08/01 11:46:11
         [sshd.8]
         many fixes from pepper@mail.reppep.com
       - provos@cvs.openbsd.org  2000/08/01 13:01:42
         [Makefile.in util.c aux.c]
         rename aux.c to util.c to help with cygwin port
       - deraadt@cvs.openbsd.org 2000/08/02 00:23:31
         [authfd.c]
         correct sun_len; Alexander@Leidinger.net
       - provos@cvs.openbsd.org  2000/08/02 10:27:17
         [readconf.c sshd.8]
         disable kerberos authentication by default
       - provos@cvs.openbsd.org  2000/08/02 11:27:05
         [sshd.8 readconf.c auth-krb4.c]
         disallow kerberos authentication if we can't verify the TGT; from
         dugsong@
         kerberos authentication is on by default only if you have a srvtab.
       - markus@cvs.openbsd.org  2000/08/04 14:30:07
         [auth.c]
         unused
       - markus@cvs.openbsd.org  2000/08/04 14:30:35
         [sshd_config]
         MaxStartups
       - markus@cvs.openbsd.org  2000/08/15 13:20:46
         [authfd.c]
         cleanup; ok niels@
       - markus@cvs.openbsd.org  2000/08/17 14:05:10
         [session.c]
         cleanup login(1)-like jobs, no duplicate utmp entries
       - markus@cvs.openbsd.org  2000/08/17 14:06:34
         [session.c sshd.8 sshd.c]
          sshd -u len, similar to telnetd

commit 11fa2cc3839b1e7fed1d85aa1158cce4d498bc58
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 16 10:35:58 2000 +1000

     - (djm) Replacement for inet_ntoa for Irix (which breaks on gcc)
     - (djm) Fix strerror replacement for old SunOS. Based on patch from
       Charles Levert <charles@comm.polymtl.ca>
     - (djm) Seperate arc4random into seperate file and use OpenSSL's RC4
       implementation.

commit 0da2eaaf06e8d05862dcce34cc8c7d1a0740de7c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 15 11:32:59 2000 +1000

     - (djm) Fix AIX limits from Alexandre Oliva <oliva@lsd.ic.unicamp.br>

commit e477ef65294501de06096cfecb6cfcc923f634f5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 15 10:21:17 2000 +1000

     - (djm) Don't seek in directory based lastlogs
     - (djm) Fix --with-ipaddr-display configure option test. Patch from
       Jarno Huuskonen <jhuuskon@messi.uku.fi>

commit c83aa8378447861b1bc0a030fdb32f78783dc979
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 15 10:08:00 2000 +1000

     - (djm) Avoid failures on Irix when ssh is not setuid. Fix from
       Michael Stone <mstone@cs.loyola.edu>

commit 348c9b7a9564986000743fe379de21ae6f73f7d4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 15 10:01:22 2000 +1000

     - (djm) More SunOS 4.1.x fixes from Nate Itkin <nitkin@europa.com>

commit ef7ed5eadf75a06fd9d9cd9868cd5f4072ae9e56
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Aug 13 10:31:12 2000 +1000

     - (djm) Add $(srcdir) to includes when compiling (for VPATH). Report from
       Fabrice bacchella <fabrice.bacchella@marchfirst.fr>

commit 36ccb5c4f306784c9ceacf5ef5014ae06c9545de
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 9 16:34:27 2000 +1000

     - (djm) utmp direct write & SunOS 4 patch from Charles Levert
       <charles@comm.polymtl.ca>

commit d17b8d5aee2dfac46514b67b709ebca03b6fec25
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Aug 9 14:42:28 2000 +1000

     - (djm) Define AIX hard limits if headers don't. Report from
       Bill Painter <william.t.painter@lmco.com>

commit ab8d1921f4598baa9b8596d7f8b6bbded9acfb33
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Aug 8 16:53:28 2000 +1000

     - (djm) Cleanup Redhat RPMs. Generate keys at runtime rather than install
       time, spec file cleanup.

commit 52652f5cef3d2a4441117cde95855d039a866bbe
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 7 15:54:39 2000 +1000

     - (djm) Add some more entropy collection commands from Lutz Jaenicke

commit 0f091bd1fc9724eb7c2f8df8ad333b5390b2e639
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 7 15:47:48 2000 +1000

     - (djm) Suppress error messages on channel close shutdown() failurs
       works around Linux bug. Patch from Zack Weinberg <zack@wolery.cumb.org>

commit 729e1f15d8ce40d67e94bf8bd142fa67acce9a96
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Aug 7 15:39:13 2000 +1000

    Set mode 0755 during install

commit 7b60a17f14304bd8f46c1d6b2e20382f54d79014
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 25 09:04:37 2000 +1000

     - (djm) Fix autoconf typo: HAVE_BINRESVPORT_AF -> HAVE_BINDRESVPORT_AF

commit 994cf1426d176e2ee9ba310416544c325e04b155
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jul 21 10:19:44 2000 +1000

     - (djm) OpenBSD CVS updates:
       - markus@cvs.openbsd.org  2000/07/16 02:27:22
         [authfd.c authfd.h channels.c clientloop.c ssh-add.c ssh-agent.c ssh.c]
         [sshconnect1.c sshconnect2.c]
         make ssh-add accept dsa keys (the agent does not)
       - djm@cvs.openbsd.org     2000/07/17 19:25:02
         [sshd.c]
         Another closing of stdin; ok deraadt
       - markus@cvs.openbsd.org  2000/07/19 18:33:12
         [dsa.c]
         missing free, reorder
       - markus@cvs.openbsd.org  2000/07/20 16:23:14
         [ssh-keygen.1]
         document input and output files

commit 9dec7762798a4f9268e6033945c6dde44925d853
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jul 20 10:00:59 2000 +1000

     - Spec file fix from Petr Novotny <Petr.Novotny@antek.cz>

commit a8dbd9d88f03235d13528d57b5fae90c35c9c718
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 16 13:25:00 2000 +1000

    2.1.1p4

commit ecbb26d3d4490968b5c86e82c286b3d75ad8091e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 15 14:59:14 2000 +1000

     - Fixes for SunOS 4.1.4 from Gordon Atwood <gordon@cs.ualberta.ca>
       - Include floatingpoint.h for entropy.c
       - strerror replacement

commit be484b5d9889ca636fecdf1f6b73ddfbe4cce3c9
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 15 14:14:16 2000 +1000

     - (djm) OpenBSD CVS updates
       - provos@cvs.openbsd.org  2000/07/13 16:53:22
         [aux.c readconf.c servconf.c ssh.h]
         allow multiple whitespace but only one '=' between tokens, bug report from
         Ralf S. Engelschall <rse@engelschall.com> but different fix. okay deraadt@
       - provos@cvs.openbsd.org  2000/07/13 17:14:09
         [clientloop.c]
         typo; todd@fries.net
       - provos@cvs.openbsd.org  2000/07/13 17:19:31
         [scp.c]
         close can fail on AFS, report error; from Greg Hudson <ghudson@mit.edu>
       - markus@cvs.openbsd.org  2000/07/14 16:59:46
         [readconf.c servconf.c]
         allow leading whitespace. ok niels
       - djm@cvs.openbsd.org     2000/07/14 22:01:38
         [ssh-keygen.c ssh.c]
         Always create ~/.ssh with mode 700; ok Markus

commit 055dc369837e1bde0f84a7ecfe669e4e44f10db9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 12 21:20:23 2000 +1000

    Diff hunk which slipped thru

commit 2e7ba69450e280ff5c3063eb6e6c65281da8d9ed
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 12 21:10:23 2000 +1000

     - (djm) Released 2.1.1p3

commit 5a119bc02f951b7e1675b9e4b5cada0d458cf77e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 12 14:34:11 2000 +1000

     - (djm) Make building of X11-Askpass and GNOME-Askpass optional in RPM
       spec file.

commit 5de43db7ed609edf8b599721b769baeae2838d4b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 12 11:12:55 2000 +1000

     - (djm) Replace in_addr_t with u_int32_t in bsd-inet_aton.c. Report from
       Ben Lindstrom <mouring@pconline.com>

commit 182ee6e6d9b13f0a117a19bd4b9e3318a74233eb
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 12 09:45:27 2000 +1000

     - (djm) OpenBSD CVS Updates:
       - deraadt@cvs.openbsd.org 2000/07/11 02:11:34
         [session.c sshd.c ]
         make MaxStartups code still work with -d; djm
       - deraadt@cvs.openbsd.org 2000/07/11 13:17:45
         [readconf.c ssh_config]
         disable FallBackToRsh by default

commit b2dc28e9c8584884fda5fb8bfef1125ecac78628
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jul 12 09:18:33 2000 +1000

     - (djm) Remove libsocket from ReliantUnix link list (avoids warning).
       Patch from Udo Schweigert <ust@cert.siemens.de>

commit 32153a557a41ad1b95e7c18efc0a433002f067d4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 21:37:35 2000 +1000

    Add strsep header

commit 3077fb9e6b642a2531754b451bba25245d20dfac
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 21:34:34 2000 +1000

     - (djm) Add strsep function from OpenBSD libc for systems that lack it

commit 54ba469f20ff65fad2cc011ba2f83b17dce002f4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 18:39:20 2000 +1000

     - (djm) Don't generate host keys when $(DESTDIR) is set (e.g. during RPM
       builds)

commit 4d97ba22570f1edebeed41ce33f7ca06475a173f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 18:15:50 2000 +1000

     - (djm) Fix problem with debug mode and MaxStartups

commit 3702396526a2569402696ff7d7c6d0fe2e5a447b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 17:31:38 2000 +1000

     - (djm) OpenBSD CVS updates:
       - markus@cvs.openbsd.org  2000/06/26 03:22:29
         [authfd.c]
         cleanup, less cut&paste
       - markus@cvs.openbsd.org  2000/06/26 15:59:19
         [servconf.c servconf.h session.c sshd.8 sshd.c]
         MaxStartups: limit number of unauthenticated connections, work by
         theo and me
       - deraadt@cvs.openbsd.org 2000/07/05 14:18:07
         [session.c]
         use no_x11_forwarding_flag correctly; provos ok
       - provos@cvs.openbsd.org  2000/07/05 15:35:57
         [sshd.c]
         typo
       - aaron@cvs.openbsd.org   2000/07/05 22:06:58
         [scp.1 ssh-agent.1 ssh-keygen.1 sshd.8]
         Insert more missing .El directives. Our troff really should identify
         these and spit out a warning.
       - todd@cvs.openbsd.org    2000/07/06 21:55:04
         [auth-rsa.c auth2.c ssh-keygen.c]
         clean code is good code
       - deraadt@cvs.openbsd.org 2000/07/07 02:14:29
         [serverloop.c]
         sense of port forwarding flag test was backwards
       - provos@cvs.openbsd.org  2000/07/08 17:17:31
         [compat.c readconf.c]
         replace strtok with strsep; from David Young <dyoung@onthejob.net>
       - deraadt@cvs.openbsd.org 2000/07/08 19:21:15
         [auth.h]
         KNF
       - ho@cvs.openbsd.org      2000/07/08 19:27:33
         [compat.c readconf.c]
         Better conditions for strsep() ending.
       - ho@cvs.openbsd.org      2000/07/10 10:27:05
         [readconf.c]
         Get the correct message on errors. (niels@ ok)
       - ho@cvs.openbsd.org      2000/07/10 10:30:25
         [cipher.c kex.c servconf.c]
         strtok() --> strsep(). (niels@ ok)

commit bc33bd44a2ef165dea1d974fc2d80b822ae08c2a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 14:59:08 2000 +1000

     - (djm) Misc NeXT fixes from Ben Lindstrom <mouring@pconline.com>

commit 3b9734c700be8a31dc0966e58abe904b01da6492
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 14:54:22 2000 +1000

     - (djm) Added bsd-inet_aton and configure support for NeXT

commit 34e64baa92c059bb1eb075cff5325cde76db9d5d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 14:46:29 2000 +1000

     - (djm) Added bsd-inet_aton for NeXT

commit a4b9ed11163df10f5a41ddff12d360d68edbe07c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 12:55:49 2000 +1000

    Doh - forgot to commit

commit 5c8b2501f7276af61008a7bdefebf992c3c5394a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 12:50:08 2000 +1000

    Added missing ;

commit 5d879bc8eae46783719793ca97787f902fd4a1e7
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 12:23:51 2000 +1000

    Prepare for 2.1.1p3

commit 168e6ac81c024846eac3b7a36a3a1c4d02ff3e3e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 12:23:01 2000 +1000

     - (djm) Replaced bsd-snprintf.c with one from Mutt source tree, it is known
       to compile on more platforms (incl NeXT).

commit 7a0e5dc9811b6d33aa3f0bfe26af9a1af2884c8c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 12:15:54 2000 +1000

     - (djm) Fix broken inet_ntoa check and ut_user/ut_name confusion, report
       from Jim Watt <jimw@peisj.pebio.com>

commit 99bca607dc48d9a96285cfc224cd9e883b246151
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 12:02:36 2000 +1000

     - (djm) NeXT: dirent structures to get scp working from Ben Lindstrom
       <mouring@pconline.com>

commit 2ae714f44a0757b8c9771aa686ead98738a3f960
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 09:29:50 2000 +1000

     - (djm) ReliantUNIX support from Udo Schweigert <ust@cert.siemens.de>

commit 65964d60827c9927ab9569a8a4bcd61459651e3a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jul 11 09:16:22 2000 +1000

     - (djm) Fixup for AIX getuserattr() support from Tom Bertelson
       <tbert@abac.com>

commit 39c0a1c4c2b6a6d03a28896db5e7ab0158ed5799
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 9 23:55:08 2000 +1000

    oops, forgot the Changelog

commit 5fc8565d2088322eb8bf6fedf44ad15511028c08
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 9 23:53:07 2000 +1000

     - (djm) AIX getuserattr() session initialisation from Tom Bertelson
       <tbert@abac.com>

commit 31abc9addbf23675eb094638c83c6279437b6a50
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 9 23:26:27 2000 +1000

     - (djm) More NeXT compatibility from Ben Lindstrom <mouring@pconline.com>
       Including sigaction() et al. replacements

commit f9b625c36e3dea521c02919e90ac2ddcfd19b06a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 9 22:42:32 2000 +1000

     - (djm) Fix pam sprintf fix
     - (djm) Cleanup entropy collection code a little more. Split initialisation
       from seeding, perform intialisation immediatly at start, be careful with
       uids. Based on problem report from Jim Watt <jimw@peisj.pebio.com>

commit b38ea865261491e7ef42eb72eb1466bfa8aeefc3
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 9 21:37:49 2000 +1000

     - (djm) Replace ut_name with ut_user. Patch from Jim Watt
       <jimw@peisj.pebio.com>

commit 0100627fc8fda8b3be42789972a8d9f0e339134c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 9 21:29:37 2000 +1000

     - (djm) Missing $(DESTDIR) on host-key target causing problems with RPM
       builds. Problem report from Gregory Leblanc <GLeblanc@cu-portland.edu>

commit 8148fa3bd328e6d3f35a411658a3acf9b36bf30a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 9 21:23:52 2000 +1000

     - (djm) Match prototype and function declaration for rresvport_af.
       Problem report from Niklas Edmundsson <nikke@ing.umu.se>

commit 4e99720563ae850c5d5a1c86e45ac51173fbef9c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 9 21:21:52 2000 +1000

     - (djm) Only enable PAM_TTY kludge for Linux. Problem report from
       Kevin Steves <stevesk@sweden.hp.com>

commit 8e394e7ed51a2fcdd5088e1c8fcc8b5b8033eb85
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 8 11:50:37 2000 +1000

     - (djm) Don't use inet_addr.

commit f2fdbe5540c3954bd62a6ec6d701132a65110d27
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 8 10:57:08 2000 +1000

     - (djm) Handle EWOULDBLOCK returns from read() and write() in atomicio.c
       Fix from Marquess, Steve Mr JMLFDC <Steve.Marquess@DET.AMEDD.ARMY.MIL>

commit fe668e4b1636aed7d1adb7c0aaaa07a9b6277421
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 8 10:44:13 2000 +1000

    *** empty log message ***

commit 90dcc0590d4ea2bfbfb93f83aab51f2ecf2e88f0
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 8 10:17:40 2000 +1000

     - (djm) Fix incorrect configure handling of --with-rsh-path option. Fix from
       Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit ce40c70f1730c2044f9115db157e0546ff351992
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 8 10:14:08 2000 +1000

     - (djm) Fix bad fprintf format handling in auth-pam.c. Patch from
       Aaron Hopkins <aaron@die.net>

commit 0809a0a58690db191971e7a996f1daa1d9dcef64
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 2 19:33:54 2000 +1000

    Forgot to comment

commit 484118ea0f6871c2429c45f0736ba07b8289561d
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 2 19:13:56 2000 +1000

     - (djm) Use standard OpenSSL functions in auth-skey.c. Patch from
       Chris, the Young One <cky@pobox.com>

commit c708843e6a209b1c1f1a6d3e60b29be56d1d8894
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 2 18:44:54 2000 +1000

     - (djm) Stop shadow expiry checking from preventing logins with NIS. Based
       on fix from HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp>

commit 9b6d4ab8f9af7bd503ef304b7ffa9d8d77bb21f1
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jul 2 08:43:18 2000 +1000

     - (djm) Fix brace mismatch from Corinna Vinschen <vinschen@cygnus.com>

commit c92709967e32093611b6e2103a249c652c66fe01
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 1 19:42:32 2000 +1000

    Release 2.1.1p2

commit cb170cb225e62f6deda4911f0fbab2d6cd6b8062
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 1 16:52:55 2000 +1000

     - (djm) Added check for broken snprintf() functions which do not correctly
       terminate output string and attempt to use replacement.

commit 28adeef966d890b5831d831b1f0e1100c9db5b0a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 1 13:29:26 2000 +1000

     - (djm) Replace "/bin/sh" with _PATH_BSHELL. Report from Corinna Vinschen
       <vinschen@cygnus.com>
     - (djm) Replace "/usr/bin/login" with LOGIN_PROGRAM

commit 7b413d2d1702997152051a54dcda984e288eeea5
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 1 13:24:21 2000 +1000

     - (djm) Replace "/bin/sh" with _PATH_BSHELL
     - (djm) Replace "/usr/bin/login" with LOGIN_PROGRAM

commit 8e81ed3081412b3525d6819216ec3eb3f8b65c7e
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 1 13:17:42 2000 +1000

     - (djm) Login fixes from Tom Bertelson <tbert@abac.com>

commit d8cfda6bf6db6db50a4f644ad39138b7f1e3e33f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jul 1 12:56:09 2000 +1000

     - (djm) Fix Tru64 SIA problems reported by John P Speno <speno@isc.upenn.edu>

commit b8c656e744a0a9110e5eb0ea5a6587efb181b20a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 28 15:22:41 2000 +1000

     - (djm) Added patch from Chris Adams <cmadams@hiwaay.net> to add OSF SIA
       support. Enable using "USE_SIA=1 ./configure [options]"

commit 262ff170fbd9d2071a43e97656a6bd705dda7e4c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 28 08:24:49 2000 +1000

     - (djm) Added 'distprep' make target to simplify packaging

commit 91606b17d2f8db5a1cbf32f7d780a6ac6f09bdd2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 28 08:22:29 2000 +1000

     - (djm) Patch from Michael Stone <mstone@cs.loyola.edu> to add support for
       Irix 6.x array sessions, project id's, and system audit trail id.

commit 53c5d467c366122df252a7ffe599c1f2ded06370
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 28 00:50:50 2000 +1000

     - (djm) Fixes to lastlog code for Irix
     - (djm) Use atomicio in loginrec

commit dd47aa21fa928354cb53a423b4f1ebcd64a83d27
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 27 11:18:27 2000 +1000

     - (djm) Formatting

commit f8af08d7cb8e4fc0c998291a76ca1f4057972565
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 27 09:40:06 2000 +1000

     - (djm) Fixes to login code - not setting li->uid, cleanups

commit 0800647391ac42dea364e409100e8961686fae34
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 26 13:55:31 2000 +1000

    Fix fixed egd code

commit 7a445bb8d887b3ecf51ef24f582ed18d07c3793b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 26 13:12:37 2000 +1000

    error -> fatal

commit 6468125052288184b4604fe64fbacfe24e09ee34
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 26 13:01:33 2000 +1000

     - (djm) Make EGD failures non-fatal if OpenSSL's entropy pool is still OK
       based on patch from Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit 1f335fb8d81a23c6ddce3062a4e2d4efe9d8a59e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 26 11:31:33 2000 +1000

     - (djm) Account expiry support from Andreas Steinmetz <ast@domdv.de>
     - (djm) Added password expiry checking (no password change support)

commit c0fd17fdca5853c0c6bfdfc364d8c5418dcab86b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 26 10:22:53 2000 +1000

     - OpenBSD CVS update
       - provos@cvs.openbsd.org  2000/06/25 14:17:58
         [channels.c]
         correct check for bad channel ids; from Wei Dai <weidai@eskimo.com>

commit 8dd33fd1d543ce94f291bb1e580b49600b1e39a3
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 26 10:20:19 2000 +1000

     - Better fix to aclocal tests from Garrick James <garrick@james.net>

commit bf7f466206d4ca43c66d910099b2047df5659350
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 23 10:16:38 2000 +1000

     - OpenBSD CVS Updates:
       - markus@cvs.openbsd.org  2000/06/22 10:32:27
         [sshd.c]
         missing atomicio; report from Steve.Marquess@DET.AMEDD.ARMY.MIL
       - djm@cvs.openbsd.org     2000/06/22 17:55:00
         [auth-krb4.c key.c radix.c uuencode.c]
         Missing CVS idents; ok markus

commit b54b40ef06517dc3091253228f06d3bd54f19a82
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 23 08:23:34 2000 +1000

     - (djm) Use sa_family_t in prototype for rresvport_af. Patch from
       Svante Signell <svante.signell@telia.com>
     - (djm) Autoconf logic to define sa_family_t if it is missing

commit c19fd5f4e25f58af35cbede8a442ed3965e32eb0
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 22 21:44:54 2000 +1000

    Add explanation of PAM_TTY kludge

commit 8b7c6af89ec12e392877dc90f4c84f13d8100577
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 22 21:37:38 2000 +1000

    Update RPM spec version numbers

commit 6536c7d3c9d0e794c5c85d4f1746b958d7e04343
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 22 21:32:31 2000 +1000

     - OpenBSD CVS Updates:
       - markus@cvs.openbsd.org  2000/06/18 18:50:11
         [auth2.c compat.c compat.h sshconnect2.c]
         make userauth+pubkey interop with ssh.com-2.2.0
       - markus@cvs.openbsd.org  2000/06/18 20:56:17
         [dsa.c]
         mem leak + be more paranoid in dsa_verify.
       - markus@cvs.openbsd.org  2000/06/18 21:29:50
         [key.c]
         cleanup fingerprinting, less hardcoded sizes
       - markus@cvs.openbsd.org  2000/06/19 19:39:45
         [atomicio.c auth-options.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
         [auth-rsa.c auth-skey.c authfd.c authfd.h authfile.c bufaux.c bufaux.h]
         [buffer.c buffer.h canohost.c channels.c channels.h cipher.c cipher.h]
         [clientloop.c compat.c compat.h compress.c compress.h crc32.c crc32.h]
         [deattack.c dispatch.c dsa.c fingerprint.c fingerprint.h getput.h hmac.c]
         [kex.c log-client.c log-server.c login.c match.c mpaux.c mpaux.h nchan.c]
         [nchan.h packet.c packet.h pty.c pty.h readconf.c readconf.h readpass.c]
         [rsa.c rsa.h scp.c servconf.c servconf.h ssh-add.c ssh-keygen.c ssh.c]
         [ssh.h tildexpand.c ttymodes.c ttymodes.h uidswap.c xmalloc.c xmalloc.h]
         OpenBSD tag
       - markus@cvs.openbsd.org  2000/06/21 10:46:10
         sshconnect2.c missing free; nuke old comment

commit 099f505f9526311e48f828e95d90d488fe237219
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 22 20:57:11 2000 +1000

     - (djm) Automatically generate host key during "make install". Suggested
       by Gary E. Miller <gem@rellim.com>
     - (djm) Paranoia before kill() system call

commit 2f02295d31a34820d2c5a862ffeffd0d042502b2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 20 13:50:01 2000 +1000

    typo

commit d9a0a206710e2152a906e5acc1e96c7f3ec69011
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 20 13:49:11 2000 +1000

     - (djm) Typo in loginrec.c

commit edb82929fa3d9158a818249881083d65b305cb78
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 20 13:25:52 2000 +1000

     - (djm) Replace use of '-o' and '-a' logical operators in configure tests
       with '||' and '&&'. As suggested by Jim Knoble <jmknoble@pint-stowp.cx>
       to fix SCO Unixware problem reported by Gary E. Miller <gem@rellim.com>

commit 98cabe05469dd5ed132b47d95177867c70992c8b
Author: andre <andre>
Date:   Mon Jun 19 09:11:30 2000 +0000

    *** empty log message ***

commit b4db42f781babd3935145d99e44a287808ae832d
Author: andre <andre>
Date:   Mon Jun 19 08:25:36 2000 +0000

    Added some extra timings to help spot lastlog problems
    Increased delay before logout
    Improved message detail

commit 43ca7e200aeeec663c56946c15863c04bade98f0
Author: andre <andre>
Date:   Mon Jun 19 08:23:46 2000 +0000

    Line up 'configure --help' output

commit 6bb92374dff8726269e95aa3862c003135c80b7f
Author: andre <andre>
Date:   Mon Jun 19 08:20:03 2000 +0000

    Big loginrec.c update
    - MIN_SIZEOF macro to pick smallest buffer for str[ln]cpy()
      - fixes lastlog clobber spotted by P.S.S.Camp <P.S.S.Camp@ukc.ac.uk>
    - Added some top-level api documentation
    - Re-ordered construct_utmp(x)() to build well-formed structures for
       both login and logout, based on li->type.
      - change wtmp(x)_logout() to match new construct_*() form
    - Improved error responses throughout
    - Add ut_type cross-check for 'lastlog-from-wtmp(x)' where available
    - utmp_write_direct() has had some testing. Oh yes!
    - Re-ordered loginrec.h slightly

commit 0f91b4e3a1aebff24bd25d402fa597e2f36db6ae
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 18 15:43:25 2000 +1000

     - (djm) Started merge of Ben Lindstrom's <mouring@pconline.com> NeXT support

commit f6d9e2218998559cb67aad55d3f4a0bf53600c41
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 18 14:50:44 2000 +1000

     - OpenBSD CVS updates:
       - deraadt@cvs.openbsd.org 2000/06/17 09:58:46
         [channels.c]
         everyone says "nix it" (remove protocol 2 debugging message)
       - markus@cvs.openbsd.org  2000/06/17 13:24:34
         [sshconnect.c]
         allow extended server banners
       - markus@cvs.openbsd.org  2000/06/17 14:30:10
         [sshconnect.c]
         missing atomicio, typo
       - jakob@cvs.openbsd.org   2000/06/17 16:52:34
         [servconf.c servconf.h session.c sshd.8 sshd_config]
         add support for ssh v2 subsystems. ok markus@.
       - deraadt@cvs.openbsd.org 2000/06/17 18:57:48
         [readconf.c servconf.c]
         include = in WHITESPACE; markus ok
       - markus@cvs.openbsd.org  2000/06/17 19:09:10
         [auth2.c]
         implement bug compatibility with ssh-2.0.13 pubkey, server side
       - markus@cvs.openbsd.org  2000/06/17 21:00:28
         [compat.c]
         initial support for ssh.com's 2.2.0
       - markus@cvs.openbsd.org  2000/06/17 21:16:09
         [scp.c]
         typo
       - markus@cvs.openbsd.org  2000/06/17 22:05:02
         [auth-rsa.c auth2.c serverloop.c session.c auth-options.c auth-options.h]
         split auth-rsa option parsing into auth-options
         add options support to authorized_keys2
       - markus@cvs.openbsd.org  2000/06/17 22:42:54
         [session.c]
         typo

commit 7b22d65034ac280e0b4eaa857c71b17ee3ad7d99
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 18 14:07:04 2000 +1000

     - (djm) Add summary of configure options to end of ./configure run
     - (djm) Not all systems define RUSAGE_SELF & RUSAGE_CHILDREN. Report from
       Michael Stone <mstone@cs.loyola.edu>
     - (djm) rusage is a privileged operation on some Unices (incl.
       Solaris 2.5.1). Report from Paul D. Smith <pausmith@nortelnetworks.com>
     - (djm) Avoid PAM failures when running without a TTY. Report from
       Martin Petrak <petrak@spsknm.schools.sk>
     - (djm) Include sys/types.h when including netinet/in.h in configure tests.
       Patch from Jun-ichiro itojun Hagino <itojun@iijlab.net>

commit 1a13225d877ffdd035659bf5577d5aff388bb317
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 21:23:17 2000 +1000

     - (djm) Fix short copy in loginrec.c (based on patch from Phill Camp
       <P.S.S.Camp@ukc.ac.uk>

commit a66626b2d59d23a26cacfbcf938852a19d8b781d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jun 13 18:57:53 2000 +1000

     - (djm) Fixes from Andrew McGill <andrewm@datrix.co.za>:
      - Platform define for SCO 3.x which breaks on /dev/ptmx
      - Detect and try to fix missing MAXPATHLEN

commit 6e5d3475a54b33f73d057a83a0f9e4e6d01a5336
Author: andre <andre>
Date:   Tue Jun 13 00:43:47 2000 +0000

    Changed to OpenBSD indent and function declaration style
    Added display of time when logging out, to try to catch lastlog bugs

commit 55661d99b83cf8480993cd39e94d58d473c37c45
Author: andre <andre>
Date:   Tue Jun 13 00:29:34 2000 +0000

    Backed out previous changes - 'tolerance' setting may just hide a bug in
     the lastlog-from-utmp code for HPUX

commit 4225438a34504b4ce9d69aad68fc183452370984
Author: andre <andre>
Date:   Mon Jun 12 23:40:52 2000 +0000

    Allow a small tolerance for slow systems when testing lastlog
    recording

commit 45cad51c70f578c59f08e6d23ef70d541b4f58d7
Author: andre <andre>
Date:   Mon Jun 12 23:27:31 2000 +0000

    Stop lastlog detection setting DISABLE_LASTLOG - this flag means
    'never even try to get the last login time', whereas we want to try to
    use wtmp/wtmpx unless told otherwise. See loginrec.c:getlast_entry().

commit 35ad6bee4bc899919b5355df58f5302a6d113d28
Author: andre <andre>
Date:   Mon Jun 12 22:41:27 2000 +0000

     - (andre) AIX, lastlog, configure fixes from Tom Bertelson <tbert@abac.com>:
      - Don't try to retrieve lastlog from wtmp/wtmpx if DISABLE_LASTLOG is
         def'd
      - Set AIX to use preformatted manpages

commit e441aa3e21c4a31b6e547fb6fb2056d9fff093d6
Author: andre <andre>
Date:   Mon Jun 12 22:34:38 2000 +0000

    Added catman defines for AIX (Tom Bertelson <tbert@abac.com>)
    Fixed errant comma (Tom Bertelson <tbert@abac.com>)

commit ecaabf1b6abe51487a1ac593ac229236fc07b914
Author: andre <andre>
Date:   Mon Jun 12 22:21:44 2000 +0000

    Fixed getlast_entry() so that it doesn't try to use utmp(x) if
    DISABLE_LASTLOG is defined. Bug reported by Tom Bertelson
    <tbert@abac.com> for AIX.

commit c29de955f4934441b3db9e31535d5e12c33e3d7d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 12 23:04:18 2000 +1000

     - (djm) Configure fixes from SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>

commit b405d6108b3943f85b192cd64292542d9f2669dc
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 12 23:01:02 2000 +1000

    Latest versions

commit a6e407e8498e2bf1ee35731ead928b5bbc94730e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 12 22:58:43 2000 +1000

    wrong modes, forgot -kb

commit e69f18cbff23f52a9c4fdedd6bb55231231cee86
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 12 16:38:54 2000 +1000

     - (djm) Glob manpages in RPM spec files to catch compressed files
     - (djm) Full license in auth-pam.c

commit d900e45faa8c26e07d60ad497d99e99e43d8b0f9
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 10 16:51:33 2000 +1000

     - (djm) Fix for configure on bash2 from Jim Knoble <jmknoble@jmknoble.cx>

commit c601a7596f1db83757f49458f09b59bc0b57ef0c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 10 08:33:38 2000 +1000

     - (djm) Minor doc tweaks

commit a1cb64484e070c5bdd2e0f832bd2ebaa0a6af8b5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jun 9 11:58:35 2000 +1000

     - (djm) Patch from Kenji Miyake <kenji@miyake.org> to disable utmp usage
       (in favour of utmpx) on Solaris 8

commit 7206ad170c0463478c00da88b163410eec1aa5c3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jun 8 08:48:24 2000 +1000

    fix linkrot

commit 14c12cb0004469e6a6b0e417d2705c80ca89ab34
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 7 22:20:23 2000 +1000

     - (djm) Cleanup of entropy.c. Reorganised code, removed second pass through
       list of commands (by default). Removed verbose debugging (by default).
     - (djm) Increased command entropy estimates and default entropy collection
       timeout

commit d5bf307f7bd69d502bc03897a00a07df513418f7
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 7 21:32:13 2000 +1000

     - (djm) Remove duplicate headers from loginrec.c

commit 0c043c1fd31c6e7aa866114cca36244f7243ec5a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 7 21:22:38 2000 +1000

    Missed some bits of the OpenBSD patch somewhere (?!)

commit 9e11089afbefcacef1e01b4556236d2058d8ce76
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 7 21:05:46 2000 +1000

     - (djm) Don't add /usr/local/lib to library search path on Irix

commit 6ccade1cde92657a03e9b6bda10a9f0145ff8d45
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 7 20:57:57 2000 +1000

    New ver

commit 5314ae7855f74a63c7151bab6495253d0d1c1150
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 7 20:08:19 2000 +1000

     - (djm) Warn user if grabs fail in GNOME askpass. Patch from Zack Weinberg
       <zack@wolery.cumb.org>

commit d3a185709dfb8588ae7cacc079312d1fcc450e9c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jun 7 19:55:44 2000 +1000

     - (djm) Fix rsh path in RPMs. Report from Jason L Tibbitts III
       <tibbs@math.uh.edu>
     - (djm) OpenBSD CVS updates:
      - todd@cvs.openbsd.org
        [sshconnect2.c]
        teach protocol v2 to count login failures properly and also enable an
        explanation of why the password prompt comes up again like v1; this is NOT
        crypto
      - markus@cvs.openbsd.org
        [readconf.c readconf.h servconf.c servconf.h session.c ssh.1 ssh.c sshd.8]
        xauth_location support; pr 1234
        [readconf.c sshconnect2.c]
        typo, unused
        [session.c]
        allow use_login only for login sessions, otherwise remote commands are
        execed with uid==0
        [sshd.8]
        document UseLogin better
        [version.h]
        OpenSSH 2.1.1
        [auth-rsa.c]
        fix match_hostname() logic for auth-rsa: deny access if we have a
        negative match or no match at all
        [channels.c hostfile.c match.c]
        don't panic if mkdtemp fails for authfwd; jkb@yahoo-inc.com via
        kris@FreeBSD.org

commit e37bfc19f7263b838896ae403e55aa703a06b69a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jun 5 09:37:43 2000 +1000

     - (djm) Added --with-cflags, --with-ldflags and --with-libs options to
       configure.

commit 61e67250dc0d6a3406c4b2cd6cb787663d194481
Author: andre <andre>
Date:   Sun Jun 4 17:07:49 2000 +0000

    Many changes to new login code based on Damien's feedback:
    - Removed many redundant accessor/mutator methods as they're not necesary
       in OpenSSH
    - Added proper credits for OpenBSD code in loginrec.c
    - Changed function definitions to the OpenBSD style
    - Removed spurious 'L' prefix in line filename abbreviation for ut_line
    - Added some documentation in loginrec.c
    - Changed lastlog access function names
    - Removed #include lines in mid-file loginrec.c
    - loginrec.h, login.c and logintest.c changed to reflect new interface
    - Added TODO note for ttyslot() replacement

commit a86c7eccbf2d2c53bac38b8194cb7fa8b71ad290
Author: andre <andre>
Date:   Sun Jun 4 17:00:15 2000 +0000

    Added missed info for 20000603 login code update
    Noted 20000604 updates

commit 2994e0891bae2276259d00fe1cce32323a3fbc66
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jun 4 15:51:47 2000 +1000

     - Configure tweaking for new login code on Irix 5.3

commit 60f3c983cc7314fe7e488e75be653974080f9de5
Author: andre <andre>
Date:   Sat Jun 3 16:18:19 2000 +0000

    Disable lastlog for AIX, as it's handled by the OS as part of the login
      message

commit a271146b7b2741da38ba06ac788739fbfbad65b7
Author: andre <andre>
Date:   Sat Jun 3 16:17:13 2000 +0000

    Removed obsolete lastlog symbols

commit 2ff7b5d02817eb74a3ac2bf02eadef127b09d77c
Author: andre <andre>
Date:   Sat Jun 3 14:57:40 2000 +0000

    Added new login recording code
    Added test program for login code (make logintest)

commit e340f73b53aa3451f88fd9d41b652b659b0398f8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jun 3 21:59:32 2000 +1000

    Removed an old entry

commit 1c77392bce06d3f354fe1a3efa4e336c68933807
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 31 13:57:18 2000 +1000

     - Rewrote bsd-login to use proper utmp API if available. Major cleanup
       of fallback DIY code.

commit 1ea8ac7b90c2002ee6041fb90e1f94c7f8a94608
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 31 11:24:34 2000 +1000

     - Fix EGD read bug by IWAMURO Motonori <iwa@mmp.fujitsu.co.jp>
    
    update credits

commit 2f6a0ad191af2e0e67c66bdc5dfc84d9a97bf12c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 31 11:20:11 2000 +1000

     - Cleanup of auth.c, login.c and fake-*
     - Cleanup of auth-pam.c, save and print "account expired" error messages

commit 03934f2eefc991f2a0be253be8869cf8f39758bc
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 30 14:01:10 2000 +1000

    doc

commit b1715dc0cf5ea91707b437310f63b17bed2dc7a6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 30 13:44:51 2000 +1000

     - OpenBSD CVS updates:
      - markus@cvs.openbsd.org
        [session.c]
        make x11-fwd work w/ localhost (xauth add host/unix:11)
        [cipher.c compat.c readconf.c servconf.c]
        check strtok() != NULL; ok niels@
        [key.c]
        fix key_read() for uuencoded keys w/o '='
        [serverloop.c]
        group ssh1 vs. ssh2 in serverloop
        [kex.c kex.h myproposal.h sshconnect2.c sshd.c]
        split kexinit/kexdh, factor out common code
        [readconf.c ssh.1 ssh.c]
        forwardagent defaults to no, add ssh -A
      - theo@cvs.openbsd.org
        [session.c]
        just some line shortening

commit 9448c002db7427058ecca76760f3a75e379bf0a1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 30 13:14:19 2000 +1000

    Up ver

commit c252e2efa1d5171d8cd8c4d452c30f7e86ed2360
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 30 13:12:46 2000 +1000

     - Fix buffer overrun in login.c for systems which use syslen in utmpx.
       patch from YOSHIFUJI Hideaki <yoshfuji@cerberus.nemoto.ecei.tohoku.ac.jp>

commit be260a0f0d08d471c1065effb37f85f632e493ac
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 30 12:57:46 2000 +1000

     - Define atexit for old Solaris

commit 7b63b0f66eebb64d8998b03dac27b78d03edb651
Author: Damien Miller <djm@mindrot.org>
Date:   Sat May 20 15:41:26 2000 +1000

     - Doc cleanup

commit fda78d9bd07673e14e8646798a7453e3d9302de5
Author: Damien Miller <djm@mindrot.org>
Date:   Sat May 20 15:33:44 2000 +1000

     - HPUX and Configure fixes from Lutz Jaenicke
       <Lutz.Jaenicke@aet.TU-Cottbus.DE>
     - Use mkinstalldirs script to make directories instead of non-portable
       "install -d". Suggested by Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit 7d6656c1283f46d9cdbba707ea2373af3d994585
Author: Damien Miller <djm@mindrot.org>
Date:   Sat May 20 15:22:36 2000 +1000

    cleanup diffs

commit dfc83f42eba83d6dd127ce36fb33a490163c32de
Author: Damien Miller <djm@mindrot.org>
Date:   Sat May 20 15:02:59 2000 +1000

     - SunOS 4.x support from Todd C. Miller <Todd.Miller@courtesan.com>

commit ad1bc5f986ac31ea3f429d2c49d7f34bd78e32fc
Author: Damien Miller <djm@mindrot.org>
Date:   Sat May 20 14:53:09 2000 +1000

     - Don't touch utmp if USE_UTMPX defined

commit d999ae26b7bad888b7a9b375faa38c1d6a8db1ce
Author: Damien Miller <djm@mindrot.org>
Date:   Sat May 20 12:49:31 2000 +1000

     - Xauth fix from Markus Friedl <markus.friedl@informatik.uni-erlangen.de>

commit ef7df540735d5ee8889f7f87cc74fc4ec5f4e260
Author: Damien Miller <djm@mindrot.org>
Date:   Fri May 19 00:03:23 2000 +1000

     - Include Andre Lucas' fixprogs script. Forgot to "cvs add" it yesterday
     - OpenBSD CVS updates:
      - markus@cvs.openbsd.org
        [sshconnect.c]
        copy only ai_addrlen bytes; misiek@pld.org.pl
        [auth.c]
        accept an empty shell in authentication; bug reported by
        chris@tinker.ucr.edu
        [serverloop.c]
        we don't have stderr for interactive terminal sessions (fcntl errors)

commit 912d9752c29b8d39c59a164da26fccc28636f951
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 18 23:12:50 2000 +1000

    Doh - forgot to import fixprogs

commit cce494a4c881c2964429e398a4da5c7c964b0f2a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 17 23:36:56 2000 +1000

    prepare for p1 release

commit 3b512e18dc4c8fead872548bdb1a89f85681d0cf
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 17 23:29:18 2000 +1000

     - Detect OpenSSL seperatly from RSA
     - Better test for RSA (more compatible with RSAref). Based on work by
       Ed Eden <ede370@stl.rural.usda.gov>

commit c4be7ce66992811c555375cb303f504153e1b33f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 17 23:02:03 2000 +1000

     - RSAless operation patch from kevin_oconnor@standardandpoors.com

commit 615f939ebb48fdde404aae705057202512731331
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 17 22:53:33 2000 +1000

     - Several patches from SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>
      - INSTALL typo and URL fix
      - Makefile fix
      - Solaris fixes
     - Checking for ssize_t and memmove. Based on patch from SAKAI Kiyotaka
       <ksakai@kso.netwk.ntt-at.co.jp>

commit dcb6ecd1b3b25b6909296ff0546ca6b18d0c19d3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 17 22:34:22 2000 +1000

     - OpenBSD CVS update:
      - markus@cvs.openbsd.org
        [ssh.c]
        fix usage()
        [ssh2.h]
        draft-ietf-secsh-architecture-05.txt
        [ssh.1]
        document ssh -T -N (ssh2 only)
        [channels.c serverloop.c ssh.h sshconnect.c sshd.c aux.c]
        enable nonblocking IO for sshd w/ proto 1, too; split out common code
        [aux.c]
        missing include

commit 0e65eed58acc0053d163e96463a7c4d0684e55bd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 17 22:16:05 2000 +1000

     - Fix HAVE_PAM_GETENVLIST setting from Simon Wilkinson <sxw@dcs.ed.ac.uk>

commit f3c6cf13837e24ab6ac7b19567bff00dd6c1b161
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 17 22:08:29 2000 +1000

     - Avoid WCOREDUMP complation errors for systems that lack it
     - Avoid SIGCHLD warnings from entropy commands

commit d2c208a2d37104c5c429659ac708d6288400ecd2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 17 22:00:02 2000 +1000

     - Applied Tom Bertelson's <tbert@abac.com> AIX authentication fix

commit 8d1fd57a971159c828ab778136ca6332f0ba8f34
Author: Damien Miller <djm@mindrot.org>
Date:   Wed May 17 21:34:07 2000 +1000

     - Fix from Andre Lucas <andre.lucas@dial.pipex.com>
      - Fixes command line printing segfaults (spotter: Bladt Norbert)
      - Fixes erroneous printing of debug messages to syslog
      - Fixes utmp for MacOS X (spotter: Aristedes Maniatis)
      - Gives useful error message if PRNG initialisation fails
      - Reduced ssh startup delay
      - Measures cumulative command time rather than the time between reads
             after select()
      - 'fixprogs' perl script to eliminate non-working entropy commands, and
             optionally run 'ent' to measure command entropy

commit 95fe91bd84d7613ce37cb8b38212c4301610639f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat May 13 12:31:22 2000 +1000

     - Fix for non-recognised DSA keys from Arkadiusz Miskiewicz
       <misiek@pld.org.pl>

commit accfeb3afe07be4875e33dc8f269c868ea929274
Author: Damien Miller <djm@mindrot.org>
Date:   Thu May 11 19:10:58 2000 +1000

     - Fix for prng_seed permissions checking from Lutz Jaenicke
       <Lutz.Jaenicke@aet.TU-Cottbus.DE>

commit 95e89634296bfdf5ef11f39f10021e9f24938385
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 9 15:28:50 2000 +1000

    idoh

commit 75edac3366133f83d10ad8c560db7d28e48305f3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 9 15:28:41 2000 +1000

     - Cleanup of bsd-base64 headers, bugfix definitions of __b64_*. Reported
       by Andre Lucas <andre.lucas@dial.pipex.com>

commit 2a44f8938d5ea02aa622bc3106988db26d9d74d6
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 9 15:05:45 2000 +1000

    bad checkin mode

commit 82f88755e90bc62e4cbcfce6079666ba5942e477
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 9 15:05:25 2000 +1000

    Bad checkin mode

commit 17194ca147d3d755ed7cd8eb24de437c8985be15
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 9 15:04:39 2000 +1000

    update specs

commit 54057c2b9be4270b20db004c76851b04cf299620
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 9 15:03:37 2000 +1000

     - Doc updates

commit 0e963ef3c5ce28a5b47395569858a90a4e7a1e87
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 9 14:45:00 2000 +1000

    oops - missed this

commit 16e519cb9c11fd55f08c1d259a275f729711511b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 9 14:28:55 2000 +1000

     - Moved all the bsd-* and fake-* stuff into new libopenbsd-compat.a

commit 30c3d429306bb4afe71c18db92816b981f7b6d9d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 9 11:02:59 2000 +1000

     - OpenBSD CVS update
      - markus@cvs.openbsd.org
        [cipher.h myproposal.h readconf.c readconf.h servconf.c ssh.1 ssh.c]
        [ssh.h sshconnect1.c sshconnect2.c sshd.8]
        - complain about invalid ciphers in SSH1 (e.g. arcfour is SSH2 only)
      - hugh@cvs.openbsd.org
        [ssh.1]
        - zap typo
        [ssh-keygen.1]
        - One last nit fix. (markus approved)
        [sshd.8]
        - some markus certified spelling adjustments
      - markus@cvs.openbsd.org
        [auth2.c channels.c clientloop.c compat compat.h dsa.c kex.c]
        [sshconnect2.c ]
        - bug compat w/ ssh-2.0.13 x11, split out bugs
        [nchan.c]
        - no drain if ibuf_empty, fixes x11fwd problems; tests by fries@
        [ssh-keygen.c]
        - handle escapes in real and original key format, ok millert@
        [version.h]
        - OpenSSH-2.1

commit 61e50f10c276009bf9472fdd797bf6be60fc2a83
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 8 20:49:37 2000 +1000

     - Configure caching and cleanup patch from Andre Lucas'
       <andre.lucas@dial.pipex.com>

commit 6d48871fafed89fe878f44744a1abc0f5a47afb4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 8 13:44:52 2000 +1000

     - OpenBSD CVS update
      - markus@cvs.openbsd.org
        [clientloop.c sshconnect2.c]
        - make x11-fwd interop w/ ssh-2.0.13
        [README.openssh2]
        - interop w/ SecureFX
     - Release 2.0.0beta2

commit 58e579bcd987397aeeb5f0a7935ffdfa67125f37
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 8 00:05:31 2000 +1000

     - Generate DSA host keys during "make key" or RPM installs

commit a3f2a02bc35c5163d435523e764060e92431d6cf
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 7 18:30:27 2000 +1000

    Askpass has changed a little

commit 11402af048a3a0cf6d88923ddf5f2e5480bf322c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 7 18:05:59 2000 +1000

    Add URL for OpenSSH
    
    Upgrade to Jim's new Askpass

commit 1d504a42e736eb3f104fcdb7cb9fd8a1bc7e05bf
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 7 16:22:13 2000 +1000

    Prepare for beta2

commit e247cc402bc391650f014316363dbce78ad85dc7
Author: Damien Miller <djm@mindrot.org>
Date:   Sun May 7 12:03:14 2000 +1000

     - Remove references to SSLeay.
     - Big OpenBSD CVS update
      - markus@cvs.openbsd.org
        [clientloop.c]
        - typo
        [session.c]
        - update proctitle on pty alloc/dealloc, e.g. w/ windows client
        [session.c]
        - update proctitle for proto 1, too
        [channels.h nchan.c serverloop.c session.c sshd.c]
        - use c-style comments
      - deraadt@cvs.openbsd.org
        [scp.c]
        - more atomicio
      - markus@cvs.openbsd.org
        [channels.c]
        - set O_NONBLOCK
        [ssh.1]
        - update AUTHOR
        [readconf.c ssh-keygen.c ssh.h]
        - default DSA key file ~/.ssh/id_dsa
        [clientloop.c]
        - typo, rm verbose debug
      - deraadt@cvs.openbsd.org
        [ssh-keygen.1]
        - document DSA use of ssh-keygen
        [sshd.8]
        - a start at describing what i understand of the DSA side
        [ssh-keygen.1]
        - document -X and -x
        [ssh-keygen.c]
        - simplify usage
      - markus@cvs.openbsd.org
        [sshd.8]
        - there is no rhosts_dsa
        [ssh-keygen.1]
        - document -y, update -X,-x
        [nchan.c]
        - fix close for non-open ssh1 channels
        [servconf.c servconf.h ssh.h sshd.8 sshd.c ]
        - s/DsaKey/HostDSAKey/, document option
        [sshconnect2.c]
        - respect number_of_password_prompts
        [channels.c channels.h servconf.c servconf.h session.c sshd.8]
        - GatewayPorts for sshd, ok deraadt@
        [ssh-add.1 ssh-agent.1 ssh.1]
        - more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
        [ssh.1]
        - more info on proto 2
        [sshd.8]
        - sync AUTHOR w/ ssh.1
        [key.c key.h sshconnect.c]
        - print key type when talking about host keys
        [packet.c]
        - clear padding in ssh2
        [dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
        - replace broken uuencode w/ libc b64_ntop
        [auth2.c]
        - log failure before sending the reply
        [key.c radix.c uuencode.c]
        - remote trailing comments before calling __b64_pton
        [auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
        [sshconnect2.c sshd.8]
        - add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
     - Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])

commit 0437b33e54fd72060d17908d6abf96bfabaacad2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 2 09:56:41 2000 +1000

     - Add Andre Lucas' <andre.lucas@dial.pipex.com> patch to read entropy
       gathering commands from a text file

commit 6f83b8e34d3dc8227d7cf39989c5966abde2305e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 2 09:23:45 2000 +1000

     - OpenBSD CVS update
       [channels.c]
       - init all fds, close all fds.
       [sshconnect2.c]
       - check whether file exists before asking for passphrase
       [servconf.c servconf.h sshd.8 sshd.c]
       - PidFile, pr 1210
       [channels.c]
       - EINTR
       [channels.c]
       - unbreak, ok niels@
       [sshd.c]
       - unlink pid file, ok niels@
       [auth2.c]
       - Add missing #ifdefs; ok - markus

commit 63560f9bfc460329b966b17561313d5fa7328726
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 2 09:06:04 2000 +1000

    Prepare for 2.0.0beta1

commit fc0b11b5aa95f43109b384c6c752d2c20963c31a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue May 2 00:03:55 2000 +1000

     - Irix portability fixes - don't include netinet headers more than once
     - Make sure we don't save PRNG seed more than once

commit 7c0042629e1dfe12f42c3355cc843e269e50b914
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 1 22:57:46 2000 +1000

     - Deprecate perl-tk askpass.

commit 1cead2c02c6fa353594228adb1dea20c9a4e034f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 1 22:55:23 2000 +1000

     - Add some missing ifdefs to auth2.c

commit 0e489dc5aed9d54ce1943e6bde26f1d22ac13ded
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 1 22:53:53 2000 +1000

     - Merged bsd-login ttyslot and AIX utmp patch from Gert Doering
       <gd@hilb1.medat.de>

commit 35dabd0398dc4aa8735d5ec896ead6955b83b2ff
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 1 21:10:33 2000 +1000

       [scp.c]
       - fix very rare EAGAIN/EINTR issues; based on work by djm
       [packet.c]
       - less debug, rm unused
       [auth2.c]
       - disable kerb,s/key in ssh2
       [sshd.8]
       - Minor tweaks and typo fixes.
       [ssh-keygen.c]
       - Put -d into usage and reorder. markus ok.

commit 70fb671d218378f6df6a9121a71e8320768a0be3
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 1 20:59:50 2000 +1000

     - Fixed __progname symbol collisions reported by Andre Lucas
       <andre.lucas@dial.pipex.com>

commit e59ce627a4149d39d7841f331d8111bdacc3b604
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 1 20:54:17 2000 +1000

     - Include missing headers for OpenSSL tests. Fix from Phil Karn
       <karn@ka9q.ampr.org>

commit 7c8af4fca8ab675245aa5532f80a2f06d6c080c1
Author: Damien Miller <djm@mindrot.org>
Date:   Mon May 1 08:24:07 2000 +1000

    packet.c
    send debug messages in SSH2 format

commit 1b26ab286f2014f4e974e6ab8f07d1ed7c7599be
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 30 10:12:49 2000 +1000

    sync missed changes

commit bd483e76909905f28d1604125f70c7cf8271f66e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 30 10:00:53 2000 +1000

     - More OpenBSD updates:
       [session.c]
       - don't call chan_write_failed() if we are not writing
       [auth-rsa.c auth1.c authfd.c hostfile.c ssh-agent.c]
       - keysize warnings error() -> log()

commit c998f9eb7cfb3bfef8c78b0a47bdb6db29a871e8
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 30 09:43:41 2000 +1000

    clarify requirement for egd

commit d294640f4fecc128451fa876a9191ed11c613174
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 30 09:34:55 2000 +1000

    doh

commit a7dc0fee6d0f8bd92fc56396f2d2a6b21d88d155
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 30 09:33:57 2000 +1000

    Prepare for 2.0

commit 4018c1985d6e34f4625132965e814880ac3075ba
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 30 09:30:44 2000 +1000

     - Integrate Andre Lucas' <andre.lucas@dial.pipex.com> entropy collection
       patch.
       - Adds timeout to entropy collection
       - Disables slow entropy sources
       - Load and save seed file
     - Changed entropy seed code to user per-user seeds only (server seed is
       saved in root's .ssh directory)
     - Use atexit() and fatal cleanups to save seed on exit

commit 1bead335d7381b553bc4a13b3ea2b9dc09679123
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 30 00:47:29 2000 +1000

     - Merge HP-UX fixes and TCB support from Ged Lodder <lodder@yacc.com.au>

commit eba71bab9bf01c0d688f829a8971f902732558df
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 29 23:57:08 2000 +1000

     - Merge big update to OpenSSH-2.0 from OpenBSD CVS
       [README.openssh2]
       - interop w/ F-secure windows client
       - sync documentation
       - ssh_host_dsa_key not ssh_dsa_key
       [auth-rsa.c]
       - missing fclose
       [auth.c authfile.c compat.c dsa.c dsa.h hostfile.c key.c key.h radix.c]
       [readconf.c readconf.h ssh-add.c ssh-keygen.c ssh.c ssh.h sshconnect.c]
       [sshd.c uuencode.c uuencode.h authfile.h]
       - add DSA pubkey auth and other SSH2 fixes.  use ssh-keygen -[xX]
         for trading keys with the real and the original SSH, directly from the
         people who invented the SSH protocol.
       [auth.c auth.h authfile.c sshconnect.c auth1.c auth2.c sshconnect.h]
       [sshconnect1.c sshconnect2.c]
       - split auth/sshconnect in one file per protocol version
       [sshconnect2.c]
       - remove debug
       [uuencode.c]
       - add trailing =
       [version.h]
       - OpenSSH-2.0
       [ssh-keygen.1 ssh-keygen.c]
       - add -R flag: exit code indicates if RSA is alive
       [sshd.c]
       - remove unused
         silent if -Q is specified
       [ssh.h]
       - host key becomes /etc/ssh_host_dsa_key
       [readconf.c servconf.c ]
       - ssh/sshd default to proto 1 and 2
       [uuencode.c]
       - remove debug
       [auth2.c ssh-keygen.c sshconnect2.c sshd.c]
       - xfree DSA blobs
       [auth2.c serverloop.c session.c]
       - cleanup logging for sshd/2, respect PasswordAuth no
       [sshconnect2.c]
       - less debug, respect .ssh/config
       [README.openssh2 channels.c channels.h]
       - clientloop.c session.c ssh.c
       - support for x11-fwding, client+server

commit 8117111a3c1360727e3c54aad31aa045e7a7871b
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 23 11:14:01 2000 +1000

     - Define __progname in session.c if libc doesn't
     - Remove indentation on autoconf #include statements to avoid bug in
       DEC Tru64 compiler. Report and fix from David Del Piero
       <David.DelPiero@qed.qld.gov.au>

commit 06d84b78e90d89f1c658470d467c14b86727db61
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 21 16:13:07 2000 +1000

     - Define __progname in session.c if libc doesn't

commit a552faf5646498c12acfd752394e289e4f9a226d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Apr 21 15:55:20 2000 +1000

     - Merge fix from OpenBSD CVS
      [ssh-agent.c]
      - Fix memory leak per connection. Report from Andy Spiegl <Andy@Spiegl.de>
        via Debian bug #59926

commit f3a3fee942427289ed9db73f2db1624c30d0f76f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 20 23:32:48 2000 +1000

     - Debian bug #58031 - ssh_config lies about default cipher

commit cfabe86720363e109d87f8e9d54b364ef64c57c8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 20 23:27:27 2000 +1000

     - Debian bug #55910 - remove references to ssl(8) manpages

commit d0cff3ecc49204c03c06428f7b779b8a18c0486f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 20 23:12:58 2000 +1000

     - Merge fixes from Debian patch from Phil Hands <phil@hands.com>
      - Allow setting of PAM service name through CFLAGS (SSHD_PAM_SERVICE)
      - Use vhangup to clean up Linux ttys
      - Force posix getopt processing on GNU libc systems

commit 166fca8894807de71b741a779330bd23edfec013
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 20 07:42:21 2000 +1000

     - Sync with OpenBSD CVS:
      [clientloop.c login.c serverloop.c ssh-agent.c ssh.h sshconnect.c sshd.c]
      - pid_t
      [session.c]
      - remove bogus chan_read_failed. this could cause data
        corruption (missing data) at end of a SSH2 session.

commit 3ef692aa05a4b0d94a114be0826d32d0c8f67f1b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 20 07:33:24 2000 +1000

     - Make fixpaths work with perl4, patch from Andre Lucas
       <andre.lucas@dial.pipex.com>

commit 8bb73be04e3e38be582c4b3843c765aab74017c2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 19 16:26:12 2000 +1000

     - OpenBSD CVS updates
       [channels.c]
       - fix pr 1196, listen_port and port_to_connect interchanged
       [scp.c]
       - after completion, replace the progress bar ETA counter with a final
         elapsed time; my idea, aaron wrote the patch
       [ssh_config sshd_config]
       - show 'Protocol' as an example, ok markus@
       [sshd.c]
       - missing xfree()
     - Add missing header to bsd-misc.c

commit 71795160ee9dbf15633b2c27679df62c11f79aaa
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 16 12:57:38 2000 +1000

    Include all README files

commit dd034dad949018620cbc69cf35f2beb092de4cdc
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 16 12:50:52 2000 +1000

    Updated

commit 1d2723f5567f961c9dea61c7db5e0e64879a1d97
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 16 12:35:37 2000 +1000

    prepare for a wider test release

commit 5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 16 12:31:48 2000 +1000

     - Reduce diff against OpenBSD source
       - All OpenSSL includes are now unconditionally referenced as
         openssl/foo.h
       - Pick up formatting changes
       - Other minor changed (typecasts, etc) that I missed

commit a664e870f27e6dc2c73f393e95a229abc527e0e6
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 16 11:52:47 2000 +1000

    forgot -kb, remove openssl/ssl conditional

commit d8495e7d61c72093d81e9b2dba2a5acc440c3787
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 16 11:49:14 2000 +1000

    forgot -kb

commit 4af51306d9a51459a5bef922df1037f876ae51fe
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Apr 16 11:18:38 2000 +1000

     - OpenBSD CVS updates.
       [ssh.1 ssh.c]
       - ssh -2
       [auth.c channels.c clientloop.c packet.c packet.h serverloop.c]
       [session.c sshconnect.c]
       - check payload for (illegal) extra data
       [ALL]
       - whitespace cleanup

commit 5d1705ecf9bd3216dc99a84242bcdf2e7297d307
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 15 13:06:54 2000 +1000

    forgot -kb

commit 22c772609aa0e97fb39a6ec609c2f16445644055
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 13 12:26:34 2000 +1000

     - Merged OpenBSD updates to include paths.

commit e71eb91259388de4aea7d46738f3b8b5593bccbe
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 13 12:19:32 2000 +1000

    doc

commit 78928793fb23a3a4c80ae62eca6a7826b2987690
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 12 20:17:38 2000 +1000

     - OpenBSD CVS updates:
       - [channels.c]
         repair x11-fwd
       - [sshconnect.c]
         fix passwd prompt for ssh2, less debugging output.
       - [clientloop.c compat.c dsa.c kex.c sshd.c]
         less debugging output
       - [kex.c kex.h sshconnect.c sshd.c]
         check for reasonable public DH values
       - [README.openssh2 cipher.c cipher.h compat.c compat.h readconf.c]
         [readconf.h servconf.c servconf.h ssh.c ssh.h sshconnect.c sshd.c]
         add Cipher and Protocol options to ssh/sshd, e.g.:
         ssh -o 'Protocol 1,2' if you prefer proto 1, ssh -o 'Ciphers
         arcfour,3des-cbc'
       - [sshd.c]
         print 1.99 only if server supports both

commit efb4afe0265333ce554f699c2a19ae249dd8d1b5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Apr 12 18:45:05 2000 +1000

     - More large OpenBSD CVS updates:
       - [auth.c auth.h servconf.c servconf.h serverloop.c session.c]
         [session.h ssh.h sshd.c README.openssh2]
         ssh2 server side, see README.openssh2; enable with 'sshd -2'
       - [channels.c]
         no adjust after close
       - [sshd.c compat.c ]
         interop w/ latest ssh.com windows client.

commit 11e37f638d3cc064371521001eaeb2d75bfe4a8d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 8 18:23:30 2000 +1000

     - Only set define entropy collection macros if they are found

commit bc7c7cceea205733e3d0902bc751009b5836ff9c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 8 17:48:56 2000 +1000

     - Avoid some compiler warnings in fake-get*.c
     - Add IPTOS macros for systems which lack them

commit 73a26627f255088b55172f7947c8c2419634059b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 6 12:36:06 2000 +1000

    todo

commit 1383bd8eb91a8ec9c8d283679faec5925b0ccc42
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Apr 6 12:32:37 2000 +1000

     - OpenBSD CVS update:
       - [channels.c]
         close efd on eof
       - [clientloop.c compat.c ssh.c sshconnect.c myproposal.h]
         ssh2 client implementation, interops w/ ssh.com and lsh servers.
       - [sshconnect.c]
         missing free.
       - [authfile.c cipher.c cipher.h packet.c sshconnect.c sshd.c]
         remove unused argument, split cipher_mask()
       - [clientloop.c]
         re-order: group ssh1 vs. ssh2
     - Make Redhat spec require openssl >= 0.9.5a

commit 74a333bbe11f67c59c559e0f424d5945eb438577
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 4 15:04:09 2000 +1000

     - Generate manpages before make install not at the end of make all
     - Don't seed the rng quite so often
     - Always reseed rng when requested

commit 9f98f06c89afad9c8f32d496c07f3bf44e7dc906
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 4 14:57:08 2000 +1000

    Removed excess seed_rng calls

commit 2acd082bc97f0f6d0a8ca510d3945b4262922ed3
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 4 14:52:38 2000 +1000

    Include fix

commit 33b13568b520b25990261206e10c941a9270238f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 4 14:38:59 2000 +1000

     - OpenBSD CVS update:
       - [packet.h packet.c]
         ssh2 packet format
       - [packet.h packet.c nchan2.ms nchan.h compat.h compat.c]
         [channels.h channels.c]
         channel layer support for ssh2
       - [kex.h kex.c hmac.h hmac.c dsa.c dsa.h]
         DSA, keyexchange, algorithm agreement for ssh2

commit 193ba88dd6e9d6bcd5f476c7f5ddde8fd0b752bf
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Apr 4 10:21:09 2000 +1000

     - Add tests for RAND_add function when searching for OpenSSL

commit 70494d18eea315a70a7b7604080b8815d492b262
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 3 15:57:06 2000 +1000

     - Disable tests and typedefs for 64 bit types. They are currently unused.

commit ecf6240b6d9837f1c7612f593e12677bf22a46d4
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 3 15:07:32 2000 +1000

    remove debugging junk

commit 040f3831fcc4c2e338ab15cb55cb43d95deb390e
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Apr 3 14:50:43 2000 +1000

     - Wrote entropy collection routines for systems that lack /dev/random
       and EGD

commit b38eff8e4ff901df9cf1113a9f14d64c3565a401
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Apr 1 11:09:21 2000 +1000

     - Big OpenBSD CVS update (mainly beginnings of SSH2 infrastructure)
       - [auth.c session.c sshd.c auth.h]
         split sshd.c -> auth.c session.c sshd.c plus cleanup and goto-removal
       - [bufaux.c bufaux.h]
         support ssh2 bignums
       - [channels.c channels.h clientloop.c sshd.c nchan.c nchan.h packet.c]
         [readconf.c ssh.c ssh.h serverloop.c]
         replace big switch() with function tables (prepare for ssh2)
       - [ssh2.h]
         ssh2 message type codes
       - [sshd.8]
         reorder Xr to avoid cutting
       - [serverloop.c]
         close(fdin) if fdin != fdout, shutdown otherwise, ok theo@
       - [channels.c]
         missing close
         allow bigger packets
       - [cipher.c cipher.h]
         support ssh2 ciphers
       - [compress.c]
         cleanup, less code
       - [dispatch.c dispatch.h]
         function tables for different message types
       - [log-server.c]
         do not log() if debuggin to stderr
         rename a cpp symbol, to avoid param.h collision
       - [mpaux.c]
         KNF
       - [nchan.c]
         sync w/ channels.c

commit 450a7a1ff40fe7c2d84c93b83cf2df53445d807d
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 13:04:51 2000 +1000

     - OpenBSD CVS update
       - [auth-krb4.c]
         -Wall
       - [auth-rh-rsa.c auth-rsa.c hostfile.c hostfile.h key.c key.h match.c]
         [match.h ssh.c ssh.h sshconnect.c sshd.c]
         initial support for DSA keys. ok deraadt@, niels@
       - [cipher.c cipher.h]
         remove unused cipher_attack_detected code
       - [scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8]
         Fix some formatting problems I missed before.
       - [ssh.1 sshd.8]
         fix spelling errors, From: FreeBSD
       - [ssh.c]
         switch to raw mode only if he _get_ a pty (not if we _want_ a pty).

commit 2c9279fa667827384fceb243f890cba1dbe480de
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 12:12:34 2000 +1000

     - Better tests for OpenSSL w/ RSAref
     - Added replacement setenv() function from OpenBSD libc. Suggested by
       Ben Lindstrom <mouring@pconline.com>

commit a208e57269c44761209434f06f980600a9a82fb9
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 26 12:07:15 2000 +1000

    Test RSA_private_decrypt when searching for OpenSSL

commit 63a46cc4f5c14342b7b2c5e9f29ba758a0731707
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 24 09:24:33 2000 +1100

    version

commit ea048d8c2db9b567f831171c2ca86e5369159538
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 18 00:21:41 2000 +1100

    ver

commit e37ac5ae1797f955ba91c4665aa9f9b0fa3663e2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 17 23:58:59 2000 +1100

     - Runtime error fix for HPUX from Otmar Stahl
       <O.Stahl@lsw.uni-heidelberg.de>

commit 7684ee17ee96426970c00cb44d9d00b6611b9a57
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 17 23:40:15 2000 +1100

     - OpenBSD CVS updates:
       - [atomicio.c auth-krb4.c bufaux.c channels.c compress.c fingerprint.c]
         [packet.h radix.c rsa.c scp.c ssh-agent.c ssh-keygen.c sshconnect.c]
         [sshd.c]
         pedantic: signed vs. unsigned, void*-arithm, etc
       - [ssh.1 sshd.8]
         Various cleanups and standardizations.

commit d6121d2972c1a6924f6d186ea04eefe9dab774ef
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 17 23:26:46 2000 +1100

     - Checks for 64 bit int types. Problem report from Mats Fredholm
       <matsf@init.se>

commit 29ea30d95627517e45e886820e3ef32168bd8dd7
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 17 10:54:15 2000 +1100

     - Clarified --with-default-path option.
     - Added -blibpath handling for AIX to work around stupid runtime linking.
       Problem elucidated by gshapiro@SENDMAIL.ORG by way of Jim Knoble
       <jmknoble@pobox.com>

commit 696be9031b42c341c45ec36e2cd10db7869fb93a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 16 12:45:17 2000 +1100

    Prepare for final test release

commit ca9a49cd0b75338211cb1e614ea07c8866b5f6e0
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 16 12:23:13 2000 +1100

     - Added blurb about "scp: command not found" errors to UPGRADING

commit 9687322c0386ec4053b7478c11aa6e3c9bd52837
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 16 12:07:43 2000 +1100

    spello

commit fd26368068d956286ea12fb818d849641d507819
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 16 11:51:09 2000 +1100

     - Doc cleanups

commit 03ee95e41ae8384190ffd4c7eddd322b39b434ec
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 16 11:35:02 2000 +1100

    Moved to contrib/

commit 166bd448c92574b5fed88d24e9ca0af1481fe680
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 16 10:48:25 2000 +1100

     - Propogate LD through to Makefile

commit 08c788a9b3cc9eb211c65c4b33868beb81a9cfd1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 16 07:52:29 2000 +1100

     - Fixed configure not passing LDFLAGS to Solaris. Report from David G.
       Hesprich <dghespri@sprintparanet.com>

commit 856799ba27c364a44845dd6f73ae4cb89f6c5ed4
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 21:18:10 2000 +1100

     - Configure fix from Bratislav ILICH <bilic@zepter.ru>

commit b1be3bcca113c95cdbcdca8793849d974bbcddbd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:55:52 2000 +1100

    fix doh

commit bb68c1621e0804bbf448e149c4de229085c66120
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:38:13 2000 +1100

    fix doh

commit ddaffa4194d7a25bdaae9c38aa2dadf5712ea3f5
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:31:18 2000 +1100

    Updated spec file for new version and locations

commit 256fdcbec5ee70e69a89e47a360b6091a904f1a6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:25:06 2000 +1100

    Moved package files to contrib/
    
    Added FreeBSD PAM config

commit 8b1c22b7758511461b359461926e47b093a349d3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 12:13:01 2000 +1100

     - Created contrib/ subdirectory. Included helpers from Phil Hands'
       Debian package, README file and chroot patch from Ricardo Cerqueira
       <rmcc@clix.pt>
     - Moved gnome-ssh-askpass.c to contrib directory and reomved config
       option.
     - Slight cleanup to doc files

commit f09b07a971f64cf69f2c45a364c3d56559f7c1c3
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 11:23:48 2000 +1100

     - Don't free argument to putenv() after use (in setenv() replacement).
       Report from Seigo Tanimura <tanimura@r.dl.itc.u-tokyo.ac.jp>

commit a1ad4802fff669b20c49cbd9b682460085b2d50a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 15 10:04:54 2000 +1100

     - Fix broken CFLAGS handling during search for OpenSSL. Fixes va_list
       problems with gcc/Solaris.

commit 086b1717307dadd32cc60a2558c669399642802d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 14 14:52:19 2000 +1100

    *** empty log message ***

commit db819595d35cbf23eb4eeba2ad0ac54ef7e19036
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 14 13:44:01 2000 +1100

     - Include /usr/local/include and /usr/local/lib for systems that don't
       do it themselves
     - -R/usr/local/lib for Solaris
     - Fix RSAref detection
     - Fix IN6_IS_ADDR_V4MAPPED macro

commit 1c67c9969c80dbc1fcbbc381f1554e45745622eb
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 14 10:16:34 2000 +1100

     - Include macro for IN6_IS_ADDR_V4MAPPED. Report from
       peter@frontierflying.com

commit 736540875bf0b818ac19c49d79ba1ee192320e6a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 14 10:13:04 2000 +1100

    *** empty log message ***

commit 8b1204d8ae8f4db85facfafcabdb6c746ad1e029
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Mar 13 15:41:24 2000 +1100

    *** empty log message ***

commit 384b36649b786c2cdc6b33edea325d404b7f8acb
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 11 20:47:17 2000 +1100

    Prepare for pre2

commit 7bcb089ef791e2b624cf349ba24bf798aebef99a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 11 20:45:40 2000 +1100

     - IPv6 workarounds from Hideaki YOSHIFUJI <yoshfuji@ecei.tohoku.ac.jp>

commit d58b3abe0e9d887a00679245065ee91b8565037f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 11 20:05:11 2000 +1100

    More config fixes

commit 02491e9632dc03c8aa75a9d406ff98445aa28786
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 11 11:58:28 2000 +1100

     - OpenBSD CVS change
       [sshd.c]
        - disallow guessing of root password

commit eedc0ca23e06fa5a342d531db395badaf783bbd7
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 11 11:42:13 2000 +1100

    doh

commit 2dafb8afe32409811a1e626f747d7d9802075f40
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 11 11:38:35 2000 +1100

    Prepare for 1.2.3pre release

commit b85dcad762e23d4ca4982c3678235e65719babf8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Mar 11 11:37:00 2000 +1100

     - Detect RSAref

commit 8f975b6a189fd15cf0dfcce09ba7d7c97f36a16d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 9 22:31:13 2000 +1100

     - Removed warning workaround for Linux and devpts filesystems (no longer
       required after OpenBSD updates)

commit 98c7ad60ec5725d91da9f9f6d26cd9fe477398c0
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 9 21:27:49 2000 +1100

     - OpenBSD CVS updates to v1.2.3
            [ssh.h atomicio.c]
             - int atomicio -> ssize_t (for alpha). ok deraadt@
            [auth-rsa.c]
             - delay MD5 computation until client sends response, free() early, cleanup.
            [cipher.c]
             - void* -> unsigned char*, ok niels@
            [hostfile.c]
             - remove unused variable 'len'. fix comments.
             - remove unused variable
            [log-client.c log-server.c]
             - rename a cpp symbol, to avoid param.h collision
            [packet.c]
             - missing xfree()
             - getsockname() requires initialized tolen; andy@guildsoftware.com
             - use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
            from Holger.Trapp@Informatik.TU-Chemnitz.DE
            [pty.c pty.h]
             - register cleanup for pty earlier. move code for pty-owner handling to
            pty.c ok provos@, dugsong@
            [readconf.c]
             - turn off x11-fwd for the client, too.
            [rsa.c]
             - PKCS#1 padding
            [scp.c]
             - allow '.' in usernames; from jedgar@fxp.org
            [servconf.c]
             - typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
             - sync with sshd_config
            [ssh-keygen.c]
             - enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
            [ssh.1]
             - Change invalid 'CHAT' loglevel to 'VERBOSE'
            [ssh.c]
             - suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
             - turn off x11-fwd for the client, too.
            [sshconnect.c]
             - missing xfree()
             - retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
             - read error vs. "Connection closed by remote host"
            [sshd.8]
             - ie. -> i.e.,
             - do not link to a commercial page..
             - sync with sshd_config
            [sshd.c]
             - no need for poll.h; from bright@wintelcom.net
             - log with level log() not fatal() if peer behaves badly.
             - don't panic if client behaves strange. ok deraadt@
             - make no-port-forwarding for RSA keys deny both -L and -R style fwding
             - delay close() of pty until the pty has been chowned back to root
             - oops, fix comment, too.
             - missing xfree()
             - move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
            (http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
             - register cleanup for pty earlier. move code for pty-owner handling to
          pty.c ok provos@, dugsong@
             - create x11 cookie file
             - fix pr 1113, fclose() -> pclose(), todo: remote popen()
             - version 1.2.3
     - Cleaned up

commit 1a07ebd4d8d39c6814bbd84c1aec4ebf2bd005a2
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Mar 8 09:03:44 2000 +1100

     - Configure fix from Hiroshi Takekawa <takekawa@sr3.t.u-tokyo.ac.jp>

commit 5a88b6e70b57b39dc355140d39fcf42944db5129
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 7 22:40:57 2000 +1100

    add warning

commit 668b78c385baabb21624d8fc0347a1ca95ed2bda
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Mar 7 09:37:07 2000 +1100

    Update version

commit cf87b5b71b82879525bc801358ac6f7d755e278e
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 5 17:14:38 2000 +1100

    Avoid compiler warnings

commit 65165f8d83f342b1f3664eebb011c6a0ce6215b4
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 5 17:02:45 2000 +1100

     - Check for libwrap if --with-tcp-wrappers option specified. Suggestion
       Mate Wierdl <mw@moni.msci.memphis.edu>

commit 9fb07e4b8baa291d7fda56e8621780cfd1fde287
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 5 16:22:59 2000 +1100

     - Check for getpagesize in libucb.a if not found in libc. Fix for old
       Solaris from Andre Lucas <andre.lucas@dial.pipex.com>

commit fac99cd12a9b4480284c4d4229b2e842bc1065f7
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 5 16:10:45 2000 +1100

     - Explicitly seed OpenSSL's PRNG before checking rsa_alive()

commit 01bedb83b1faddd7d9dd136bfcd474e1608af8f7
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Mar 5 16:10:03 2000 +1100

     - Fix DEC compile fix

commit 00d4bb117a7dee724636d970de7287cb183ad3b3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 3 22:48:49 2000 +1100

     - DEC Unix compile fix from David Del Piero <David.DelPiero@qed.qld.gov.au>
     - Manpage fix from David Del Piero <David.DelPiero@qed.qld.gov.au>

commit 3c7eeb2af5e97c074ea1ba29f1ebe7a2d710ea48
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 3 22:35:33 2000 +1100

     - Don't permanently fail on bind() if getaddrinfo has more choices left for
       us. Needed to work around messy IPv6 on Linux. Patch from Arkadiusz
       Miskiewicz <misiek@pld.org.pl>

commit 4095f894dce73a9024493c81190f786b64672c4a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Mar 3 22:13:52 2000 +1100

    - Added "make host-key" target, Suggestion from Dominik Brettnacher
     <domi@saargate.de>

commit 2453d01611c2abb76fc6e1355a70d628ccf8e446
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 2 23:57:18 2000 +1100

     - Allow root access to any key. Patch from
       markus.friedl@informatik.uni-erlangen.de

commit 204ad074e51c0e9c25666eb044e4c255bcfe64b6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 2 23:56:12 2000 +1100

     - Warning was valid - possible race condition on PTYs. Avoided using
       platform-specific code.
     - Document some common problems

commit c4cea3e5c71c8f2d48ee22ea05d26a47fb47ad29
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 2 23:31:50 2000 +1100

     - Avoid warning message with Unix98 ptys

commit c7d8dbbb0dfdeb3f854d58c9bf084db2b72ded77
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 2 23:30:53 2000 +1100

     - Applied pty cleanup patch from markus.friedl@informatik.uni-erlangen.de

commit a22ba0152cebff060be2de75ce2ab52a2442ea73
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Mar 2 23:09:20 2000 +1100

     - Big cleanup of autoconf code
       - Rearranged to be a little more logical
       - Added -R option for Solaris
       - Rewrote OpenSSL detection code. Now uses AC_TRY_RUN with a test program
         to detect library and header location _and_ ensure library has proper
         RSA support built in (this is a problem with OpenSSL 0.9.5).

commit 36143d785143daabda83962a0f34404a9abf0964
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Feb 7 13:20:26 2000 +1100

     - Removed SOCKS code. Will support through a ProxyCommand.

commit 8b171bc4cd9367e9dc99e53ebabcb0d04f9ba7da
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 3 14:04:50 2000 +1100

    Import of spilt-off random collection code

commit dd777a441ff2449541ce22728021a477c8cd5f08
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 3 14:00:17 2000 +1100

    Add apology

commit 0c0e4bfe3c126e2a172db7b978f7e6360c6580d5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 3 13:58:51 2000 +1100

     - Add --with-ssl-dir option

commit 1852246d30592c4b511db0755a806f90a4842852
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Feb 3 01:07:07 2000 +1100

     - Fixed SEGVs in authloop, fix from vbzoli@hbrt.hu

commit 17872527893e68ecab20cd75efab00dcea2b29ea
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 2 20:56:20 2000 +1100

     - Documentation fixes from HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp>
     - Added URLs to Japanese translations of documents by HARUYAMA Seigo
       <haruyama@nt.phys.s.u-tokyo.ac.jp>

commit 6552758baeaeaf241a0a6c67e2e0a035d31bdf79
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Feb 2 19:17:40 2000 +1100

     - Fix lastlog code for directory based lastlogs. Fix from Josh Durham
       <jmd@aoe.vt.edu>

commit 9e53f35a6a5dd60fe134ec82d1ac0b1da3787446
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Feb 1 23:05:30 2000 +1100

     - Use socket pairs by default (instead of pipes). Prevents race condition
       on several (buggy) OSs. Report and fix from tridge@linuxcare.com

commit 6034fdfd1f5382bf56dee5a7ee5b9e41b52c5240
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 29 20:55:09 2000 +1100

     - Compile fix from Andre Lucas <andre.lucas@dial.pipex.com>

commit f07390e90da683fecbf55849a3cee6dc9b79a3e3
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 29 20:40:22 2000 +1100

     - Seed OpenSSL's random number generator before generating RSA keypairs
     - Split random collector into seperate file

commit 4e61b79d5bcb3c5ac3014fe55be55214e23b2927
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 29 20:13:40 2000 +1100

    fix comment

commit c85f9b48517385e3cc95deb1d3b1bc72e5124d58
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 29 10:20:21 2000 +1100

     - Added note in UPGRADING re interop with commercial SSH using idea.
       Report from Jim Knoble <jmknoble@pobox.com>
     - Fix linking order for Kerberos/AFS. Fix from Holget Trapp
       <Holger.Trapp@Informatik.TU-Chemnitz.DE>

commit 27f4c78698de46b3a22bcdb2f47f20f74950d9bc
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 27 18:22:13 2000 +1100

     - NeXT keeps it lastlog in /usr/adm. Report from
       mouring@newton.pconline.com

commit 3aa0fa4c7a6f2fbfcdd1e77069fa97805faac69c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 27 14:15:48 2000 +1100

    ssh should be setuid

commit 3e955e78fa7ff4c98306c5565533ae7c645e8233
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 27 10:55:38 2000 +1100

    Add const to suppress compiler warning

commit 7d7c60d6e7b8439e1d3d6ad1a6ec39688228ac09
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 26 14:37:48 2000 +1100

     - Added 'DESTDIR' option to Makefile to ease package building. Patch from
       Jim Knoble <jmknoble@pobox.com>
     - Updated RPM spec files to use DESTDIR

commit 6d84493c8b689294d076890c073cf5a3c0789b75
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 26 12:17:50 2000 +1100

     - Fixpaths was missing /etc/ssh_known_hosts. Report from Jim Knoble
       <jmknoble@pobox.com>

commit 0e1cf7caa785dd502099c2ee0cedd852d1ded90b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 26 12:15:30 2000 +1100

     - Use preformatted manpages on SCO, report from Gary E. Miller
       <gem@rellim.com>
     - New URL for x11-ssh-askpass.

commit fa51a83f544bf84f3721fdc02f1cd568f96aee42
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 26 11:07:22 2000 +1100

     - Reorder PAM initialisation so it does not mess up lastlog. Reported
       by Andre Lucas <andre.lucas@dial.pipex.com>

commit d89c24b57edf335a69ba20421e2fe52b5f817d19
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 26 11:04:48 2000 +1100

     - Fix NULL pointer dereference in login.c. Fix from Andre Lucas
       <andre.lucas@dial.pipex.com>

commit 68cee109e84b716fc9f14558e53aa2a89d9f5eb7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 24 17:02:27 2000 +1100

     - Pick up version 1.2.2 from OpenBSD CVS (no changes, just version number
       increment)

commit def0dc9bcc68bf38170e073990873bb67a7079ad
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 23 20:18:35 2000 +1100

     - Fix lastlog support, patch from Andre Lucas <andre.lucas@dial.pipex.com>

commit 641a63f7a34ce60420768c3cdb107055241df87a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 23 11:04:25 2000 +1100

    Prepare for 1.2.2

commit 1fa154bb1e06bfb4f8d6b95f09a6352d38577c57
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 23 10:32:03 2000 +1100

     - AIX patch from Matt Richards <v2matt@btv.ibm.com> and David Rankin
       <drankin@bohemians.lexington.ky.us>

commit 6fe375dee4f0c5b81026d7eb9dc00cf75645b241
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 23 09:38:00 2000 +1100

     - OpenBSD CVS:
       - [packet.c]
         getsockname() requires initialized tolen; andy@guildsoftware.com

commit 1453785bb4cda1ff14508dbccd6dbbe9abbc6a63
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 22 19:57:40 2000 +1100

     - OpenBSD CVS updates:
       - [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8]
         ie. -> i.e.,

commit f052aaf9f6ed50de9c91d3fbda72be77a9770624
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 22 19:47:21 2000 +1100

     - OpenBSD CVS updates:
       - [packet.c]
         use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
         from Holger.Trapp@Informatik.TU-Chemnitz.DE
       - [sshd.c]
         log with level log() not fatal() if peer behaves badly.
       - [readpass.c]
         instead of blocking SIGINT, catch it ourselves, so that we can clean
         the tty modes up and kill ourselves -- instead of our process group
         leader (scp, cvs, ...) going away and leaving us in noecho mode.
         people with cbreak shells never even noticed..

commit 8dbbe6e546020e880cc01b5c6eb68484df766369
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 22 18:17:42 2000 +1100

     - Missing htons() in bsd-bindresvport.c, fix from Holger Trapp
       <Holger.Trapp@Informatik.TU-Chemnitz.DE>

commit 0727893340ca559c6fda3a982992f8f75e9ebbea
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 22 14:05:37 2000 +1100

     - Make IPv4 use the default in RPM packages
     - Irix uses preformatted manpages

commit 670a4b85540245ffc3db2ac2661f4c4c7a826118
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 22 13:53:11 2000 +1100

     - Merge preformatted manpage patch from Andre Lucas
       <andre.lucas@dial.pipex.com>

commit 91427007bca1c7e064d720820bcafce3573a668d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 22 13:25:13 2000 +1100

     - Fix compilation of bsd-snprintf.c on Solaris, fix from Ben Taylor
       <bent@clark.net>

commit ee1c0b3d3b1334d2e498aded0151ea8c0d804ebc
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 21 00:18:15 2000 +1100

     - NetBSD patch from David Rankin <drankin@bohemians.lexington.ky.us> and
       Christos Zoulas <christos@netbsd.org>

commit eab2ce023614ca49ad9d79c7c5a7ca8ee6204e7d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 20 23:58:22 2000 +1100

     - Doc updates

commit 886c63a2c533e8ce8818580920232e4903a27da7
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 20 23:13:36 2000 +1100

     - Big manpage and config file cleanup from Andre Lucas
       <andre.lucas@dial.pipex.com>
       - Re-added latest (unmodified) OpenBSD manpages

commit 88b86e40d65b3cf1238ad9eee67555a2acae61a8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 20 23:13:35 2000 +1100

     - Big manpage and config file cleanup from Andre Lucas
       <andre.lucas@dial.pipex.com>
       - Re-added latest (unmodified) OpenBSD manpages

commit 396691ad5dd3bd264a79f6d137d3e0baccf4841c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 20 22:44:08 2000 +1100

     - Update to latest OpenBSD CVS:
       - [auth-rsa.c]
         - fix user/1056, sshd keeps restrictions; dbt@meat.net
       - [sshconnect.c]
         - disable agent fwding for proto 1.3, remove abuse of auth-rsa flags.
         - destroy keys earlier
         - split key exchange (kex) and user authentication (user-auth), ok: provos@
       - [sshd.c]
         - no need for poll.h; from bright@wintelcom.net
         - disable agent fwding for proto 1.3, remove abuse of auth-rsa flags.
         - split key exchange (kex) and user authentication (user-auth), ok: provos@

commit eca71f84cb864571d677d5d1098d5c9698312607
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 20 22:38:27 2000 +1100

     - Don't use getaddrinfo on AIX

commit 7d80e3484b5a41249bee4d43b4c9a58d6ebe90a6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 19 14:36:49 2000 +1100

     - Linux/glibc-2.1.2 takes a *long* time to look up names for AF_UNSPEC
       addresses using getaddrinfo(). Added a configure switch to make the
       default lookup mode AF_INET

commit eaf9994f7e5fdddb7ded0cd9d757921ed8a9dc67
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 19 13:45:07 2000 +1100

     - SCO compile fixes from Gary E. Miller <gem@rellim.com>

commit 9550a24e0198bde53d4d4404ed16b7b8957a7ada
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Jan 19 10:41:23 2000 +1100

     - Compile fix from Darren_Hall@progressive.com

commit e0f4574cd0b20bacb37ca60ee12d38825fd7dbc8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 18 09:12:06 2000 +1100

     - Compile fix for HPUX and Solaris from Andre Lucas
       <andre.lucas@dial.pipex.com>

commit ca673b3d0393e38c06071e1d9d51863fdeff672c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 18 09:01:27 2000 +1100

     - Makefile fix from Gary E. Miller <gem@rellim.com>

commit dbd250f8ab4d7493e4e0aa183537b445ca05f381
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 18 08:57:14 2000 +1100

     - Fixed --with-pid-dir option

commit b13c73e385ec7f5fe9c81078c71e01141894eca6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 22:02:17 2000 +1100

     - Substitute PID directory in sshd.8. Suggestion from Andrew
       Stribblehill <a.d.stribblehill@durham.ac.uk>

commit 6640995be8a3fde9636c7a5aae539966eb989ee6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 21:40:06 2000 +1100

     - Patch from Christos Zoulas <christos@zoulas.com>
       - Try $prefix first when looking for OpenSSL.
       - Include sys/types.h when including sys/socket.h in test programs

commit b284b546c092f5f9f8c509c8b49f7d57233a5f3f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 20:55:18 2000 +1100

     - Fix hang on logout if processes are still using the pty. Needs
       further testing.

commit d426ed6e51b1802e2d47a5ed291232a659dc251a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 19:22:36 2000 +1100

     - Fix --with-ipaddr-display option test. Fix from Jarno Huuskonen
       <jhuuskon@hytti.uku.fi>

commit 19fe9c7fd8e4a0e68f943f86b8164683fe327479
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 15:23:01 2000 +1100

     - Fix rresvport_af failure errors (logic error in bsd-bindresvport.c)

commit e219273f93fe94aa188591803be5b9a71afc338a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 13:22:55 2000 +1100

     - Fixed X11 forwarding bug on Linux. libc advertises AF_INET6
       INADDR_ANY_INIT addresses via getaddrinfo, but may not be able to
       deliver (no IPv6 kernel kernel support)
     - Released 1.2.1pre27

commit 95a29b13312eac762002c54fa5799567438b2f95
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 11:57:39 2000 +1100

    Prepare for pre27

commit f693d3b07eb541b4a9f17d79f1f435c4af802ead
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 11:56:27 2000 +1100

     - Document location of Redhat PAM file in INSTALL.

commit 834171ebca28881a55f8d624d95e6a5305948fd8
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 09:59:41 2000 +1100

     - Revert __snprintf -> snprintf aliasing. Apparently Solaris
       __snprintf isn't. Report from Theo de Raadt <theo@cvs.openbsd.org>

commit b9b94a74e6770fdf4aaae47ac82d9a7dcf20611b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 17 09:52:46 2000 +1100

     - Clean up bsd-bindresvport.c. Use arc4random() for picking initial
       port, ignore EINVAL errors (Linux) when searching for free port.

commit 62a52ef08da1f8371132278cb4025eccf56671a2
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 16 23:03:56 2000 +1100

     - Compilation fix from Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
     - Fixed broken bugfix for /dev/ptmx on Linux systems which lack
       openpty(). Report from Kiyokazu SUTO <suto@ks-and-ks.ne.jp>

commit 8f926494419b922e3c005f06f65d4ea4523cdfda
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 16 18:19:25 2000 +1100

     - Compilation fix from Kiyokazu SUTO <suto@ks-and-ks.ne.jp>

commit 5eed6a2d71a62ab575f0557d09ba5404f2ffe055
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 16 12:05:18 2000 +1100

     - Renamed --with-xauth-path to --with-xauth
     - Added --with-pid-dir option
     - Released 1.2.1pre26

commit 229779984d6531ddb2c28838c312d413307a705d
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 16 10:17:52 2000 +1100

    Added PreReq lines

commit e96c1be723550abd1353642dd6ddf0edac2aad25
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 15 14:16:10 2000 +1100

    Prepare spec files for pre26

commit b29ea913cdf6eb02cc4ccc4ce3371d678d1f562d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Jan 15 14:12:03 2000 +1100

     - Add --with-xauth-path configure directive and explicit test for
       /usr/openwin/bin/xauth for Solaris systems. Report from Anders
       Nordby <anders@fix.no>
     - Fix incorrect detection of /dev/ptmx on Linux systems that lack
       openpty. Report from John Seifarth <john@waw.be>
     - Look for intXX_t and u_intXX_t in sys/bitypes.h if they are not in
       sys/types.h. Fixes problems on SCO, report from Gary E. Miller
       <gem@rellim.com>
     - Use __snprintf and __vnsprintf if they are found where snprintf and
       vnsprintf are lacking. Suggested by Ben Taylor <bent@shell.clark.net>
       and others.

commit 34132e54cbd221d17d373fc54f4e3f7b85727f7f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 14 15:45:46 2000 +1100

     - Merged OpenBSD IPv6 patch:
       - [sshd.c sshd.8 sshconnect.c ssh.h ssh.c servconf.h servconf.c scp.1]
         [scp.c packet.h packet.c login.c log.c canohost.c channels.c]
         [hostfile.c sshd_config]
         ipv6 support: mostly gethostbyname->getaddrinfo/getnameinfo, new
         features: sshd allows multiple ListenAddress and Port options. note
         that libwrap is not IPv6-ready. (based on patches from
         fujiwara@rcac.tdi.co.jp)
       - [ssh.c canohost.c]
         more hints (hints.ai_socktype=SOCK_STREAM) for getaddrinfo,
         from itojun@
       - [channels.c]
         listen on _all_ interfaces for X11-Fwd (hints.ai_flags = AI_PASSIVE)
       - [packet.h]
         allow auth-kerberos for IPv4 only
       - [scp.1 sshd.8 servconf.h scp.c]
         document -4, -6, and 'ssh -L 2022/::1/22'
       - [ssh.c]
         'ssh @host' is illegal (null user name), from
         karsten@gedankenpolizei.de
       - [sshconnect.c]
         better error message
       - [sshd.c]
         allow auth-kerberos for IPv4 only
     - Big IPv6 merge:
       - Cleanup overrun in sockaddr copying on RHL 6.1
       - Replacements for getaddrinfo, getnameinfo, etc based on versions
         from patch from KIKUCHI Takahiro <kick@kyoto.wide.ad.jp>
       - Replacement for missing structures on systems that lack IPv6
       - record_login needed to know about AF_INET6 addresses
       - Borrowed more code from OpenBSD: rresvport_af and requisites

commit 25e4256ad4f453d8a7c1866243ec1984f859b1de
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Jan 11 10:59:47 2000 +1100

     - Fixes to auth-skey to enable it to use the standard OpenSSL libraries

commit fa824cbb7ed7d296f3984045ee9696a037b0e0f8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 7 18:51:27 2000 +1100

    Fix typo

commit 75b1d106d7a6c8826c74d7be561e2cf71602d429
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 7 14:01:41 2000 +1100

     - Solaris build fix from Gary E. Miller <gem@rellim.com>

commit 2edcda5d4c716e849459e87faeb3b03c1282cbbe
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 7 08:56:05 2000 +1100

     - New config.sub and config.guess to fix problems on SCO. Supplied
       by Gary E. Miller <gem@rellim.com>

commit 105b7f073ac053d8f00d2b79d9fd8555d34a84f3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Jan 7 08:45:55 2000 +1100

     - Better KrbIV / AFS detection, based on patch from:
       Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE>

commit f20c2aa89cd864f53e9480ea3b7f7747ecf7d8a9
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 6 20:28:41 2000 +1100

    Doc updates

commit 9254678e95f96875401f397fbf4d0a4be7286871
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 6 13:51:32 2000 +1100

    Prepare for V_1_2_1_PRE25

commit 1808f38e04dc386bd2caacffe0192d62c1a70286
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Jan 6 12:03:12 2000 +1100

     - Fixed annoying DES corruption problem. libcrypt has been
       overriding symbols in libcrypto. Removed libcrypt and crypt.h
       altogether (libcrypto includes its own crypt(1) replacement)
     - Added platform-specific rules for Irix 6.x. Included warning that
       they are untested.

commit 62ab38ab9e5bae5b516ff10ab62ef55a2592059a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 3 23:41:05 2000 +1100

     - OpenBSD CVS updates
       - [ssh-agent.c]
         cleanup_exit() for SIGTERM/SIGHUP, too. from fgsch@ and
         dgaudet@arctic.org
       - [sshconnect.c]
         compare correct version for 1.3 compat mode

commit e9c8f4dfdc0117fb02b9d9a421f07464ccadfcff
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 3 20:00:52 2000 +1100

     - Removed "nullok" directive from default PAM configuration files.
       Added information on enabling EmptyPasswords on openssh+PAM in
       UPGRADING file.

commit 645c598d3c6c64f1f20de6fc43d4484033417b4d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Jan 3 14:42:09 2000 +1100

     - Add explicit make rules for files proccessed by fixpaths.
     - Fix "make install" in RPM spec files. Report from Tenkou N. Hattori
       <tnh@kondara.org>

commit 8beab01b493d4b9c683a2a0c5da083c2e9dfd735
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 2 11:52:49 2000 +1100

     - Run fixpaths before install. (Andre Lucas)

commit 5121e3aaa6ac8f9dccd5d2487aefbf25ab2e52ea
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 2 11:49:28 2000 +1100

     - Properly clean up on exit of ssh-agent. Patch from Dean Gaudet
       <dgaudet@arctic.org>

commit 6b85a7ffa6aefa75be7b19fc08a99d3971e02412
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Jan 2 11:45:33 2000 +1100

     - Added support for directory-based lastlogs
     - Really fix typedefs, patch from Ben Taylor <bent@clark.net>
     - Prevent multiple inclusion of config.h and defines.h. Suggested
       by Andre Lucas <andre.lucas@dial.pipex.com>

commit 7cfd3e6fb631a59e28e3f6876d663fae4e63002d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 31 10:04:19 1999 +1100

    Prepare for pre24

commit aa7b64d98af7029d4e28d36f6daba564fce0d9a8
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 31 09:55:34 1999 +1100

     - Remove test for quad_t. No longer needed.

commit e7f626c8f13d52acdfc30391c68db312e9eddedf
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 31 09:49:44 1999 +1100

     - Really fix broken default path. Fix from Jim Knoble
       <jmknoble@pobox.com>

commit 3131d8bc717b2fad9b5e13a1ac1b1c1b726b3dd4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 31 09:42:24 1999 +1100

     - Fill in ut_utaddr utmp field. Report from Benjamin Charron
       <iretd@bigfoot.com>

commit b2532b3be4133d2ea7bf6acaf2b0edb8217d356e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 31 09:18:12 1999 +1100

     - Prevent typedefs from being compiled more than once. Report from
       Marc G. Fournier <marc.fournier@acadiau.ca>

commit 03783f0477a97346afaa506667f1cd91f943a6fd
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 31 09:16:40 1999 +1100

     - Fix occasional crash on LinuxPPC. Patch from Franz Sirl
       <Franz.Sirl-kernel@lauterbach.com>

commit f3e8be87ebf4eb489bcf983cf60f5f55755a8740
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 31 08:59:04 1999 +1100

     - Fix broken autoconf typedef detection. Report from Marc G.
       Fournier <marc.fournier@acadiau.ca>

commit 8eb0fd6d6fee368ff0c3de479b0c18763fe3ea3a
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 31 08:49:13 1999 +1100

     - Fix password support on systems with a mixture of shadowed and
       non-shadowed passwords (e.g. NIS). Report and fix from
       HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp>

commit 8bdeee25f8c0215812cdcdbd24f8c5b308a7b76a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 30 15:50:54 1999 +1100

     - Merged Dante SOCKS support patch from David Rankin
      <drankin@bohemians.lexington.ky.us>
     - Updated documentation with ./configure options

commit 554ef3c7c205852592504d0433c592b1a7a8d459
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 30 15:13:58 1999 +1100

    Prepare for 1.2.1pre23

commit e72b7af17e519eb1d433b5119ef551f2584f8be6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 30 15:08:44 1999 +1100

     - Removed most of the pam code into its own file auth-pam.[ch]. This
       cleaned up sshd.c up significantly.
     - Several other cleanups

commit ece22a8312357e1f34916659d77fa7dd8d15ae32
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 30 09:48:15 1999 +1100

     - OpenBSD CVS updates:
       - [auth-passwd.c]
         check for NULL 1st

commit 753331ee5e0a61adf6cf26ae0e75606a3e68947a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 30 01:29:35 1999 +1100

     - Rename helper.[ch] to (more appropriate) bsd-misc.[ch]

commit 58ca7d8503b4e6346bed0844a6ab94a9a4f2b1ec
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 29 19:56:30 1999 +1100

     - Rename helper.[ch] to (more appropriate) bsd-misc.[ch]
     - Minor Makefile cleaning

commit 06b472b12471a8179664e8f5c94441664f317f2b
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 29 19:47:06 1999 +1100

    *** empty log message ***

commit 9505851f31c52cbb76866225679fdceb788dcc5e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 29 10:36:45 1999 +1100

     - Detect missing size_t and typedef it.

commit ac3a4b4a96d952a467e1cdf660f9d471e1141f6f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 29 10:25:40 1999 +1100

     - Calls to pam_setcred, patch from Nalin Dahyabhai
       <nalin@thermo.stat.ncsu.edu>

commit d00d1611e4233b540d0f6f354e37fdd758a44d8f
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 29 10:17:09 1999 +1100

     - Print whether OpenSSH was compiled with RSARef, patch from
       Nalin Dahyabhai <nalin@thermo.stat.ncsu.edu>

commit e79334a2b06d4c897c4b764e5e94af72320e3ea9
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 29 10:03:37 1999 +1100

     - Autodetect perl, patch from David Rankin
       <drankin@bohemians.lexington.ky.us>

commit 9550a76c3716acc1a591dd9604cbc958a92ad891
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 29 02:32:22 1999 +1100

     - Applied another NetBSD portability patch from David Rankin
       <drankin@bohemians.lexington.ky.us>
     - Fix --with-default-path option.

commit 74d0d4a3d9157823fda11c892c6d592562486b84
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 29 02:24:35 1999 +1100

     - Merged AIX patch from Darren Hall <dhall@virage.org>
     - Cleaned up defines.h

commit cadc6bb72f60e48c65397eb67e76064931d78306
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 28 15:19:49 1999 +1100

    Spec file tweaks

commit beb4ba5a68dbfa478bcc375cc885a047a8301c0d
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 28 15:09:35 1999 +1100

     - Portability fixes for Irix 5.3 (now compiles OK!)
     - autoconf and other misc cleanups

commit 4ff2b9bf429f40cb4d8119108cd7c4aa76c081ee
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 28 10:41:12 1999 +1100

     - NetBSD login.c compile fix from David Rankin
      <drankin@bohemians.lexington.ky.us>
     - Fully set ut_tv if present in utmp or utmpx

commit 13bc0be2b65b65ab7ac020bbd0a772ed3abe1738
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 28 10:19:16 1999 +1100

     - Replacement for getpagesize() for systems which lack it

commit 68e45de53b72087a77069a61c4e789e2012cd706
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 27 23:54:55 1999 +1100

     - OpenBSD CVS updates:
       - [packet.h auth-rhosts.c]
         check format string for packet_disconnect and packet_send_debug, too
       - [channels.c]
         use packet_get_maxsize for channels. consistence.

commit 6a5d4d61bd6109c61bbbb6b7cd48422466260319
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 27 16:46:17 1999 +1100

    *** empty log message ***

commit 95c8e5dec34719c8f47625bf669bd7e4f8d0118b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 27 16:43:42 1999 +1100

    Populate ut_id with last few chars of tty line

commit e12762437cba818ba9e05fe4eed90a39c0ef887b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 27 11:33:56 1999 +1100

     - Use last few chars of tty line as ut_id

commit 438dfa9dea6a08e80549cf6110a0d159500f168a
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 27 11:27:12 1999 +1100

    Doc update

commit d33201e91662a23c6b22f0c748a9b6911c6e78c0
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 27 10:55:23 1999 +1100

    typo

commit 373d2917a8349aa39f31791ceaaf7fc21b945084
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 27 10:45:54 1999 +1100

     - PAM bugfix. PermitEmptyPassword was being ignored.
     - Fixed PAM config files to allow empty passwords if server does.
     - Explained spurious PAM auth warning workaround in UPGRADING

commit 5a3e68382d3414b922af58a19196635d750581ca
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 27 09:48:56 1999 +1100

     - Added --with-default-path to specify custom path for server
     - Removed #ifdef trickery from acconfig.h into defines.h

commit c0d739039807abaa7985112370b4c5f4e85e02d7
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 27 09:23:58 1999 +1100

     - Automatically correct paths in manpages and configuration files. Patch
       and script from Andre Lucas <andre.lucas@dial.pipex.com>
     - Removed credits from README to CREDITS file, updated.

commit aae1093640162022abba350d94c3051e6d730425
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 19:38:17 1999 +1100

     - Redhat RPM spec fixes from Jim Knoble <jmknoble@pobox.com>

commit 9673b2b59abb0e6f04bc9224d90c574fd75c52bc
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 19:10:30 1999 +1100

     - Fixed implicit '.' in default path, report from Jim Knoble
       <jmknoble@pobox.com>

commit 4f0fa56b5d26458e87988729769d79b775547691
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 14:24:41 1999 +1100

     - OpenBSD CVS update:
       - [ssh-keygen.1 ssh.1]
         remove ref to .ssh/random_seed, mention .ssh/environment in
         .Sh FILES, too

commit d49621ea530ce976a17ba043eedba137c60bc10a
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 14:04:33 1999 +1100

     - Disable logging of PAM success and failures, PAM is verbose enough.
       Unfortunatly there is currently no way to disable auth failure
       messages. Mention this in UPGRADING file and sent message to PAM
       developers

commit 780b376a372f4eefb4c7cda8a8dd2e15cc390c19
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 13:36:11 1999 +1100

    Doc and Doh! fixes

commit 3b623d900e15b9565c3c5448c2c172ae467132b7
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 13:31:06 1999 +1100

    Better fix for PAM logging

commit e17ba1007ea73231c20c42c8cf61ecae58f3bdba
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 13:25:49 1999 +1100

    Fix typo in PAM config

commit bbdf9ab05de3a1432fad3039617741ed5df89d09
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 13:16:54 1999 +1100

    Added docs files and app defaults to askpass

commit f6adfa903746c9b0c8edb6df8f8900ac978d2b78
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 13:08:15 1999 +1100

    Typos

commit 92e073599eb52a28e57ed1bcadd74f979f37ef5c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 13:05:11 1999 +1100

    Typos

commit 47707dbda323f0f8c94198f23d075865bb650c2c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 12:46:46 1999 +1100

    Doh! RPM doesn't support conditional building

commit 3688440c4d6b0493823d50f4d46659ecb2121b83
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 12:26:21 1999 +1100

     - Revised RPM package to include Jim Knoble's <jmknoble@pobox.com>
       X11 ssh-askpass program.
     - Revised RPM package to use conditional building of gnome and X11
       askpass packages.

commit 32b3cf2c96fd8cee6cb082821a43d3375c850d58
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Dec 26 10:21:48 1999 +1100

    19991226
     - Enabled utmpx support by default for Solaris
     - Cleanup sshd.c PAM a little more
    
    19991225
     - Merged fixes from Ben Taylor <bent@clark.net>
     - Fixed configure support for PAM. Reported by Naz <96na@eng.cam.ac.uk>
     - Disabled logging of PAM password authentication failures when password
       is empty. (e.g start of authentication loop). Reported by Naz
       <96na@eng.cam.ac.uk>)

commit 2e1b082dfbc5dcdae80957a3d889abe9fa480d77
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 25 10:11:29 1999 +1100

    - Prepare for 1.2.1pre20
    
    19991225
     - More fixes from Andre Lucas <andre.lucas@dial.pipex.com>
     - Cleanup of auth-passwd.c for shadow and MD5 passwords
     - Cleanup and bugfix of PAM authentication code
    
    19991223
     - Merged later HPUX patch from Andre Lucas
       <andre.lucas@dial.pipex.com>
     - Above patch included better utmpx support from Ben Taylor
       <bent@clark.net>:

commit 1b0c228ec48d54705474701b6486f1593539a88a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 22 16:09:48 1999 +1100

     - Fix login.c breakage on systems which lack ut_host in struct
       utmp. Reported by Willard Dawson <willard.dawson@sbs.siemens.com>

commit 365199d8a5a508bf8b197352f2a585df051de607
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 22 00:12:38 1999 +1100

     - Fix undefined fd_set type in ssh.h from Povl H. Pedersen
       <pope@netguide.dk>

commit e8852919f9fc42d7b61ffcfd3c3d86de84d69ad8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 21 22:50:50 1999 +1100

    Prepare for 1.2.1pre19

commit ca9fbb6eac8c4cb90badc5d868cf81417484c87f
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 21 21:30:56 1999 +1100

    Fix broken macros

commit 5ffe3704c203de933674debad646023107f64423
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 21 21:28:09 1999 +1100

    Make ready for 1.2.1pre19

commit cb7e5f9ae15a78baee4ad10a102f2d93ab99909a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 21 21:03:09 1999 +1100

     - Fix DISABLE_SHADOW support
     - Allow MD5 passwords even if shadow passwords are disabled

commit f039badd728904ef653990ffff801fc8b0d42636
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 21 20:57:20 1999 +1100

     - OpenBSD CVS update:
       - [sshconnect.c]
       say "REMOTE HOST IDENTIFICATION HAS CHANGED"

commit 76112de73437ac3db04b45d4b7a9d1f1b74f83fd
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 21 11:18:08 1999 +1100

     - Integration of large HPUX patch from Andre Lucas
       <andre.lucas@dial.pipex.com>. Integrating it had a few other
       benefits:
       - Ability to disable shadow passwords at configure time
       - Ability to disable lastlog support at configure time
       - Support for IP address in $DISPLAY

commit 368cf64d5c7cee6eb85d9240ea04ccf43273b5fc
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 21 09:51:36 1999 +1100

    Made utmpx optional

commit fdb7caf293e860fda343f9cc98ff3342ed997b73
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 18 20:57:40 1999 +1100

    Avoid breakage on systems lacking IPv6 headers

commit c4c647fb9465ae98816c5a6a1a6d9dae0e383e9a
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 18 20:54:52 1999 +1100

     - Redhat init script patch from Chun-Chung Chen
       <cjj@u.washington.edu>

commit fdb5f13c5b5e73dffd50dbf61a37bf3aeb3e5fae
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Dec 17 14:02:47 1999 +1100

    Added key generation progress meter

commit 8f9d5073d8bed2c15843eb0c374b70b4c9486605
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 16 15:10:45 1999 +1100

     - Correctly handle empty passwords in shadow file. Patch from:
       "Chris, the Young One" <cky@pobox.com>

commit 217ab302d8a389bdcb9fec8685556dadfceb1c86
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 16 13:21:52 1999 +1100

    Be more specific about required software versions

commit 5e7c10eedb1745b9d72dd184ceede504d92e5a3a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 16 13:18:04 1999 +1100

     - Merged OpenBSD CVS changes:
       - [authfd.c ssh-agent.c]
         keysize warnings talk about identity files
       - [packet.c]
         "Connection closed by x.x.x.x": fatal() -> log()

commit 18ccf85863520823b9210dfd1d67366d90d74735
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 16 13:06:18 1999 +1100

     - Makefile changes for Solaris from Peter Kocks
       <peter.kocks@baygate.com>

commit ab8a4da00378965409a32b4be80ceb9474c0a0f6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 16 13:05:30 1999 +1100

    Doc updates

commit ceb483fac2d96f06b84eab8647dd4640df674b1b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 16 13:05:17 1999 +1100

    Fix compiler warning

commit 11ba8d4e12ddd1c6ce935770952b9fd1958cf2ea
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 15 16:42:45 1999 +1100

    Make break

commit 48f2494df3caedac3d3244ae3b5eefbb5ede43f0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 15 16:35:02 1999 +1100

    Prepare for 1.2.1pre18

commit b6359ba4b84d8982440f57a374b594c85284a813
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 15 16:33:33 1999 +1100

    Fix __attribute__ breakage

commit 864ea59da63b4941575e95f7dbbb361f88ee53ef
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 15 11:04:25 1999 +1100

     - Integrated patchs from Juergen Keil <jk@tools.de>
       - Fix SIGIO error in scp
       - Simplify status line printing in scp

commit 3b9d5e993ad50613fb990f1b70c0ce77793cba8c
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 15 09:34:31 1999 +1100

     - Added better test for inline functions compiler support from
       Darren_Hall@progressive.com

commit 84093e9d7407b64673d20b38a02bca432f970ba6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 15 09:06:28 1999 +1100

     - Integrated patchs from Juergen Keil <jk@tools.de>
       - Avoid void* pointer arithmatic
       - Use LDFLAGS correctly

commit 6ae00d6c965e61fc394b8adb698e9d8c603bbe75
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 14 15:43:03 1999 +1100

     - Some older systems don't have poll.h, they use sys/poll.h instead
     - Doc updates

commit 36b339a9064e1848728d82c0c75ca3e87c60b3ae
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 14 10:54:47 1999 +1100

     - Clean up broken includes in pty.c

commit a34a28bf86c04eb35c522b1e31c32e94edf355d2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 14 10:47:15 1999 +1100

     - OpenBSD CVS Changes
       - [canohost.c]
         fix get_remote_port() and friends for sshd -i;
         Holger.Trapp@Informatik.TU-Chemnitz.DE
       - [mpaux.c]
         make code simpler. no need for memcpy. niels@ ok
       - [pty.c]
         namebuflen not sizeof namebuflen; bnd@ep-ag.com via djm@mindrot.org
         fix proto; markus
       - [ssh.1]
          typo; mark.baushke@solipsa.com
       - [channels.c ssh.c ssh.h sshd.c]
         type conflict for 'extern Type *options' in channels.c; dot@dotat.at
       - [sshconnect.c]
         move checking of hostkey into own function.
       - [version.h]
         OpenSSH-1.2.1

commit c6b3bbe2b991f4f87ca1f8214f43c13a5a73f385
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 13 08:27:33 1999 +1100

     - Fix compilation on systems with AFS. Reported by
       aloomis@glue.umd.edu
     - Fix installation on Solaris. Reported by
       Gordon Rowell <gordonr@gormand.com.au>
     - Fix gccisms (__attribute__ and inline). Report by edgy@us.ibm.com,
       patch from Markus Friedl <markus.friedl@informatik.uni-erlangen.de>
     - Auto-locate xauth. Patch from David Agraz <dagraz@jahoopa.com>
     - Compile fix from David Agraz <dagraz@jahoopa.com>
     - Avoid compiler warning in bsd-snprintf.c
     - Added pam_limits.so to default PAM config. Suggested by
       Jim Knoble <jmknoble@pobox.com>

commit 4e0dbd07cf1021897210c11a16fd05f207d95b8e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 9 10:57:00 1999 +1100

    Whitespace

commit d7f6615e781fcbb1a4873e688bc6143faac54fd5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 9 10:48:58 1999 +1100

     - Applied patch from David Rankin <drankin@bohemians.lexington.ky.us>
       to fix libwrap support on NetBSD

commit 6646badaa6e40c45efe52d9c2e8285f8c5301f5f
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 9 10:42:10 1999 +1100

    Prepare for 1.2pre17

commit 50945fa861f9b17d0cf88ec7998847bcf1c5eda6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 9 10:31:37 1999 +1100

     - OpenBSD CVS updates:
       - [readpass.c]
         avoid stdio; based on work by markus, millert, and I
       - [sshd.c]
         make sure the client selects a supported cipher
       - [sshd.c]
         fix sighup handling.  accept would just restart and daemon handled
         sighup only after the next connection was accepted. use poll on
         listen sock now.
       - [sshd.c]
         make that a fatal

commit bf1c9b2012fadab02392126bece5d21e9ddffda6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Dec 9 10:16:54 1999 +1100

     - Import of patch from Ben Taylor <bent@clark.net>:
       - Improved PAM support
       - "uninstall" rule for Makefile
       - utmpx support
       - Should fix PAM problems on Solaris

commit fce1648681a20b99f569d4bfd9335bc4a956b119
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Dec 8 08:53:52 1999 +1100

     - Compile fix for Solaris with /dev/ptmx from
       David Agraz <dagraz@jahoopa.com>

commit 05ec5c64251075aa40c74842a429546383d9b354
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 17:03:33 1999 +1100

    Third time lucky

commit a3c60900610165a88694c461119a146fbdaf9cc4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 17:02:57 1999 +1100

    Third time lucky

commit 1b3dfe32b609f852326df1d0877a7a3e869619aa
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 17:01:13 1999 +1100

    undone silly changes

commit dc88b4d37b4fd980674e781d3523d9f52c268cec
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 17:00:20 1999 +1100

    Vicarious (sp?) changes to try to fix -k option

commit f5d69a521fd07310b847092e3aad9e8602421a55
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 16:55:04 1999 +1100

    doc

commit 145fdca36d0c7c4082c3f26c3647e5c393316dcc
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 16:51:32 1999 +1100

    forgot -kb when imported

commit 81b25cf0a96f516d8ebc4a9b2684b4f46ce79b77
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 16:47:28 1999 +1100

    Forgot -kb

commit 23aa96edca3f8db12a7548108c2b05bf1f28a14a
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 16:45:20 1999 +1100

    Reimport with -kb set

commit 534115826b5d347610605f6559359d74542195e1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 16:45:00 1999 +1100

    Forgot -kb when checking in

commit 871f3ca1e71c8055e0bb95be98cb49dc80e5ce79
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 16:32:10 1999 +1100

    Quiet untar

commit aca55fe73cbd79a01945052a5da7f43c4a30c9cc
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 16:31:18 1999 +1100

    Add buildprereq

commit af2604a57e47acb7679e2662c66510c35390ca45
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 16:21:40 1999 +1100

    *** empty log message ***

commit f6b290dc159d2102a7f6e7290acb1d9559980f90
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 16:21:32 1999 +1100

    Tweak

commit 93168eb2748276e4f48b0b587895ca287dbea7bb
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 16:20:49 1999 +1100

    Updated spec

commit 037a0dc0835bb5a442bdcbeecdd5baed723f0b45
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 15:38:31 1999 +1100

     - Merged more OpenBSD changes:
       - [atomicio.c authfd.c scp.c serverloop.c ssh.h sshconnect.c sshd.c]
         move atomicio into it's own file.  wrap all socket write()s which
         were doing write(sock, buf, len) != len, with atomicio() calls.
       - [auth-skey.c]
         fd leak
       - [authfile.c]
         properly name fd variable
       - [channels.c]
         display great hatred towards strcpy
       - [pty.c pty.h sshd.c]
         use openpty() if it exists (it does on BSD4_4)
       - [tildexpand.c]
         check for ~ expansion past MAXPATHLEN
     - Modified helper.c to use new atomicio function.
     - Reformat Makefile a little
     - Moved RC4 routines from rc4.[ch] into helper.c
     - Added autoconf code to detect /dev/ptmx (Solaris) and /dev/ptc (AIX)

commit eabf3417bc73ca9546a3ed489cd809ffdf303853
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 14:56:27 1999 +1100

     - Fix PAM account and session being called multiple times. Problem
       reported by Adrian Baugh <adrian@merlin.keble.ox.ac.uk>

commit 3bc14dde057f5d1faee1df1d29a6520063102b77
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 14:54:53 1999 +1100

    Fixed default SSH_ASKPASS

commit 0c078c663312a31045b5a59196610e086bc8b4b2
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Dec 7 14:53:57 1999 +1100

     - sshd Redhat init script patch from Jim Knoble <jmknoble@pobox.com>
       fixes compatability with 4.x and 5.x

commit aae6c614da614eb10ced16505f35410671c95d9d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Dec 6 11:47:28 1999 +1100

     - Merged OpenBSD CVS changes:
       - [auth-krb4.c auth-passwd.c auth-skey.c ssh.
         move skey-auth from auth-passwd.c to auth-s
       - [auth-rsa.c]
         warn only about mismatch if key is _used_
         warn about keysize-mismatch with log() not
         channels.c readconf.c readconf.h ssh.c ssh.
         ports are u_short
       - [hostfile.c]
         indent, shorter warning
       - [nchan.c]
         use error() for internal errors
       - [packet.c]
         set loglevel for SSH_MSG_DISCONNECT to log(
         serverloop.c
         indent
       - [ssh-add.1 ssh-add.c ssh.h]
         document , reasonable default
       - [ssh.1]
         CheckHostIP is not available for connects v
       - [sshconnect.c]
         typo
         easier to read client code for passwd and s
         turn of checkhostip for proxy connects, sin

commit dc33fc3910552c82518503b581efc1a51192fa76
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Dec 4 20:24:48 1999 +1100

    Small cleanup of PAM code

commit 1f7833deba0c9b4fa7872d7b01e31e4cbd540ad4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 30 09:47:52 1999 +1100

    Fix symlinks on Solaris

commit 42b81ffe7d1e98b362696076edbc56a66368053e
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 26 12:21:24 1999 +1100

     - Add definition for __P()
     - Added [v]snprintf() replacement for systems that lack it

commit bf3f6ef19b8d43b09598807cc30de7e66be37563
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 13:50:10 1999 +1100

    Doc updates

commit 16dae4cf2a249f6b758df484181e21aa84f150a1
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 13:41:09 1999 +1100

    disable buildprereqs for Suse RPM

commit f066d6e5b093c0772b947fb0391e440fa074ef5c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 13:40:22 1999 +1100

    install fix

commit f958fab2c9801357d70a592185650f5d17a09074
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 13:36:42 1999 +1100

    install cleanup

commit 34d207f870c7ef56b00ca87afafa1a0a3cb4facb
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 13:32:34 1999 +1100

    Install correct askpass

commit c0f129a95fd4d7f1e69db6189afd0570abea5a97
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 13:26:36 1999 +1100

    Don't need to #define ASKPASS_PROGRAM any more

commit 297dc42c1cbf3ac9e238030282f2c8bbd4440f1b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 13:24:58 1999 +1100

    Update SPEC files

commit 98ac007ad9e4b94c58e49b5ca86e9f444be930bd
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 13:19:55 1999 +1100

    Removed old with-askpass option

commit 063fdf82755e53b5a2cf5265aaa654969b23b459
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 13:08:31 1999 +1100

     - Merged beginnings of AIX support from Tor-Ake Fransson <torake@hotmail.com>

commit d8087f62d6974c812fb956429ec0dba801ab66d3
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 12:31:26 1999 +1100

     - Added BSD compatible install program and autoconf test, thanks to
       Niels Kristian Bech Jensen <nkbj@image.dk>
     - Solaris fixing, thanks to Ben Taylor <bent@clark.net>

commit 78224a06657a741d9a25347d2b68b182eccd925a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 11:55:45 1999 +1100

     - More reformatting merged from OpenBSD CVS
     - Merged OpenBSD CVS changes:
       - [channels.c]
         fix packet_integrity_check() for !have_hostname_in_open.
         report from mrwizard@psu.edu via djm@ibs.com.au
       - [channels.c]
         set SO_REUSEADDR and SO_LINGER for forwarded ports.
         chip@valinux.com via damien@ibs.com.au
       - [nchan.c]
         it's not an error() if shutdown_write failes in nchan.
       - [readconf.c]
         remove dead #ifdef-0-code
       - [readconf.c servconf.c]
         strcasecmp instead of tolower
       - [scp.c]
         progress meter overflow fix from damien@ibs.com.au
       - [ssh-add.1 ssh-add.c]
         SSH_ASKPASS support
       - [ssh.1 ssh.c]
         postpone fork_after_authentication until command execution,
         request/patch from jahakala@cc.jyu.fi via damien@ibs.com.au
         plus: use daemon() for backgrounding

commit 5428f646ad32da88ddd04a8c287d595524674fbf
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 11:54:57 1999 +1100

     - More reformatting merged from OpenBSD CVS
     - Merged OpenBSD CVS changes:
       - [channels.c]
         report from mrwizard@psu.edu via djm@ibs.com.au
       - [channels.c]
         set SO_REUSEADDR and SO_LINGER for forwarded ports.
         chip@valinux.com via damien@ibs.com.au
       - [nchan.c]
         it's not an error() if shutdown_write failes in nchan.
       - [readconf.c]
         remove dead #ifdef-0-code
       - [readconf.c servconf.c]
         strcasecmp instead of tolower
       - [scp.c]
         progress meter overflow fix from damien@ibs.com.au
       - [ssh-add.1 ssh-add.c]
         SSH_ASKPASS support
       - [ssh.1 ssh.c]
         postpone fork_after_authentication until command execution,
         request/patch from jahakala@cc.jyu.fi via damien@ibs.com.au
         plus: use daemon() for backgrounding

commit 9072e1889648988da38b7b81bce95291c1dc3a23
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 10:42:08 1999 +1100

    *** empty log message ***

commit 95def09838fc61b37b6ea7cd5c234a465b4b129b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 25 00:26:21 1999 +1100

     - Merged very large OpenBSD source code reformat
     - OpenBSD CVS updates
       - [channels.c cipher.c compat.c log-client.c scp.c serverloop.c]
         [ssh.h sshd.8 sshd.c]
         syslog changes:
         * Unified Logmessage for all auth-types, for success and for failed
         * Standard connections get only ONE line in the LOG when level==LOG:
           Auth-attempts are logged only, if authentication is:
              a) successfull or
              b) with passwd or
              c) we had more than AUTH_FAIL_LOG failues
         * many log() became verbose()
         * old behaviour with level=VERBOSE
       - [readconf.c readconf.h ssh.1 ssh.h sshconnect.c sshd.c]
         tranfer s/key challenge/response data in SSH_SMSG_AUTH_TIS_CHALLENGE
         messages. allows use of s/key in windows (ttssh, securecrt) and
         ssh-1.2.27 clients without 'ssh -v', ok: niels@
       - [sshd.8]
         -V, for fallback to openssh in SSH2 compatibility mode
       - [sshd.c]
         fix sigchld race; cjc5@po.cwru.edu

commit 4d2f15f895f4c795afc008aeff3fd2ceffbc44f4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 23 12:36:29 1999 +1100

     - Add recommendation to use GNU make to INSTALL document

commit 3744b5191822525a69861c1bc035cf955be196a1
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 23 11:24:32 1999 +1100

     - Numerous little Solaris fixes

commit 294df785b8f67a5890d1e49ba883d530cdfb534c
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 23 10:11:29 1999 +1100

     - Added SuSE package files from Chris Saia <csaia@wtower.com>
     - Restructured package-related files under packages/
     - Added generic PAM config

commit 24e83aa312616f07995241c1529291a3e01ae3bf
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 22 22:42:17 1999 +1100

    Use puts instead of printf

commit f7c0f82ceed409baabeec7771a3514b33231cc8b
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 22 22:31:49 1999 +1100

     - Configure, Make and changelog corrections from Tudor Bosman
       <tudorb@jm.nu> and Niels Kristian Bech Jensen <nkbj@image.dk>

commit 66c14888e3939b8d8cf2847c6f01210dd86d9996
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 22 18:13:13 1999 +1100

    prepare for 1.2pre14

commit d733c91bf3e66c4b14228b3dc20ed448a3bc6d7c
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 22 18:11:23 1999 +1100

    Only display comment for ssh-askpass

commit 755c90c34c3bebd08c72a187bbcd8235a4939a6d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 22 16:12:31 1999 +1100

    Doc updates

commit d770252d3a6dfe5e97d1a6846e2e5bfde92accc2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 22 16:11:05 1999 +1100

     - Added a setenv replacement for systems which lack it

commit d71b12ee5b6b0283ce41ff2d9c8864c6aadc6bbe
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 22 15:24:34 1999 +1100

     - Fix EGD problems (Thanks to Ben Taylor <bent@clark.net>)
     - Retry /dev/urandom reads interrupted by signal (report from
       Robert Hardy <rhardy@webcon.net>)

commit 859cec02509ae0d3e2f34051d0f9d7366b6ca62f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 22 14:27:24 1999 +1100

     - Added autoconf test and macro to deal with old PAM libraries
       pam_strerror definition (one arg vs two).

commit b3ca3aa12f8248c2d9e23f15a46e0f3c97397e54
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 22 13:57:07 1999 +1100

     - Added OpenBSD bsd-strlcat.c, created bsd-strlcat.h
     - Added timersum() macro
     - Tidy RCSIDs of bsd-*.c

commit a75cb9666237b3479471238eb26b39872b9858e0
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 22 13:55:36 1999 +1100

    error message fix

commit 83df0693331918f067f7c3501f1229272d2b00e9
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 22 13:22:29 1999 +1100

     - OpenBSD CVS Changes
       - [ssh-keygen.c]
         don't create ~/.ssh only if the user wants to store the private
         key there. show fingerprint instead of public-key after
         keygeneration. ok niels@

commit 22218727fdf4ad356b7ad9ec5f4406e31858db1d
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 22 12:51:42 1999 +1100

     - Make <enter> close gnome-ssh-askpass (Debian bug #50299)

commit 431f66b68c98e9db87574860a0a29d8d8aa9b52c
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Nov 21 18:31:57 1999 +1100

        - [OVERVIEW README] typos; green@freebsd
        - [ssh-keygen.c]
          replace xstrdup+strcat with strlcat+fixed buffer, fixes OF (bad me)
          exit if writing the key fails (no infinit loop)
          print usage() everytime we get bad options
        - [ssh-keygen.c] overflow, djm@mindrot.org
        - [sshd.c] fix sigchld race; cjc5@po.cwru.edu

commit 6162d1215bbff30cf0c4c19368dc85ae570d44ca
Author: Damien Miller <djm@mindrot.org>
Date:   Sun Nov 21 13:23:52 1999 +1100

      - OpenBSD CVS Changes
        - [channels.c]
          make this compile, bad markus
        - [log.c readconf.c servconf.c ssh.h]
          bugfix: loglevels are per host in clientconfig,
          factor out common log-level parsing code.
        - [servconf.c]
          remove unused index (-Wall)
        - [ssh-agent.c]
          only one 'extern char *__progname'
        - [sshd.8]
          document SIGHUP, -Q to synopsis
        - [sshconnect.c serverloop.c sshd.c packet.c packet.h]
          [channels.c clientloop.c]
          SSH_CMSG_MAX_PACKET_SIZE, some clients use this, some need this, niels@
          [hope this time my ISP stays alive during commit]

commit f58db38f8d396ee5ea42975d9409a644e01cede8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 20 17:02:56 1999 +1100

    Fix segfault

commit c6398efcbaa2c8fea00420940fcf99b183ff24e9
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 20 12:18:40 1999 +1100

     - Merged more Solaris support from Marc G. Fournier
       <marc.fournier@acadiau.ca>
     - Wrote autoconf tests for integer bit-types
     - Fixed enabling kerberos support

commit 36fb30f6dd11515087e6298cb17e96a3f2f5b679
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 19:14:04 1999 +1100

    Die if lastlog not found

commit 01c114cc800b9a7785186610c9a9553258fbe8ff
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 17:25:16 1999 +1100

    Fix doc files

commit 7b5722fe65cfda47e69259ab772b65cf9f8fad47
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 17:23:50 1999 +1100

    Fix askapss files

commit 73aaa7690a25cb8ff0e4d60f5d80acc454dd60c4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 17:21:35 1999 +1100

    Fix doc files

commit e232455ed9911614725dd311935d5b865da547c5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 17:18:57 1999 +1100

    Fix libexecdir

commit a63023b4ff0a351115095b0abf1225d3cd071fe0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 17:14:16 1999 +1100

    Prepare for pre13

commit c09672740e0b15c9f3ed9503cbe95bbb0a50b19b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 15:53:50 1999 +1100

    Doc updates

commit dd1c7baf1a35d3bfd36cb1c283d08bbeb28f2831
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 15:53:20 1999 +1100

    - Added non-PAM MD5 password support patch from Tudor Bosman <tudorb@jm.nu>

commit 04f801456ad64b8f08bb8643cf19e0b9ca477b36
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 15:32:34 1999 +1100

     - Renamed BSD helper function files to bsd-*
     - Added tests for login and daemon and OpenBSD replacements for when they
       are absent.

commit 8029775b77e8f8bc380518f9f734a9d979025bbb
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 13:03:25 1999 +1100

     - Added autoconf option to enable Kerberos 4 support (untested)
     - Added autoconf option to enable AFS support (untested)
     - Added autoconf option to enable S/Key support (untested)
     - Added autoconf option to enable TCP wrappers support (compiles OK)

commit 18ac1719687a6671242d6a001cab01d55036ef8b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 12:43:19 1999 +1100

    - Move scp from ${libdir}/ssh to ${libexecdir}/ssh at request of
      David Rankin <drankin@bohemians.lexington.ky.us>

commit dc9365bf8b4180fcbab32efd231d86760587be7f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 12:34:14 1999 +1100

     Fix progress bar bug

commit 58fc473907bce8d4c8b3f01cdc618f755c3f914d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 12:05:01 1999 +1100

     - EGD uses a socket, not a named pipe. Duh.
     - Fix includes in fingerprint.c

commit 23b783952a3b9c3daadff0b97b9f8e312c3a72be
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 08:25:48 1999 +1100

     - Merged OpenBSD CVS changes
       - [auth-rhosts.c auth-rsa.c ssh-agent.c sshconnect.c sshd.c]
         more %d vs. %s in fmt-strings
       - [authfd.c]
         Integers should not be printed with %s

commit 5bbbd364c993ef1d51ba77e40bb56fc017d8ea78
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 19 07:56:21 1999 +1100

     - Merged PAM buffer overrun patch from Chip Salzenberg <chip@valinux.com>

commit 6ee9564901ea162d8719c38912abaa8bb99ebe9b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 18 11:35:13 1999 +1100

    Typo

commit 81428f9d10e81d9fe2e4af10df0c4e38d1192d70
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 18 09:28:11 1999 +1100

     - Merged OpenBSD CVS changes
       - [scp.c] foregroundproc() in scp
       - [sshconnect.h] include fingerprint.h
       - [sshd.c] bugfix: the log() for passwd-auth escaped during logging
         changes.
     - Added openssh.com info to README

commit 10f6f6ba9ee14d306f8780edee8a10640c1643e0
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 17 17:29:08 1999 +1100

     - Merged OpenBSD CVS changes
       - [ChangeLog.Ylonen] noone needs this anymore
       - [authfd.c] close-on-exec for auth-socket, ok deraadt
       - [hostfile.c]
         in known_hosts key lookup the entry for the bits does not need
         to match, all the information is contained in n and e. This
         solves the problem with buggy servers announcing the wrong
         modulus length.  markus and me.
       - [serverloop.c]
         bugfix: check for space if child has terminated, from:
         iedowse@maths.tcd.ie
       - [ssh-add.1 ssh-add.c ssh-keygen.1 ssh-keygen.c sshconnect.c]
         [fingerprint.c fingerprint.h]
         rsa key fingerprints, idea from Bjoern Groenvall <bg@sics.se>
       - [ssh-agent.1] typo
       - [ssh.1] add OpenSSH information to AUTHOR section. okay markus@
       - [sshd.c]
         force logging to stderr while loading private key file
         (lost while converting to new log-levels)

commit d743bba481056ba3d1c229c18fd42c6bdc3f8d74
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 16 13:45:26 1999 +1100

    Clarify mailing list details

commit 7e8e820153a620ab1dcd81857a7de0969c41d043
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 16 13:37:16 1999 +1100

     - Merged OpenBSD CVS changes:
       - [auth-rh-rsa.c auth-rsa.c authfd.c authfd.h hostfile.c mpaux.c]
         [mpaux.h ssh-add.c ssh-agent.c ssh.h ssh.c sshd.c]
         the keysize of rsa-parameter 'n' is passed implizit,
         a few more checks and warnings about 'pretended' keysizes.
       - [cipher.c cipher.h packet.c packet.h sshd.c]
         remove support for cipher RC4
       - [ssh.c]
         a note for legay systems about secuity issues with permanently_set_uid(),
         the private hostkey and ptrace()
       - [sshconnect.c]
         more detailed messages about adding and checking hostkeys

commit 4874c79a3a05fc18678d7a85d7091f5139630fac
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 16 13:29:26 1999 +1100

     - Fix some Linux libc5 problems reported by Miles Wilson <mw@mctitle.com>

commit a7cafae274f8ee56bc36a20a488254432f70c7d5
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 16 08:02:27 1999 +1100

    Added upgrade instructions

commit 2a9d9f6ce42c0b4ad13a6cffbaf742a93376e155
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 15 23:34:11 1999 +1100

    Doc updates

commit 2e8b1c86609abae1157bbd9b9ff28a4e852aff74
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 15 23:33:56 1999 +1100

    OpenBSD CVS: fix .Xr

commit 3668206da4cb71a75863e6eaecc718849062bcef
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 15 17:19:24 1999 +1100

    - Split subpackages further based on patch from jim knoble <jmknoble@pobox.com>

commit 3f905872b0d15be24078c4db131f0ecdb5ebb5e6
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 15 17:10:57 1999 +1100

     - Merged more Solaris compability from Marc G. Fournier
       <marc.fournier@acadiau.ca>
     - Wrote autoconf tests for __progname symbol

commit c6d5ce86a9ed296dbc99b8fc593099a87830fd18
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 15 16:01:07 1999 +1100

    Fixed spello

commit 3bd49ec5c4b1e5d9fb08282796b4a3b487f8f196
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 15 15:40:55 1999 +1100

     - Various small cleanups to bring diff (against OpenBSD) size down.

commit 2ccf661cbe0924a1549a74b5a4f970e90f94d6a9
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 15 15:25:10 1999 +1100

     - Merged more OpenBSD CVS changes:
            [auth-krb4.c]
              - disconnect if getpeername() fails
              - missing xfree(*client)
            [canohost.c]
              - disconnect if getpeername() fails
              - fix comment: we _do_ disconnect if ip-options are set
            [sshd.c]
              - disconnect if getpeername() fails
              - move checking of remote port to central place
            [auth-rhosts.c] move checking of remote port to central place
            [log-server.c] avoid extra fd per sshd, from millert@
            [readconf.c] print _all_ bad config-options in ssh(1), too
            [readconf.h] print _all_ bad config-options in ssh(1), too
            [ssh.c] print _all_ bad config-options in ssh(1), too
            [sshconnect.c] disconnect if getpeername() fails
     - OpenBSD's changes to sshd.c broke the PAM stuff, re-merged it.

commit cedfecc99e73f9661d4dc3cea8c88e57c6e0b487
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 15 14:36:53 1999 +1100

    Further cleanup of askpass autoconf support, enable GNOME askpass option
    only if askpass has first been enabled.

commit d05a247953572b5aa9c28f48410cb3608dfc118f
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 15 14:25:30 1999 +1100

     - Merged OpenBSD CVS changes:
       - [ssh-add.c] change passphrase loop logic and remove ref to
         $DISPLAY, ok niels
     - Changed to ssh-add.c broke askpass support. Revised it to be a little more
       modular.
     - Revised autoconf support for enabling/disabling askpass support.

commit 44b4e49eb79e835060324fc2e2392bb286a05fea
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 15 10:04:28 1999 +1100

    Thinko

commit 0a6e668ac6607529a01a0ccd8471deec9eaa5b08
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 15 09:56:06 1999 +1100

    Solaris compile fixes

commit e116a26556a6e7ca7ff61c47ca132e7b362ba452
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 15 09:25:59 1999 +1100

    typo

commit 192bd0120af04477b5b18e5f6caef162219c1c12
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 13 23:56:35 1999 +1100

     - Tidied default config file some more
     - Revised Redhat initscript to fix bug: sshd (re)start would fail
       if executed from inside a ssh login.

commit 2cb210f0f729082a2cd3eb8f0c71b85f216a7d2c
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 13 15:40:10 1999 +1100

     - Added shadow password patch from Thomas Neumann <tom@smart.ruhr.de>
     - Added ifdefs to auth-passwd.c to exclude it when PAM is enabled

commit b0284386683cb71070da6afdaa6504b309f1d871
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 13 13:30:28 1999 +1100

    updated

commit d46202f0d19b18b4537804e3510e561d6a125a0d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 13 13:28:45 1999 +1100

     - Delay fork (-f option) in ssh until after port forwarded connections
       have been initialised. Patch from Jani Hakala <jahakala@cc.jyu.fi>

commit a2d6efe013e175f408733970803d535908554297
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 13 13:22:46 1999 +1100

     - Merged OpenBSD CVS changes:
       - [bufaux.c] save a view malloc/memcpy/memset/free's, ok niels
       - [scp.c] fix overflow reported by damien@ibs.com.au: off_t
         totalsize, ok niels,aaron

commit 38c608862b5143a4cda472d11d70c1f8c44601f3
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 13 13:09:31 1999 +1100

    Added obseletes lines to spec

commit b77485d25dbde77672ccfee69547112d94142a92
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 13 13:07:45 1999 +1100

    Remove redundant inclusion of config.h

commit 4956d2cf64748f281fb5211e6cd1a881f05c5270
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 13 10:51:58 1999 +1100

    Remove redundant inclusion of config.h

commit 6854f820d62321f1a63f152e2d59e98bd8c01b69
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 13 10:49:55 1999 +1100

    Fix inclusion of additional preprocessor directives from acconfig.h

commit 296a546476a848f73cb126aa66bce737038e2273
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Nov 13 10:48:51 1999 +1100

    Don't install config files if they already exist

commit 06e42932b2013525a29e9ce79148739cfb7a878f
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 16:36:21 1999 +1100

    askpass install fix

commit 3ba1fe19434222120596ab6f1a60eb2ae4d91f4d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 16:32:17 1999 +1100

    Makefile fix

commit 289df8afc30486a63f5397d156bff9a2c7b08abc
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 16:28:13 1999 +1100

    prepare for pre11

commit 9c8da3ce326459a355643c0b332a3cc1db9ef5b5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 16:28:02 1999 +1100

    Fix division-by-zero error

commit 7df20e2ffc56ac5356ea13f115b6191577261ef5
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 16:06:47 1999 +1100

    Documentation updates

commit 3d1b22c150bfacb300d6d58b1f71f13cef46ef22
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 15:46:08 1999 +1100

     - Make ssh-askpass support optional through autoconf

commit 6d7b2cd1a32efa2a40c97361065d357a2e60b716
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 15:19:27 1999 +1100

     - Merged yet more changes from OpenBSD CVS
       - [auth-rh-rsa.c auth-rhosts.c auth-rsa.c channels.c clientloop.c]
         [ssh.c ssh.h sshconnect.c sshd.c]
         make all access to options via 'extern Options options'
         and 'extern ServerOptions options' respectively;
         options are no longer passed as arguments:
          * make options handling more consistent
          * remove #include "readconf.h" from ssh.h
          * readconf.h is only included if necessary
       - [mpaux.c] clear temp buffer
       - [servconf.c] print _all_ bad options found in configfile

commit b5f8927a7e3f25cef4c66603a780176e1b9f6082
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 14:35:58 1999 +1100

    Added INSTALL documentation
    
    Minor other doc updates

commit a419528432c5dc7d963288949da97d34b36348b0
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 14:11:10 1999 +1100

    Added mailing list info

commit 4236f6e24276b41d441a64a6ac24b74e95576e3b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 12:22:31 1999 +1100

    *** empty log message ***

commit d355f2e9e9170d8cbbb961ab594f93b8303c673d
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 12:17:52 1999 +1100

    Removed obselete logging directive

commit b9a692d203ddc1b229a160f51a92f8f1a562ae45
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 12:09:36 1999 +1100

     - Grab server in gnome-ssh-askpass (Debian bug #49872)

commit 322650927bec37d850a3ab72f82bda1cd49b09e4
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 11:33:04 1999 +1100

     - Merged changes from OpenBSD CVS
       - [sshd.c] session_key_int may be zero
       - [auth-rh-rsa.c servconf.c servconf.h ssh.h sshd.8 sshd.c sshd_config]
         IgnoreUserKnownHosts(default=no), used for RhostRSAAuth, ok
         deraadt,millert
     - Brought default sshd_config more in line with OpenBSDs

commit 776af5de4f7f2aa938cdd17bf85a9c891ce7dbd9
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Nov 12 08:49:09 1999 +1100

    - Merged changes from OpenBSD CVS
      - [sshd.c] session_key_int may be zero

commit 7c64ba3fc505c14c172d9b2d7695a3104b4c49f5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 11 21:39:50 1999 +1100

    Fix compile warning

commit 9ba3024ec3196a2e59c8af7dd80c64b53409489a
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 11 21:07:00 1999 +1100

    Cleanup of default config for new LogLevel option and better readability

commit 9fa19b633de1f0037772e0ce9f8f5baac3823695
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 11 20:44:05 1999 +1100

    Merged sshd connection failure patch from Markus Friedl <markus@cvs.openbsd.org>

commit 5ce662a9202240a2f5fa6a9334d58186bdaba50c
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 11 17:57:39 1999 +1100

     - Merged more OpenBSD CVS changes:
       - [auth-krb4.c auth-passwd.c] remove x11- and krb-cleanup from fatal()
         + krb-cleanup cleanup
       - [clientloop.c log-client.c log-server.c ]
         [readconf.c readconf.h servconf.c servconf.h ]
         [ssh.1 ssh.c ssh.h sshd.8]
         add LogLevel {QUIET, FATAL, ERROR, INFO, CHAT, DEBUG} to ssh/sshd,
         obsoletes QuietMode and FascistLogging in sshd.

commit ab5e0d0c27e00dca463c67395c2b5941e778836e
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 11 12:55:45 1999 +1100

    Changed name of directory in tarball

commit 428f247d1db0738e97fa9c9c7d0276a3f5eb5c35
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 11 12:48:35 1999 +1100

    Doc updates

commit 634bf647af3ed8f2c0afbd6adbf2f1ba773bbd25
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 11 12:25:14 1999 +1100

    Fixed interger overflow in progress meter for large files

commit 33e511edb33a5c17e088b5475191c46650e1692d
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 11 11:43:13 1999 +1100

       - [auth-rh-rsa.c] user/958: check ~/.ssh/known_hosts for rhosts-rsa, too
       - [ssh.1] user/958: check ~/.ssh/known_hosts for rhosts-rsa, too
       - [sshd.8] user/958: check ~/.ssh/known_hosts for rhosts-rsa, too

commit 9a018a89789cf80292c2114ae94d69fb593e8879
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 11 11:30:22 1999 +1100

    Doc

commit a82feb3f9f963cea50ee7b363b6f72e6c8cfcc81
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 11 11:04:17 1999 +1100

    Error message when SSL libs not found
    
    Fix RANDOM_POOL

commit 56825a1693fa0539120afd86dddeb97a142c3fad
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 11 10:50:04 1999 +1100

    Doc and spec updates

commit ab18c412e6773b34e4640e4b9277573fd91a66bf
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Nov 11 10:40:23 1999 +1100

     - Added (untested) Entropy Gathering Daemon (EGD) support
     - Merged several minor fixed:
       - ssh-agent commandline parsing
       - RPM spec file now installs ssh setuid root
       - Makefile creates libdir
       - Merged beginnings of Solaris compability from Marc G. Fournier
         <marc.fournier@acadiau.ca>

commit b77870fa7341d95024e55a116a3454e9bfe2f21e
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Nov 10 12:48:08 1999 +1100

     - Merged several minor fixed:
       - ssh-agent commandline parsing
       - RPM spec file now installs ssh setuid root
       - Makefile creates libdir

commit a5cec5893460c32b4769372e12a592cf218364c4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 15:05:11 1999 +1100

    doc updates

commit 74389c9ba1fc511fabbd99155696a96837f53239
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 15:03:01 1999 +1100

    Doc updates

commit 5104762f4a0566ac84f641fe9a68e84737240ea0
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 14:54:14 1999 +1100

    bugfix

commit 43d0fdf1c652ce6d4bf819c445a942ce6880a160
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 14:52:31 1999 +1100

    bugfix

commit 3267355d98bb8501f203a84da78e3ab7e8a23223
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 14:50:10 1999 +1100

    bugfix

commit 973fb0294b74c296be101b146e7447b26bb80646
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 14:48:48 1999 +1100

    Dumb typo

commit 3f51bf5852cc645d9a776f7cdc587b4e0b50a8d8
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 14:46:02 1999 +1100

    1st attempt at RPM subpackages

commit 2b72a4a659dc38bec4812c4ef13da1d8eb3a250b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 14:34:31 1999 +1100

    Build fixes

commit cdb8b1d349fac1d9fe121c90645a789131bd9cef
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 14:31:49 1999 +1100

    Build fixes

commit 742d2cb5f869dcfdf0a356a6ff62d512a8500ff4
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 14:28:26 1999 +1100

    Minor updates

commit e0d444c4ba9e2367337685ca945615588b9fc3cb
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 14:23:45 1999 +1100

    Added GNOME passphrase requester support

commit d3dcfaf14d71992541402a25ad3684f40fc34d8e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 13:52:33 1999 +1100

    Added GNOME passphrase requester

commit da217a02796934a87ace9e0859ab4af8be1893ce
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 10:35:52 1999 +1100

     - Merged OpenBSD CVS changes:
       - [rsa.c] bugfix: use correct size for memset()
       - [sshconnect.c] warn if announced size of modulus 'n' != real size

commit c7b38ceed6030484c61c71ea9fafaca6b34a297e
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 9 10:28:04 1999 +1100

     - Autodetection of SSL/Crypto library location via autoconf
     - Fixed location of ssh-askpass to follow autoconf
     - Integrated Makefile patch from Niels Kristian Bech Jensen <nkbj@image.dk>
     - Autodetection of RSAref library for US users
     - Minor doc updates

commit e8d9068a36e2528dbaf48c192cd1f97e8beafdfe
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 8 18:09:57 1999 +1100

    Doc fixes

commit fd7c911f090749774cf1869420523c4811beeeb0
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 8 16:15:55 1999 +1100

    Merged OpenBSD CVS changes that go away

commit 5ac5f1ca6b5270e1a755d75120f8217f5850c9b2
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 8 15:50:14 1999 +1100

    *** empty log message ***

commit 68cb7570adaf3a36f95ee0ee683220536562acfa
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 8 15:49:41 1999 +1100

    Merged latest OpenBSD CVS changes:
     - remove unused argument. ok dugsong

commit 024c1ab1c3a79c134e8965d84ebc32d2710dd2b5
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 8 15:34:56 1999 +1100

    Fix path typo

commit 356a0b004aad93ec570b134664522a3a925ba556
Author: Damien Miller <djm@mindrot.org>
Date:   Mon Nov 8 15:30:59 1999 +1100

    Lots of changes:
    
     - Removed lots of unnecessary checks from autoconf
     - Added support and autoconf test for openpty() function (Unix98 pty support)
     - Fix for scp not finding ssh if not installed as /usr/bin/ssh
     - Added TODO file
     - Merged parts of Debian patch From Phil Hands <phil@hands.com>:
       - Added ssh-askpass program
       - Added ssh-askpass support to ssh-add.c
       - Create symlinks for slogin on install
       - Fix "distclean" target in makefile
       - Added example for ssh-agent to manpage
       - Added support for PAM_TEXT_INFO messages
       - Disable internal /etc/nologin support if PAM enabled
     - Merged latest OpenBSD CVS changes:
       - [sshd.c] don't send fail-msg but disconnect if too many authentication
         failures
       - [sshd.c] replace assert() with error, fatal or packet_disconnect
       - [sshd.c] remove unused argument. ok dugsong
       - [sshd.c] typo
       - [rsa.c] clear buffers used for encryption. ok: niels
       - [rsa.c] replace assert() with error, fatal or packet_disconnect
     - Fixed coredump after merge of OpenBSD rsa.c patch

commit 0aa8e5395ca08c7fa927bccd8a763edc4ae61f7b
Author: Damien Miller <djm@mindrot.org>
Date:   Tue Nov 2 19:05:02 1999 +1100

    Merged one line cleanup from OBSD CVS

commit e2db1e1cc538f312392a8eff6ad883e563364e70
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 30 14:50:37 1999 +1000

    Renamed README

commit ccdfb8ca05afcad6f017c9c6acadf02c5950cca2
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 30 14:45:52 1999 +1000

    remove redundant file

commit 1e4772c32c109e6c69291335ad49350e7762785d
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 30 11:39:56 1999 +1000

    Merged latest OpenBSD changes:
    
    nchan.ms -\
    channels.[ch] - remove broken x11 fix and document istate/ostate
    ssh-agent.c - call setsid() regardless of argv[]
    ssh.c - save a few lines when disabling rhosts-{rsa-}auth

commit 5ffa64478a963426a1ab92a7b74b87d3ae79ba53
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 30 11:30:35 1999 +1000

    Renamed README -> README.Ylonen
    Renamed README.openssh -> README
    
    Minor updated to new README

commit 2bbb9d0c998db77cf5403f50bf1e105e3719fa2f
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 30 09:46:20 1999 +1000

    Updated COPYING file with usage of RC4
    
    Renamed sshd.init to sshd.init.redhat

commit 744da802bb53ccdd3c198106e267af4a9faf81d8
Author: Damien Miller <djm@mindrot.org>
Date:   Sat Oct 30 09:12:25 1999 +1000

     - Integrated debian package support from Dan Brosemer <odin@linuxfreak.com>

commit d0562b3cdc06c62ef54bc01870e3b642604f60be
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 29 13:09:40 1999 +1000

    Fix off by one error in PAM env patch
    
    Tidy changelog

commit 65b3c13132633189b49bf0d7002b55755280d6d3
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 29 12:37:01 1999 +1000

     - Removed redundant subdirectories
     - Integrated part of a patch from Dan Brosemer <odin@linuxfreak.com> for
       building on Debian.

commit 3c5cb3857b8c20da189c5a23fc72d3db0d34c6cd
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 29 12:06:53 1999 +1000

     - Remove autoconf generated Makefile from CVS
     - Stripped subdirectories from CVS server
     - Fixed makefile to suit

commit 07a826d85456d2194fb0030cde8e2b7cbb7d061b
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 29 11:49:20 1999 +1000

     - Make distclean now removed configure script
     - Improved PAM logging
     - Added some debug() calls for PAM

commit 070f7a1fd0efbb7bba1f096d58b0ad6938935afd
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 29 10:29:29 1999 +1000

    Doc updates

commit 5eeedae9fec512d9c41a09cec2564c0446fbda97
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 29 10:21:15 1999 +1000

    make install patch
    
    Picked up lost bit of OpenBSD update to ssh.h
    
    Fix compile warning in new pam_env stuff

commit 9438816a5c561fe74a61773aee386cd1deb05ad2
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 29 09:57:31 1999 +1000

    Integrated PAM environment patch from Nalin Dahyabhai <nalin@thermo.stat.ncsu.edu>
    
    Integrated make install patch from Niels Kristian Bech Jensen <nkbj@image.dk>

commit 792c5113f1ba364680d294806ac0972b3deaceec
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 29 09:47:09 1999 +1000

    Update to OpenBSD ssh-19991029
    
    Renamed init script and PAM config

commit a37010e4669933490c2347940bceba98ddfc2863
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 29 09:18:29 1999 +1000

    Renamed open* -> * at request of Theo de Raadt <deraadt@cvs.openbsd.org>

commit f1d9a30b4f0aad9a5952549f9c3e15a771e0ca68
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 29 09:17:36 1999 +1000

    Path fix /etc -> /etc/ssh

commit 32aa144d7034447fee864d050b35b684519c2e45
Author: Damien Miller <djm@mindrot.org>
Date:   Fri Oct 29 09:15:49 1999 +1000

    Re-imported OpenBSD manpages

commit 34d0b614b3ee27f5b4fbaf7fb733ddccb02f58d6
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 28 17:51:40 1999 +1000

    Prepare for 1.2pre5

commit 29b5a590f2835129efbfa8769dcb8adf071b9b87
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 28 15:46:27 1999 +1000

    Doc updates

commit 01ab4a25c84cdfba15c1c781ef93d24285d76eb5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 28 15:23:30 1999 +1000

    Merged latest OpenBSD changes.

commit 29d685212f4792c084052f07006f57a50cc6f2c8
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 28 14:34:49 1999 +1000

    Rename PID file
    
    Add symlinks back to ssh in RPM spec file

commit 92986dd9ba78476e4ce6cb282a049a67280602a5
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 28 14:19:25 1999 +1000

    Re-added old changelog

commit eff18d6aaabc5f088d1f6439f1621e8b70782574
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 28 14:14:38 1999 +1000

    Changelog update before test builds

commit e413cba972feb60d3d4d104c0c93320435610d1b
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 28 14:12:54 1999 +1000

    Disabled code based on autoconf tests

commit 062307657e30c9b970514eb53b4b743f9d571231
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 28 14:03:14 1999 +1000

    Big rename ssh* -> openssh*

commit 7f6ea0264d01aa40b20df8dc75141631479da054
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 28 13:25:17 1999 +1000

     - Integrated patch from Dan Brosemer <odin@linuxfreak.com>
       - Build fixes
       - Autoconf
       - Change binary names to open*
    
     - Fixed autoconf script to detect PAM on RH6.1
     - Added tests for libpwdb, and OpenBSD functions to autoconf (not used yet)

commit 3d112efc672b877c74893229d3fd30f99489b9ff
Author: Damien Miller <djm@mindrot.org>
Date:   Thu Oct 28 13:20:30 1999 +1000

    Big PAM cleanup
    
    Added header for arc4random to mktemp.c
    
    Fixed return type of arc4random

commit 332e67fde27c4017d2df8dafe05a55be3c7597cd
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 27 23:42:05 1999 +1000

    Attempt to clean up PAM code
    
    Use PWDB getpw* functions if HAVE_PWDB defined
    
    Minor other tidyups

commit 726a5b3be128911d2f38f73a6a8c9be6dde9bb3a
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 27 18:00:50 1999 +1000

    Added compatibility macros

commit d4a8b7e34dd619a4debf9a206c81db26d1402ea6
Author: Damien Miller <djm@mindrot.org>
Date:   Wed Oct 27 13:42:43 1999 +1000

    Initial revision
