1 files changed, 12677 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000..f283a8b3f
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,12677 @@
+commit 9ca7e9c861775dd6c6312bc8aaab687403d24676
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed May 27 10:38:00 2020 +1000
+
+    depend
+
+commit b6d251ed9af90e16c08a72c4aac2cb8ace8f94b1
+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 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