Page MenuHomeFreeBSD

No OneTemporary

This file is larger than 256 KB, so syntax highlighting was skipped.
diff --git a/crypto/openssh/.depend b/crypto/openssh/.depend
index fca83a67c970..5226523aa2ad 100644
--- a/crypto/openssh/.depend
+++ b/crypto/openssh/.depend
@@ -1,183 +1,179 @@
# Automatically generated by makedepend.
# Run "make depend" to rebuild.
# DO NOT DELETE
addr.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h addr.h
addrmatch.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h addr.h match.h log.h ssherr.h
atomicio.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h atomicio.h
audit-bsm.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
audit-linux.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
audit.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
auth-bsdauth.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
auth-krb5.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h ssh.h packet.h openbsd-compat/sys-queue.h dispatch.h log.h ssherr.h sshbuf.h sshkey.h misc.h servconf.h uidswap.h hostfile.h auth.h auth-pam.h audit.h loginrec.h
auth-options.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h ssherr.h log.h sshbuf.h misc.h sshkey.h match.h ssh2.h auth-options.h
auth-pam.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
auth-passwd.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h packet.h openbsd-compat/sys-queue.h dispatch.h sshbuf.h ssherr.h log.h misc.h servconf.h sshkey.h hostfile.h auth.h auth-pam.h audit.h loginrec.h auth-options.h
auth-rhosts.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h packet.h openbsd-compat/sys-queue.h dispatch.h uidswap.h pathnames.h log.h ssherr.h misc.h xmalloc.h sshbuf.h sshkey.h servconf.h canohost.h hostfile.h auth.h auth-pam.h audit.h loginrec.h
auth-shadow.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
auth-sia.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
auth.o: authfile.h monitor_wrap.h compat.h channels.h
auth.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h match.h groupaccess.h log.h ssherr.h sshbuf.h misc.h servconf.h openbsd-compat/sys-queue.h sshkey.h hostfile.h auth.h auth-pam.h audit.h loginrec.h auth-options.h canohost.h uidswap.h packet.h dispatch.h
auth2-chall.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h ssh2.h sshkey.h hostfile.h auth.h auth-pam.h audit.h loginrec.h sshbuf.h packet.h openbsd-compat/sys-queue.h dispatch.h ssherr.h log.h misc.h servconf.h
auth2-gss.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
auth2-hostbased.o: canohost.h monitor_wrap.h pathnames.h match.h
auth2-hostbased.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h ssh2.h packet.h openbsd-compat/sys-queue.h dispatch.h kex.h mac.h crypto_api.h sshbuf.h log.h ssherr.h misc.h servconf.h compat.h sshkey.h hostfile.h auth.h auth-pam.h audit.h loginrec.h
auth2-kbdint.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h packet.h openbsd-compat/sys-queue.h dispatch.h hostfile.h auth.h auth-pam.h audit.h loginrec.h log.h ssherr.h misc.h servconf.h
auth2-none.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h atomicio.h xmalloc.h sshkey.h hostfile.h auth.h auth-pam.h audit.h loginrec.h packet.h openbsd-compat/sys-queue.h dispatch.h log.h ssherr.h misc.h servconf.h compat.h ssh2.h monitor_wrap.h
auth2-passwd.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h packet.h openbsd-compat/sys-queue.h dispatch.h ssherr.h log.h sshkey.h hostfile.h auth.h auth-pam.h audit.h loginrec.h monitor_wrap.h misc.h servconf.h
auth2-pubkey.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h ssh.h ssh2.h packet.h openbsd-compat/sys-queue.h dispatch.h kex.h mac.h crypto_api.h sshbuf.h log.h ssherr.h misc.h servconf.h compat.h sshkey.h hostfile.h auth.h auth-pam.h audit.h loginrec.h
auth2-pubkey.o: pathnames.h uidswap.h auth-options.h canohost.h monitor_wrap.h authfile.h match.h channels.h session.h sk-api.h
auth2-pubkeyfile.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ssh.h log.h ssherr.h misc.h compat.h sshkey.h digest.h hostfile.h auth.h auth-pam.h audit.h loginrec.h auth-options.h authfile.h match.h
auth2.o: digest.h
auth2.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h atomicio.h xmalloc.h ssh2.h packet.h openbsd-compat/sys-queue.h dispatch.h log.h ssherr.h sshbuf.h misc.h servconf.h compat.h sshkey.h hostfile.h auth.h auth-pam.h audit.h loginrec.h pathnames.h monitor_wrap.h
authfd.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h ssh.h sshbuf.h sshkey.h authfd.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h compat.h log.h ssherr.h atomicio.h misc.h
authfile.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h ssh.h log.h ssherr.h authfile.h misc.h atomicio.h sshkey.h sshbuf.h krl.h
bitmap.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h bitmap.h
canohost.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h packet.h openbsd-compat/sys-queue.h dispatch.h log.h ssherr.h canohost.h misc.h
chacha.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h chacha.h
channels.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h ssh.h ssh2.h ssherr.h sshbuf.h packet.h dispatch.h log.h misc.h channels.h compat.h canohost.h sshkey.h authfd.h pathnames.h match.h
cipher-aes.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/openssl-compat.h
cipher-aesctr.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h cipher-aesctr.h rijndael.h
cipher-chachapoly-libcrypto.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
cipher-chachapoly.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h log.h ssherr.h sshbuf.h cipher-chachapoly.h chacha.h poly1305.h
cipher.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h misc.h sshbuf.h ssherr.h digest.h openbsd-compat/openssl-compat.h
cleanup.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h log.h ssherr.h
clientloop.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h ssh.h ssh2.h packet.h dispatch.h sshbuf.h compat.h channels.h sshkey.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h kex.h mac.h crypto_api.h
clientloop.o: myproposal.h log.h ssherr.h misc.h readconf.h clientloop.h sshconnect.h authfd.h atomicio.h sshpty.h match.h msg.h hostfile.h
compat.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h packet.h openbsd-compat/sys-queue.h dispatch.h compat.h log.h ssherr.h match.h kex.h mac.h crypto_api.h
dh.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
digest-libc.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ssherr.h sshbuf.h digest.h
digest-openssl.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
dispatch.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ssh2.h log.h ssherr.h dispatch.h packet.h openbsd-compat/sys-queue.h compat.h
dns.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h sshkey.h ssherr.h dns.h log.h digest.h
-ed25519.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h crypto_api.h ge25519.h fe25519.h sc25519.h
+ed25519.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h crypto_api.h
entropy.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
fatal.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h log.h ssherr.h
-fe25519.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h fe25519.h crypto_api.h
-ge25519.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h fe25519.h crypto_api.h sc25519.h ge25519.h ge25519_base.data
groupaccess.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h groupaccess.h match.h log.h ssherr.h
gss-genr.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
gss-serv-krb5.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
gss-serv.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
hash.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h crypto_api.h
hmac.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h sshbuf.h digest.h hmac.h
hostfile.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h match.h sshkey.h hostfile.h log.h ssherr.h misc.h pathnames.h digest.h hmac.h sshbuf.h
kex.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ssh.h ssh2.h atomicio.h version.h packet.h openbsd-compat/sys-queue.h dispatch.h compat.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h sshkey.h kex.h mac.h crypto_api.h log.h ssherr.h
kex.o: match.h misc.h monitor.h sshbuf.h digest.h
kexc25519.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h sshkey.h kex.h mac.h crypto_api.h sshbuf.h digest.h ssherr.h ssh2.h
kexdh.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
kexecdh.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ssherr.h
kexgen.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h sshkey.h kex.h mac.h crypto_api.h log.h ssherr.h packet.h openbsd-compat/sys-queue.h dispatch.h ssh2.h sshbuf.h digest.h
kexgex.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
kexgexc.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
kexgexs.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
kexsntrup761x25519.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ssherr.h
krl.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ./openbsd-compat/sys-tree.h openbsd-compat/sys-queue.h sshbuf.h ssherr.h sshkey.h authfile.h misc.h log.h digest.h bitmap.h utf8.h krl.h
log.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h log.h ssherr.h match.h
loginrec.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h sshkey.h hostfile.h ssh.h loginrec.h log.h ssherr.h atomicio.h packet.h openbsd-compat/sys-queue.h dispatch.h canohost.h auth.h auth-pam.h audit.h sshbuf.h misc.h
logintest.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h loginrec.h
mac.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h digest.h hmac.h umac.h mac.h misc.h ssherr.h sshbuf.h openbsd-compat/openssl-compat.h
match.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h match.h misc.h
misc.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h misc.h log.h ssherr.h ssh.h sshbuf.h
moduli.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
monitor.o: chacha.h poly1305.h cipher-aesctr.h rijndael.h kex.h mac.h crypto_api.h dh.h packet.h dispatch.h auth-options.h sshpty.h channels.h session.h sshlogin.h canohost.h log.h ssherr.h misc.h servconf.h monitor.h monitor_wrap.h monitor_fdpass.h compat.h ssh2.h authfd.h match.h sk-api.h
monitor.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ./openbsd-compat/sys-tree.h openbsd-compat/sys-queue.h openbsd-compat/openssl-compat.h atomicio.h xmalloc.h ssh.h sshkey.h sshbuf.h hostfile.h auth.h auth-pam.h audit.h loginrec.h cipher.h cipher-chachapoly.h
monitor_fdpass.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h log.h ssherr.h monitor_fdpass.h
monitor_wrap.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h ssh.h sshbuf.h sshkey.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h kex.h mac.h crypto_api.h hostfile.h auth.h auth-pam.h audit.h
monitor_wrap.o: loginrec.h auth-options.h packet.h dispatch.h log.h ssherr.h monitor.h monitor_wrap.h atomicio.h monitor_fdpass.h misc.h channels.h session.h servconf.h
msg.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h sshbuf.h ssherr.h log.h atomicio.h msg.h misc.h
mux.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h log.h ssherr.h ssh.h ssh2.h pathnames.h misc.h match.h sshbuf.h channels.h msg.h packet.h dispatch.h monitor_fdpass.h sshpty.h sshkey.h readconf.h clientloop.h
nchan.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h ssh2.h sshbuf.h ssherr.h packet.h dispatch.h channels.h compat.h log.h
packet.o: channels.h ssh.h packet.h dispatch.h sshbuf.h
packet.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h compat.h ssh2.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h sshkey.h kex.h mac.h crypto_api.h digest.h log.h ssherr.h canohost.h misc.h
platform-misc.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
platform-pledge.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
platform-tracing.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h log.h ssherr.h
platform.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h log.h ssherr.h misc.h servconf.h openbsd-compat/sys-queue.h sshkey.h hostfile.h auth.h auth-pam.h audit.h loginrec.h
poly1305.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h poly1305.h
progressmeter.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h progressmeter.h atomicio.h misc.h utf8.h
readconf.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/glob.h xmalloc.h ssh.h ssherr.h compat.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h pathnames.h log.h sshkey.h misc.h readconf.h match.h kex.h mac.h crypto_api.h
readconf.o: uidswap.h myproposal.h digest.h
readpass.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h misc.h pathnames.h log.h ssherr.h ssh.h uidswap.h
rijndael.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h rijndael.h
sandbox-capsicum.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
sandbox-darwin.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
sandbox-null.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
sandbox-pledge.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
sandbox-rlimit.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
sandbox-seccomp-filter.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
sandbox-solaris.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
sandbox-systrace.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
-sc25519.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h sc25519.h crypto_api.h
scp.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/glob.h xmalloc.h ssh.h atomicio.h pathnames.h log.h ssherr.h misc.h progressmeter.h utf8.h sftp.h sftp-common.h sftp-client.h
servconf.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/glob.h openbsd-compat/sys-queue.h xmalloc.h ssh.h log.h ssherr.h sshbuf.h misc.h servconf.h compat.h pathnames.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h sshkey.h
servconf.o: kex.h mac.h crypto_api.h match.h channels.h groupaccess.h canohost.h packet.h dispatch.h hostfile.h auth.h auth-pam.h audit.h loginrec.h myproposal.h digest.h
serverloop.o: cipher-aesctr.h rijndael.h kex.h mac.h crypto_api.h hostfile.h auth.h auth-pam.h audit.h loginrec.h session.h auth-options.h serverloop.h
serverloop.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h packet.h dispatch.h sshbuf.h log.h ssherr.h misc.h servconf.h canohost.h sshpty.h channels.h compat.h ssh2.h sshkey.h cipher.h cipher-chachapoly.h chacha.h poly1305.h
session.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h ssh.h ssh2.h sshpty.h packet.h dispatch.h sshbuf.h ssherr.h match.h uidswap.h compat.h channels.h sshkey.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h
session.o: rijndael.h hostfile.h auth.h auth-pam.h audit.h loginrec.h auth-options.h authfd.h pathnames.h log.h misc.h servconf.h sshlogin.h serverloop.h canohost.h session.h kex.h mac.h crypto_api.h monitor_wrap.h sftp.h atomicio.h
sftp-client.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h ssherr.h sshbuf.h log.h atomicio.h progressmeter.h misc.h utf8.h sftp.h sftp-common.h sftp-client.h openbsd-compat/glob.h
sftp-common.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h ssherr.h sshbuf.h log.h misc.h sftp.h sftp-common.h
sftp-glob.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h sftp.h sftp-common.h sftp-client.h openbsd-compat/glob.h
sftp-realpath.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
sftp-server-main.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h log.h ssherr.h sftp.h misc.h xmalloc.h
sftp-server.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h atomicio.h xmalloc.h sshbuf.h ssherr.h log.h misc.h match.h uidswap.h sftp.h sftp-common.h
sftp-usergroup.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ./openbsd-compat/sys-tree.h log.h ssherr.h xmalloc.h sftp-common.h sftp-client.h openbsd-compat/glob.h sftp-usergroup.h
sftp.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h log.h ssherr.h pathnames.h misc.h utf8.h sftp.h sshbuf.h sftp-common.h sftp-client.h openbsd-compat/glob.h sftp-usergroup.h
sk-usbhid.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
sntrup761.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
srclimit.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h addr.h canohost.h log.h ssherr.h misc.h srclimit.h xmalloc.h
ssh-add.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h ssh.h log.h ssherr.h sshkey.h sshbuf.h authfd.h authfile.h pathnames.h misc.h digest.h ssh-sk.h sk-api.h hostfile.h
ssh-agent.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h ssh.h ssh2.h sshbuf.h sshkey.h authfd.h compat.h log.h ssherr.h misc.h digest.h match.h msg.h pathnames.h ssh-pkcs11.h sk-api.h myproposal.h
ssh-dss.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
ssh-ecdsa-sk.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/openssl-compat.h sshbuf.h ssherr.h digest.h sshkey.h
ssh-ecdsa.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
ssh-ed25519-sk.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h crypto_api.h log.h ssherr.h sshbuf.h sshkey.h ssh.h digest.h
ssh-ed25519.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h crypto_api.h log.h ssherr.h sshbuf.h sshkey.h ssh.h
ssh-keygen.o: cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h
ssh-keygen.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h sshkey.h authfile.h sshbuf.h pathnames.h log.h ssherr.h misc.h match.h hostfile.h dns.h ssh.h ssh2.h ssh-pkcs11.h atomicio.h krl.h digest.h utf8.h authfd.h sshsig.h ssh-sk.h sk-api.h cipher.h
ssh-keyscan.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h ssh.h sshbuf.h sshkey.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h kex.h mac.h crypto_api.h compat.h myproposal.h packet.h dispatch.h log.h
-ssh-keyscan.o: ssherr.h atomicio.h misc.h hostfile.h ssh_api.h ssh2.h dns.h
+ssh-keyscan.o: ssherr.h atomicio.h misc.h hostfile.h ssh_api.h ssh2.h dns.h addr.h
ssh-keysign.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h log.h ssherr.h sshkey.h ssh.h ssh2.h misc.h sshbuf.h authfile.h msg.h canohost.h pathnames.h readconf.h uidswap.h
ssh-pkcs11-client.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
ssh-pkcs11-helper.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h sshbuf.h log.h ssherr.h misc.h sshkey.h authfd.h ssh-pkcs11.h
ssh-pkcs11.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h log.h ssherr.h sshkey.h
ssh-rsa.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
ssh-sk-client.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h log.h ssherr.h sshbuf.h sshkey.h msg.h digest.h pathnames.h ssh-sk.h misc.h
ssh-sk-helper.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h log.h ssherr.h sshkey.h authfd.h misc.h sshbuf.h msg.h uidswap.h ssh-sk.h
ssh-sk.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
ssh-xmss.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
ssh.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/openssl-compat.h openbsd-compat/sys-queue.h xmalloc.h ssh.h ssh2.h canohost.h compat.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h packet.h dispatch.h sshbuf.h channels.h
ssh.o: sshkey.h authfd.h authfile.h pathnames.h clientloop.h log.h ssherr.h misc.h readconf.h sshconnect.h kex.h mac.h crypto_api.h sshpty.h match.h msg.h version.h myproposal.h utf8.h
ssh_api.o: authfile.h misc.h version.h myproposal.h sshbuf.h openbsd-compat/openssl-compat.h
ssh_api.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ssh_api.h openbsd-compat/sys-queue.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h sshkey.h kex.h mac.h crypto_api.h ssh.h ssh2.h packet.h dispatch.h compat.h log.h ssherr.h
sshbuf-getput-basic.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ssherr.h sshbuf.h
sshbuf-getput-crypto.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
sshbuf-io.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ssherr.h sshbuf.h atomicio.h
sshbuf-misc.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ssherr.h sshbuf.h
sshbuf.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ssherr.h sshbuf.h misc.h
sshconnect.o: authfd.h kex.h mac.h crypto_api.h
sshconnect.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h hostfile.h ssh.h sshbuf.h packet.h openbsd-compat/sys-queue.h dispatch.h compat.h sshkey.h sshconnect.h log.h ssherr.h misc.h readconf.h atomicio.h dns.h monitor_fdpass.h ssh2.h version.h authfile.h
sshconnect2.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h ssh.h ssh2.h sshbuf.h packet.h dispatch.h compat.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h sshkey.h kex.h mac.h crypto_api.h
sshconnect2.o: myproposal.h sshconnect.h authfile.h dh.h authfd.h log.h ssherr.h misc.h readconf.h match.h canohost.h msg.h pathnames.h uidswap.h hostfile.h utf8.h ssh-sk.h sk-api.h
sshd.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ./openbsd-compat/sys-tree.h openbsd-compat/sys-queue.h xmalloc.h ssh.h ssh2.h sshpty.h packet.h dispatch.h log.h ssherr.h sshbuf.h misc.h match.h servconf.h uidswap.h compat.h cipher.h cipher-chachapoly.h chacha.h
sshd.o: poly1305.h cipher-aesctr.h rijndael.h digest.h sshkey.h kex.h mac.h crypto_api.h myproposal.h authfile.h pathnames.h atomicio.h canohost.h hostfile.h auth.h auth-pam.h audit.h loginrec.h authfd.h msg.h channels.h session.h monitor.h monitor_wrap.h ssh-sandbox.h auth-options.h version.h sk-api.h srclimit.h dh.h
ssherr.o: ssherr.h
sshkey-xmss.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
sshkey.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h crypto_api.h ssh2.h ssherr.h misc.h sshbuf.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h digest.h sshkey.h match.h ssh-sk.h openbsd-compat/openssl-compat.h
sshlogin.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h sshlogin.h ssherr.h loginrec.h log.h sshbuf.h misc.h servconf.h openbsd-compat/sys-queue.h
sshpty.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h sshpty.h log.h ssherr.h misc.h
sshsig.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h authfd.h authfile.h log.h ssherr.h misc.h sshbuf.h sshsig.h sshkey.h match.h digest.h
sshtty.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h sshpty.h
ttymodes.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h packet.h openbsd-compat/sys-queue.h dispatch.h log.h ssherr.h compat.h sshbuf.h ttymodes.h
uidswap.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h log.h ssherr.h uidswap.h xmalloc.h
umac.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h umac.h misc.h rijndael.h
umac128.o: umac.c includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h umac.h misc.h rijndael.h
utf8.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h utf8.h
-verify.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h crypto_api.h
xmalloc.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h log.h ssherr.h
xmss_commons.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
xmss_fast.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
xmss_hash.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
xmss_hash_address.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
xmss_wots.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
diff --git a/crypto/openssh/.github/ci-status.md b/crypto/openssh/.github/ci-status.md
index 0ad8bf5aaf44..d13bbfa8c038 100644
--- a/crypto/openssh/.github/ci-status.md
+++ b/crypto/openssh/.github/ci-status.md
@@ -1,4 +1,10 @@
-[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml)
-[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml)
-[![Upstream self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/upstream.yml/badge.svg)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/upstream.yml)
+master :
+[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:master)
+[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:master)
+[![Upstream self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/upstream.yml/badge.svg)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/upstream.yml?query=branch:master)
+[![CIFuzz](https://github.com/openssh/openssh-portable/actions/workflows/cifuzz.yml/badge.svg)](https://github.com/openssh/openssh-portable/actions/workflows/cifuzz.yml)
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/openssh.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:openssh)
+
+9.1 :
+[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_1)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_1)
+[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_1)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_1)
diff --git a/crypto/openssh/.github/configs b/crypto/openssh/.github/configs
index 6bf1ab27f0ca..bdd5ddbdfaf0 100755
--- a/crypto/openssh/.github/configs
+++ b/crypto/openssh/.github/configs
@@ -1,290 +1,313 @@
#!/bin/sh
#
# usage: configs vmname test_config (or '' for default)
#
# Sets the following variables:
# CONFIGFLAGS options to ./configure
# SSHD_CONFOPTS sshd_config options
# TEST_TARGET make target used when testing. defaults to "tests".
# LTESTS
config=$1
+if [ "$config" = "" ]; then
+ config="default"
+fi
unset CC CFLAGS CPPFLAGS LDFLAGS LTESTS SUDO
-TEST_TARGET="tests"
+TEST_TARGET="tests compat-tests"
LTESTS=""
SKIP_LTESTS=""
SUDO=sudo # run with sudo by default
TEST_SSH_UNSAFE_PERMISSIONS=1
# Stop on first test failure to minimize logs
TEST_SSH_FAIL_FATAL=yes
CONFIGFLAGS=""
LIBCRYPTOFLAGS=""
case "$config" in
default|sol64)
;;
c89)
CC="gcc"
CFLAGS="-Wall -std=c89 -pedantic -Werror=vla"
CONFIGFLAGS="--without-zlib"
LIBCRYPTOFLAGS="--without-openssl"
TEST_TARGET=t-exec
;;
cygwin-release)
# See https://cygwin.com/git/?p=git/cygwin-packages/openssh.git;a=blob;f=openssh.cygport;hb=HEAD
CONFIGFLAGS="--with-xauth=/usr/bin/xauth --with-security-key-builtin"
CONFIGFLAGS="$CONFIGFLAGS --with-kerberos5=/usr --with-libedit --disable-strip"
;;
clang-12-Werror)
CC="clang-12"
# clang's implicit-fallthrough requires that the code be annotated with
# __attribute__((fallthrough)) and does not understand /* FALLTHROUGH */
CFLAGS="-Wall -Wextra -O2 -Wno-error=implicit-fallthrough -Wno-error=unused-parameter"
CONFIGFLAGS="--with-pam --with-Werror"
;;
*-sanitize-*)
case "$config" in
gcc-*)
CC=gcc
;;
clang-*)
# Find the newest available version of clang
for i in `seq 10 99`; do
clang="`which clang-$i 2>/dev/null`"
[ -x "$clang" ] && CC="$clang"
done
;;
esac
# Put Sanitizer logs in regress dir.
SANLOGS=`pwd`/regress
# - We replace chroot with chdir so that the sanitizer in the preauth
# privsep process can read /proc.
# - clang does not recognizes explicit_bzero so we use bzero
# (see https://github.com/google/sanitizers/issues/1507
# - openssl and zlib trip ASAN.
# - sp_pwdp returned by getspnam trips ASAN, hence disabling shadow.
case "$config" in
*-sanitize-address)
CFLAGS="-fsanitize=address -fno-omit-frame-pointer"
LDFLAGS="-fsanitize=address"
CPPFLAGS='-Dchroot=chdir -Dexplicit_bzero=bzero -D_FORTIFY_SOURCE=0 -DASAN_OPTIONS=\"detect_leaks=0:log_path='$SANLOGS'/asan.log\"'
CONFIGFLAGS=""
TEST_TARGET="t-exec"
;;
clang-sanitize-memory)
CFLAGS="-fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer"
LDFLAGS="-fsanitize=memory"
CPPFLAGS='-Dchroot=chdir -Dexplicit_bzero=bzero -DMSAN_OPTIONS=\"log_path='$SANLOGS'/msan.log\"'
CONFIGFLAGS="--without-openssl --without-zlib --without-shadow"
TEST_TARGET="t-exec"
;;
*-sanitize-undefined)
CFLAGS="-fsanitize=undefined"
LDFLAGS="-fsanitize=undefined"
;;
*)
echo unknown sanitize option;
exit 1;;
esac
features="--disable-security-key --disable-pkcs11"
hardening="--without-sandbox --without-hardening --without-stackprotect"
privsep="--with-privsep-user=root"
CONFIGFLAGS="$CONFIGFLAGS $features $hardening $privsep"
# Because we hobble chroot we can't test it.
SKIP_LTESTS=sftp-chroot
;;
gcc-11-Werror)
CC="gcc"
# -Wnoformat-truncation in gcc 7.3.1 20180130 fails on fmt_scaled
CFLAGS="-Wall -Wextra -O2 -Wno-format-truncation -Wimplicit-fallthrough=4 -Wno-unused-parameter"
CONFIGFLAGS="--with-pam --with-Werror"
;;
clang*|gcc*)
CC="$config"
;;
kitchensink)
CONFIGFLAGS="--with-kerberos5 --with-libedit --with-pam"
CONFIGFLAGS="${CONFIGFLAGS} --with-security-key-builtin --with-selinux"
- CONFIGFLAGS="${CONFIGFLAGS} --with-cflags=-DSK_DEBUG"
+ CFLAGS="-DSK_DEBUG -DSANDBOX_SECCOMP_FILTER_DEBUG"
;;
hardenedmalloc)
CONFIGFLAGS="--with-ldflags=-lhardened_malloc"
;;
tcmalloc)
CONFIGFLAGS="--with-ldflags=-ltcmalloc"
;;
krb5|heimdal)
CONFIGFLAGS="--with-kerberos5"
;;
libedit)
CONFIGFLAGS="--with-libedit"
;;
musl)
CC="musl-gcc"
CONFIGFLAGS="--without-zlib"
LIBCRYPTOFLAGS="--without-openssl"
TEST_TARGET="t-exec"
;;
pam-krb5)
CONFIGFLAGS="--with-pam --with-kerberos5"
SSHD_CONFOPTS="UsePam yes"
;;
*pam)
CONFIGFLAGS="--with-pam"
SSHD_CONFOPTS="UsePam yes"
;;
libressl-*)
LIBCRYPTOFLAGS="--with-ssl-dir=/opt/libressl --with-rpath=-Wl,-rpath,"
;;
openssl-*)
LIBCRYPTOFLAGS="--with-ssl-dir=/opt/openssl --with-rpath=-Wl,-rpath,"
+ # OpenSSL 1.1.1 specifically has a bug in its RNG that breaks reexec
+ # fallback. See https://bugzilla.mindrot.org/show_bug.cgi?id=3483
+ if [ "$config" = "openssl-1.1.1" ]; then
+ SKIP_LTESTS="reexec"
+ fi
;;
selinux)
CONFIGFLAGS="--with-selinux"
;;
sk)
CONFIGFLAGS="--with-security-key-builtin"
;;
without-openssl)
LIBCRYPTOFLAGS="--without-openssl"
TEST_TARGET=t-exec
;;
- valgrind-[1-4]|valgrind-unit)
+ valgrind-[1-5]|valgrind-unit)
# rlimit sandbox and FORTIFY_SOURCE confuse Valgrind.
CONFIGFLAGS="--without-sandbox --without-hardening"
CONFIGFLAGS="$CONFIGFLAGS --with-cppflags=-D_FORTIFY_SOURCE=0"
TEST_TARGET="t-exec USE_VALGRIND=1"
TEST_SSH_ELAPSED_TIMES=1
export TEST_SSH_ELAPSED_TIMES
# Valgrind slows things down enough that the agent timeout test
# won't reliably pass, and the unit tests run longer than allowed
- # by github so split into three separate tests.
- tests2="rekey integrity try-ciphers"
+ # by github so split into separate tests.
+ tests2="integrity try-ciphers"
tests3="krl forward-control sshsig agent-restrict kextype sftp"
tests4="cert-userkey cert-hostkey kextype sftp-perm keygen-comment percent"
+ tests5="rekey"
case "$config" in
valgrind-1)
- # All tests except agent-timeout (which is flaky under valgrind)
+ # All tests except agent-timeout (which is flaky under valgrind),
+ # connection-timeout (which doesn't work since it's so slow)
# and hostbased (since valgrind won't let ssh exec keysign).
# Slow ones are run separately to increase parallelism.
- SKIP_LTESTS="agent-timeout hostbased ${tests2} ${tests3} ${tests4}"
+ SKIP_LTESTS="agent-timeout connection-timeout hostbased"
+ SKIP_LTESTS="$SKIP_LTESTS ${tests2} ${tests3} ${tests4} ${tests5}"
;;
valgrind-2)
LTESTS="${tests2}"
;;
valgrind-3)
LTESTS="${tests3}"
;;
valgrind-4)
LTESTS="${tests4}"
;;
+ valgrind-5)
+ LTESTS="${tests5}"
+ ;;
valgrind-unit)
TEST_TARGET="unit USE_VALGRIND=1"
;;
esac
;;
*)
echo "Unknown configuration $config"
exit 1
;;
esac
# The Solaris 64bit targets are special since they need a non-flag arg.
case "$config" in
sol64*)
CONFIGFLAGS="x86_64 --with-cflags=-m64 --with-ldflags=-m64 ${CONFIGFLAGS}"
LIBCRYPTOFLAGS="--with-ssl-dir=/usr/local/ssl64"
;;
esac
case "${TARGET_HOST}" in
aix*)
# These are slow real or virtual machines so skip the slowest tests
# (which tend to be thw ones that transfer lots of data) so that the
# test run does not time out.
# The agent-restrict test fails due to some quoting issue when run
# with sh or ksh so specify bash for now.
TEST_TARGET="t-exec TEST_SHELL=bash"
SKIP_LTESTS="rekey sftp"
;;
+ debian-riscv64)
+ # This machine is fairly slow, so skip the unit tests.
+ TEST_TARGET="t-exec"
+ ;;
dfly58*|dfly60*)
# scp 3-way connection hangs on these so skip until sorted.
SKIP_LTESTS=scp3
;;
fbsd6)
# Native linker is not great with PIC so OpenSSL is built w/out.
CONFIGFLAGS="${CONFIGFLAGS} --disable-security-key"
;;
hurd)
SKIP_LTESTS="forwarding multiplex proxy-connect hostkey-agent agent-ptrace"
;;
minix3)
LIBCRYPTOFLAGS="--without-openssl --disable-security-key"
# Minix does not have a loopback interface so we have to skip any
# test that relies on one.
# Also, Minix seems to be very limited in the number of select()
# calls that can be operating concurrently, so prune additional tests for that.
- T="addrmatch agent-restrict brokenkeys cfgmatch cfgmatchlisten cfgparse connect
- connect-uri exit-status forward-control forwarding hostkey-agent
- key-options keyscan knownhosts-command login-timeout multiplex
+ T="addrmatch agent-restrict brokenkeys cfgmatch cfgmatchlisten cfgparse
+ connect connect-uri exit-status forwarding hostkey-agent
+ key-options keyscan knownhosts-command login-timeout
reconfigure reexec rekey scp scp-uri scp3 sftp sftp-badcmds
sftp-batch sftp-cmds sftp-glob sftp-perm sftp-uri stderr-data
transfer"
+ # Unix domain sockets don't work quite like we expect, so also skip any tests
+ # that use multiplexing.
+ T="$T connection-timeout dynamic-forward forward-control multiplex"
SKIP_LTESTS="$(echo $T)"
TEST_TARGET=t-exec
SUDO=""
;;
nbsd4)
# System compiler will ICE on some files with fstack-protector
# SHA256 functions in sha2.h conflict with OpenSSL's breaking sk-dummy
CONFIGFLAGS="${CONFIGFLAGS} --without-hardening --disable-security-key"
;;
openwrt-*)
CONFIGFLAGS="${CONFIGFLAGS} --without-openssl --without-zlib"
TEST_TARGET="t-exec"
;;
sol10|sol11)
# sol10 VM is 32bit and the unit tests are slow.
# sol11 has 4 test configs so skip unit tests to speed up.
TEST_TARGET="tests SKIP_UNIT=1"
;;
win10)
# No sudo on Windows.
SUDO=""
;;
esac
case "`./config.guess`" in
*cygwin)
SUDO=""
+ # Don't run compat tests on cygwin as they don't currently compile.
+ TEST_TARGET="tests"
;;
*-darwin*)
# Unless specified otherwise, build without OpenSSL on Mac OS since
# modern versions don't ship with libcrypto.
LIBCRYPTOFLAGS="--without-openssl"
TEST_TARGET=t-exec
;;
esac
# If we have a local openssl/libressl, use that.
if [ -z "${LIBCRYPTOFLAGS}" ]; then
# last-match
for i in /usr/local /usr/local/ssl /usr/local/opt/openssl; do
if [ -x ${i}/bin/openssl ]; then
LIBCRYPTOFLAGS="--with-ssl-dir=${i}"
fi
done
fi
CONFIGFLAGS="${CONFIGFLAGS} ${LIBCRYPTOFLAGS}"
if [ -x "$(which plink 2>/dev/null)" ]; then
REGRESS_INTEROP_PUTTY=yes
export REGRESS_INTEROP_PUTTY
fi
export CC CFLAGS CPPFLAGS LDFLAGS LTESTS SUDO
export TEST_TARGET TEST_SSH_UNSAFE_PERMISSIONS TEST_SSH_FAIL_FATAL
diff --git a/crypto/openssh/.github/setup_ci.sh b/crypto/openssh/.github/setup_ci.sh
index 044c4d1292b1..e4480e614f31 100755
--- a/crypto/openssh/.github/setup_ci.sh
+++ b/crypto/openssh/.github/setup_ci.sh
@@ -1,188 +1,201 @@
#!/bin/sh
PACKAGES=""
. .github/configs $@
case "`./config.guess`" in
*cygwin)
PACKAGER=setup
echo Setting CYGWIN sustem environment variable.
setx CYGWIN "binmode"
chmod -R go-rw /cygdrive/d/a
umask 077
PACKAGES="$PACKAGES,autoconf,automake,cygwin-devel,gcc-core"
PACKAGES="$PACKAGES,make,openssl-devel,zlib-devel"
;;
*-darwin*)
PACKAGER=brew
brew install automake
exit 0
;;
*)
PACKAGER=apt
esac
TARGETS=$@
INSTALL_FIDO_PPA="no"
export DEBIAN_FRONTEND=noninteractive
#echo "Setting up for '$TARGETS'"
set -ex
if [ -x "`which lsb_release 2>&1`" ]; then
lsb_release -a
fi
# Ubuntu 22.04 defaults to private home dirs which prevent the
# agent-getpeerid test from running ssh-add as nobody. See
# https://github.com/actions/runner-images/issues/6106
if [ ! -z "$SUDO" ] && ! "$SUDO" -u nobody test -x ~; then
echo ~ is not executable by nobody, adding perms.
chmod go+x ~
fi
if [ "${TARGETS}" = "kitchensink" ]; then
TARGETS="krb5 libedit pam sk selinux"
fi
for flag in $CONFIGFLAGS; do
case "$flag" in
--with-pam) TARGETS="${TARGETS} pam" ;;
--with-libedit) TARGETS="${TARGETS} libedit" ;;
esac
done
for TARGET in $TARGETS; do
case $TARGET in
default|without-openssl|without-zlib|c89)
# nothing to do
;;
clang-sanitize*)
PACKAGES="$PACKAGES clang-12"
;;
cygwin-release)
PACKAGES="$PACKAGES libcrypt-devel libfido2-devel libkrb5-devel"
;;
gcc-sanitize*)
;;
clang-*|gcc-*)
compiler=$(echo $TARGET | sed 's/-Werror//')
PACKAGES="$PACKAGES $compiler"
;;
krb5)
PACKAGES="$PACKAGES libkrb5-dev"
;;
heimdal)
PACKAGES="$PACKAGES heimdal-dev"
;;
libedit)
case "$PACKAGER" in
setup) PACKAGES="$PACKAGES libedit-devel" ;;
apt) PACKAGES="$PACKAGES libedit-dev" ;;
esac
;;
*pam)
PACKAGES="$PACKAGES libpam0g-dev"
;;
sk)
INSTALL_FIDO_PPA="yes"
PACKAGES="$PACKAGES libfido2-dev libu2f-host-dev libcbor-dev"
;;
selinux)
PACKAGES="$PACKAGES libselinux1-dev selinux-policy-dev"
;;
hardenedmalloc)
INSTALL_HARDENED_MALLOC=yes
;;
musl)
PACKAGES="$PACKAGES musl-tools"
;;
tcmalloc)
PACKAGES="$PACKAGES libgoogle-perftools-dev"
;;
openssl-noec)
INSTALL_OPENSSL=OpenSSL_1_1_1k
SSLCONFOPTS="no-ec"
;;
openssl-*)
INSTALL_OPENSSL=$(echo ${TARGET} | cut -f2 -d-)
case ${INSTALL_OPENSSL} in
1.1.1_stable) INSTALL_OPENSSL="OpenSSL_1_1_1-stable" ;;
1.*) INSTALL_OPENSSL="OpenSSL_$(echo ${INSTALL_OPENSSL} | tr . _)" ;;
3.*) INSTALL_OPENSSL="openssl-${INSTALL_OPENSSL}" ;;
esac
PACKAGES="${PACKAGES} putty-tools"
;;
libressl-*)
INSTALL_LIBRESSL=$(echo ${TARGET} | cut -f2 -d-)
case ${INSTALL_LIBRESSL} in
master) ;;
*) INSTALL_LIBRESSL="$(echo ${TARGET} | cut -f2 -d-)" ;;
esac
PACKAGES="${PACKAGES} putty-tools"
;;
valgrind*)
PACKAGES="$PACKAGES valgrind"
;;
*) echo "Invalid option '${TARGET}'"
exit 1
;;
esac
done
if [ "yes" = "$INSTALL_FIDO_PPA" ]; then
sudo apt update -qq
sudo apt install -qy software-properties-common
sudo apt-add-repository -y ppa:yubico/stable
fi
-if [ "x" != "x$PACKAGES" ]; then
+tries=3
+while [ ! -z "$PACKAGES" ] && [ "$tries" -gt "0" ]; do
case "$PACKAGER" in
apt)
sudo apt update -qq
- sudo apt install -qy $PACKAGES
+ if sudo apt install -qy $PACKAGES; then
+ PACKAGES=""
+ fi
;;
setup)
- /cygdrive/c/setup.exe -q -P `echo "$PACKAGES" | tr ' ' ,`
+ if /cygdrive/c/setup.exe -q -P `echo "$PACKAGES" | tr ' ' ,`; then
+ PACKAGES=""
+ fi
;;
esac
+ if [ ! -z "$PACKAGES" ]; then
+ sleep 90
+ fi
+ tries=$(($tries - 1))
+done
+if [ ! -z "$PACKAGES" ]; then
+ echo "Package installation failed."
+ exit 1
fi
if [ "${INSTALL_HARDENED_MALLOC}" = "yes" ]; then
(cd ${HOME} &&
git clone https://github.com/GrapheneOS/hardened_malloc.git &&
cd ${HOME}/hardened_malloc &&
make -j2 && sudo cp out/libhardened_malloc.so /usr/lib/)
fi
if [ ! -z "${INSTALL_OPENSSL}" ]; then
(cd ${HOME} &&
git clone https://github.com/openssl/openssl.git &&
cd ${HOME}/openssl &&
git checkout ${INSTALL_OPENSSL} &&
./config no-threads shared ${SSLCONFOPTS} \
--prefix=/opt/openssl &&
make && sudo make install_sw)
fi
if [ ! -z "${INSTALL_LIBRESSL}" ]; then
if [ "${INSTALL_LIBRESSL}" = "master" ]; then
(mkdir -p ${HOME}/libressl && cd ${HOME}/libressl &&
git clone https://github.com/libressl-portable/portable.git &&
cd ${HOME}/libressl/portable &&
git checkout ${INSTALL_LIBRESSL} &&
sh update.sh && sh autogen.sh &&
./configure --prefix=/opt/libressl &&
make -j2 && sudo make install)
else
LIBRESSL_URLBASE=https://cdn.openbsd.org/pub/OpenBSD/LibreSSL
(cd ${HOME} &&
wget ${LIBRESSL_URLBASE}/libressl-${INSTALL_LIBRESSL}.tar.gz &&
tar xfz libressl-${INSTALL_LIBRESSL}.tar.gz &&
cd libressl-${INSTALL_LIBRESSL} &&
./configure --prefix=/opt/libressl && make -j2 && sudo make install)
fi
fi
diff --git a/crypto/openssh/.github/workflows/c-cpp.yml b/crypto/openssh/.github/workflows/c-cpp.yml
index 3cd1188fc572..e6ea49550f71 100644
--- a/crypto/openssh/.github/workflows/c-cpp.yml
+++ b/crypto/openssh/.github/workflows/c-cpp.yml
@@ -1,122 +1,125 @@
name: C/C++ CI
on:
push:
- branches: [ master, ci, V_9_0 ]
- paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', 'Makefile.in', 'configure.ac' ]
+ paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ]
pull_request:
- branches: [ master ]
- paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', 'Makefile.in', 'configure.ac' ]
+ paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ]
jobs:
ci:
if: github.repository != 'openssh/openssh-portable-selfhosted'
strategy:
fail-fast: false
matrix:
# First we test all OSes in the default configuration.
- os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019, windows-2022]
- configs: [default]
+ target: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019, windows-2022]
+ config: [default]
# Then we include any extra configs we want to test for specific VMs.
# Valgrind slows things down quite a bit, so start them first.
include:
- - { os: windows-2019, configs: cygwin-release }
- - { os: windows-2022, configs: cygwin-release }
- - { os: ubuntu-20.04, configs: valgrind-1 }
- - { os: ubuntu-20.04, configs: valgrind-2 }
- - { os: ubuntu-20.04, configs: valgrind-3 }
- - { os: ubuntu-20.04, configs: valgrind-4 }
- - { os: ubuntu-20.04, configs: valgrind-unit }
- - { os: ubuntu-20.04, configs: c89 }
- - { os: ubuntu-20.04, configs: clang-6.0 }
- - { os: ubuntu-20.04, configs: clang-8 }
- - { os: ubuntu-20.04, configs: clang-9 }
- - { os: ubuntu-20.04, configs: clang-10 }
- - { os: ubuntu-20.04, configs: clang-11 }
- - { os: ubuntu-20.04, configs: clang-12-Werror }
- - { os: ubuntu-20.04, configs: clang-sanitize-address }
- - { os: ubuntu-20.04, configs: clang-sanitize-undefined }
- - { os: ubuntu-20.04, configs: gcc-sanitize-address }
- - { os: ubuntu-20.04, configs: gcc-sanitize-undefined }
- - { os: ubuntu-20.04, configs: gcc-7 }
- - { os: ubuntu-20.04, configs: gcc-8 }
- - { os: ubuntu-20.04, configs: gcc-10 }
- - { os: ubuntu-20.04, configs: gcc-11-Werror }
- - { os: ubuntu-20.04, configs: pam }
- - { os: ubuntu-20.04, configs: kitchensink }
- - { os: ubuntu-20.04, configs: hardenedmalloc }
- - { os: ubuntu-20.04, configs: tcmalloc }
- - { os: ubuntu-20.04, configs: musl }
- - { os: ubuntu-latest, configs: libressl-master }
- - { os: ubuntu-latest, configs: libressl-2.2.9 }
- - { os: ubuntu-latest, configs: libressl-2.8.3 }
- - { os: ubuntu-latest, configs: libressl-3.0.2 }
- - { os: ubuntu-latest, configs: libressl-3.2.6 }
- - { os: ubuntu-latest, configs: libressl-3.3.6 }
- - { os: ubuntu-latest, configs: libressl-3.4.3 }
- - { os: ubuntu-latest, configs: libressl-3.5.3 }
- - { os: ubuntu-latest, configs: openssl-master }
- - { os: ubuntu-latest, configs: openssl-noec }
- - { os: ubuntu-latest, configs: openssl-1.0.1 }
- - { os: ubuntu-latest, configs: openssl-1.0.1u }
- - { os: ubuntu-latest, configs: openssl-1.0.2u }
- - { os: ubuntu-latest, configs: openssl-1.1.0h }
- - { os: ubuntu-latest, configs: openssl-1.1.1 }
- - { os: ubuntu-latest, configs: openssl-1.1.1k }
- - { os: ubuntu-latest, configs: openssl-1.1.1n }
- - { os: ubuntu-latest, configs: openssl-1.1.1p }
- - { os: ubuntu-latest, configs: openssl-3.0.0 }
- - { os: ubuntu-latest, configs: openssl-3.0.5 }
- - { os: ubuntu-latest, configs: openssl-1.1.1_stable } # stable branch
- - { os: ubuntu-latest, configs: openssl-3.0 } # stable branch
- - { os: ubuntu-22.04, configs: pam }
- - { os: ubuntu-22.04, configs: krb5 }
- - { os: ubuntu-22.04, configs: heimdal }
- - { os: ubuntu-22.04, configs: libedit }
- - { os: ubuntu-22.04, configs: sk }
- - { os: ubuntu-22.04, configs: selinux }
- - { os: ubuntu-22.04, configs: kitchensink }
- - { os: ubuntu-22.04, configs: without-openssl }
- - { os: macos-11, configs: pam }
- - { os: macos-12, configs: pam }
- runs-on: ${{ matrix.os }}
+ - { target: windows-2019, config: cygwin-release }
+ - { target: windows-2022, config: cygwin-release }
+ - { target: ubuntu-20.04, config: valgrind-1 }
+ - { target: ubuntu-20.04, config: valgrind-2 }
+ - { target: ubuntu-20.04, config: valgrind-3 }
+ - { target: ubuntu-20.04, config: valgrind-4 }
+ - { target: ubuntu-20.04, config: valgrind-5 }
+ - { target: ubuntu-20.04, config: valgrind-unit }
+ - { target: ubuntu-20.04, config: c89 }
+ - { target: ubuntu-20.04, config: clang-6.0 }
+ - { target: ubuntu-20.04, config: clang-8 }
+ - { target: ubuntu-20.04, config: clang-9 }
+ - { target: ubuntu-20.04, config: clang-10 }
+ - { target: ubuntu-20.04, config: clang-11 }
+ - { target: ubuntu-20.04, config: clang-12-Werror }
+ - { target: ubuntu-20.04, config: clang-sanitize-address }
+ - { target: ubuntu-20.04, config: clang-sanitize-undefined }
+ - { target: ubuntu-20.04, config: gcc-sanitize-address }
+ - { target: ubuntu-20.04, config: gcc-sanitize-undefined }
+ - { target: ubuntu-20.04, config: gcc-7 }
+ - { target: ubuntu-20.04, config: gcc-8 }
+ - { target: ubuntu-20.04, config: gcc-10 }
+ - { target: ubuntu-20.04, config: gcc-11-Werror }
+ - { target: ubuntu-20.04, config: pam }
+ - { target: ubuntu-20.04, config: kitchensink }
+ - { target: ubuntu-20.04, config: hardenedmalloc }
+ - { target: ubuntu-20.04, config: tcmalloc }
+ - { target: ubuntu-20.04, config: musl }
+ - { target: ubuntu-latest, config: libressl-master }
+ - { target: ubuntu-latest, config: libressl-2.2.9 }
+ - { target: ubuntu-latest, config: libressl-2.8.3 }
+ - { target: ubuntu-latest, config: libressl-3.0.2 }
+ - { target: ubuntu-latest, config: libressl-3.2.6 }
+ - { target: ubuntu-latest, config: libressl-3.3.6 }
+ - { target: ubuntu-latest, config: libressl-3.4.3 }
+ - { target: ubuntu-latest, config: libressl-3.5.3 }
+ - { target: ubuntu-latest, config: libressl-3.6.1 }
+ - { target: ubuntu-latest, config: libressl-3.7.0 }
+ - { target: ubuntu-latest, config: openssl-master }
+ - { target: ubuntu-latest, config: openssl-noec }
+ - { target: ubuntu-latest, config: openssl-1.0.1 }
+ - { target: ubuntu-latest, config: openssl-1.0.1u }
+ - { target: ubuntu-latest, config: openssl-1.0.2u }
+ - { target: ubuntu-latest, config: openssl-1.1.0h }
+ - { target: ubuntu-latest, config: openssl-1.1.1 }
+ - { target: ubuntu-latest, config: openssl-1.1.1k }
+ - { target: ubuntu-latest, config: openssl-1.1.1n }
+ - { target: ubuntu-latest, config: openssl-1.1.1q }
+ - { target: ubuntu-latest, config: openssl-1.1.1s }
+ - { target: ubuntu-latest, config: openssl-3.0.0 }
+ - { target: ubuntu-latest, config: openssl-3.0.5 }
+ - { target: ubuntu-latest, config: openssl-3.0.7 }
+ - { target: ubuntu-latest, config: openssl-1.1.1_stable }
+ - { target: ubuntu-latest, config: openssl-3.0 } # stable branch
+ - { target: ubuntu-22.04, config: pam }
+ - { target: ubuntu-22.04, config: krb5 }
+ - { target: ubuntu-22.04, config: heimdal }
+ - { target: ubuntu-22.04, config: libedit }
+ - { target: ubuntu-22.04, config: sk }
+ - { target: ubuntu-22.04, config: selinux }
+ - { target: ubuntu-22.04, config: kitchensink }
+ - { target: ubuntu-22.04, config: without-openssl }
+ - { target: macos-11, config: pam }
+ - { target: macos-12, config: pam }
+ runs-on: ${{ matrix.target }}
steps:
- name: set cygwin git params
- if: ${{ startsWith(matrix.os, 'windows') }}
+ if: ${{ startsWith(matrix.target, 'windows') }}
run: git config --global core.autocrlf input
- name: install cygwin
- if: ${{ startsWith(matrix.os, 'windows') }}
+ if: ${{ startsWith(matrix.target, 'windows') }}
uses: cygwin/cygwin-install-action@master
- - uses: actions/checkout@v2
+ - uses: actions/checkout@main
- name: setup CI system
- run: sh ./.github/setup_ci.sh ${{ matrix.configs }}
+ run: sh ./.github/setup_ci.sh ${{ matrix.config }}
- name: autoreconf
run: sh -c autoreconf
- name: configure
- run: sh ./.github/configure.sh ${{ matrix.configs }}
+ run: sh ./.github/configure.sh ${{ matrix.config }}
- name: save config
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@main
with:
- name: ${{ matrix.os }}-${{ matrix.configs }}-config
+ name: ${{ matrix.target }}-${{ matrix.config }}-config
path: config.h
- name: make clean
run: make clean
- name: make
run: make -j2
- name: make tests
- run: sh ./.github/run_test.sh ${{ matrix.configs }}
+ run: sh ./.github/run_test.sh ${{ matrix.config }}
env:
TEST_SSH_UNSAFE_PERMISSIONS: 1
TEST_SSH_HOSTBASED_AUTH: yes
- name: save logs
if: failure()
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@main
with:
- name: ${{ matrix.os }}-${{ matrix.configs }}-logs
+ name: ${{ matrix.target }}-${{ matrix.config }}-logs
path: |
config.h
config.log
regress/*.log
regress/valgrind-out/
regress/asan.log.*
regress/msan.log.*
diff --git a/crypto/openssh/.github/workflows/cifuzz.yml b/crypto/openssh/.github/workflows/cifuzz.yml
new file mode 100644
index 000000000000..7ca8c4719b61
--- /dev/null
+++ b/crypto/openssh/.github/workflows/cifuzz.yml
@@ -0,0 +1,32 @@
+name: CIFuzz
+on:
+ push:
+ paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ]
+ pull_request:
+ paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ]
+
+jobs:
+ Fuzzing:
+ if: github.repository != 'openssh/openssh-portable-selfhosted'
+ runs-on: ubuntu-latest
+ steps:
+ - name: Build Fuzzers
+ id: build
+ uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+ with:
+ oss-fuzz-project-name: 'openssh'
+ dry-run: false
+ language: c++
+ - name: Run Fuzzers
+ uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+ with:
+ oss-fuzz-project-name: 'openssh'
+ fuzz-seconds: 600
+ dry-run: false
+ language: c++
+ - name: Upload Crash
+ uses: actions/upload-artifact@main
+ if: failure() && steps.build.outcome == 'success'
+ with:
+ name: artifacts
+ path: ./out/artifacts
diff --git a/crypto/openssh/.github/workflows/selfhosted.yml b/crypto/openssh/.github/workflows/selfhosted.yml
index c4bd1d9b24f7..50bc9fffb723 100644
--- a/crypto/openssh/.github/workflows/selfhosted.yml
+++ b/crypto/openssh/.github/workflows/selfhosted.yml
@@ -1,108 +1,116 @@
name: C/C++ CI self-hosted
on:
push:
- branches: [ master, ci, V_9_0 ]
- paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', 'Makefile.in', 'configure.ac' ]
+ paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ]
jobs:
selfhosted:
if: github.repository == 'openssh/openssh-portable-selfhosted'
- runs-on: ${{ matrix.os }}
+ runs-on: ${{ matrix.host }}
+ timeout-minutes: 600
env:
- TARGET_HOST: ${{ matrix.os }}
+ HOST: ${{ matrix.host }}
+ TARGET_HOST: ${{ matrix.target }}
+ TARGET_CONFIG: ${{ matrix.config }}
strategy:
fail-fast: false
# We use a matrix in two parts: firstly all of the VMs are tested with the
- # default config. "os" corresponds to a label associated with the worker.
+ # default config. "target" corresponds to a label associated with the
+ # worker. The default is an ephemeral VM running under libvirt.
matrix:
- os:
- - aix51
- - ARM
- - ARM64
+ target:
- alpine
- debian-i386
- - debian-riscv64
- dfly30
- dfly48
- dfly58
- dfly60
+ - dfly62
- fbsd10
- fbsd12
- fbsd13
- # - hurd
- minix3
- # - nbsd2
- nbsd3
- nbsd4
- nbsd8
- nbsd9
- obsd51
- obsd67
- obsd69
- obsd70
- obsdsnap
+ - obsdsnap-i386
- openindiana
- - openwrt-mips
- - openwrt-mipsel
- # - rocky84
- sol10
- sol11
- - win10
- configs:
+ config:
- default
- # Then we include any extra configs we want to test for specific VMs.
+ host:
+ - libvirt
include:
- - { os: ARM64, configs: pam }
- - { os: debian-i386, configs: pam }
- - { os: dfly30, configs: without-openssl}
- - { os: dfly48, configs: pam }
- - { os: dfly58, configs: pam }
- - { os: dfly60, configs: pam }
- - { os: fbsd10, configs: pam }
- - { os: fbsd12, configs: pam }
- - { os: fbsd13, configs: pam }
- - { os: nbsd8, configs: pam }
- - { os: nbsd9, configs: pam }
- - { os: openindiana, configs: pam }
- # - { os: rocky84, configs: pam }
- - { os: sol10, configs: pam }
- - { os: sol11, configs: pam-krb5 }
- - { os: sol11, configs: sol64 }
- # - { os: sol11, configs: sol64-pam }
- - { os: win10, configs: cygwin-release }
+ # Then we include extra libvirt test configs.
+ - { target: aix51, config: default, host: libvirt }
+ - { target: debian-i386, config: pam, host: libvirt }
+ - { target: dfly30, config: without-openssl, host: libvirt}
+ - { target: dfly48, config: pam ,host: libvirt }
+ - { target: dfly58, config: pam, host: libvirt }
+ - { target: dfly60, config: pam, host: libvirt }
+ - { target: dfly62, config: pam, host: libvirt }
+ - { target: fbsd10, config: pam, host: libvirt }
+ - { target: fbsd12, config: pam, host: libvirt }
+ - { target: fbsd13, config: pam, host: libvirt }
+ - { target: nbsd8, config: pam, host: libvirt }
+ - { target: nbsd9, config: pam, host: libvirt }
+ - { target: openindiana, config: pam, host: libvirt }
+ - { target: sol10, config: pam, host: libvirt }
+ - { target: sol11, config: pam-krb5, host: libvirt }
+ - { target: sol11, config: sol64, host: libvirt }
+ # VMs with persistent disks that have their own runner.
+ - { target: win10, config: default, host: win10 }
+ - { target: win10, config: cygwin-release, host: win10 }
+ # Physical hosts, with either native runners or remote via ssh.
+ - { target: ARM, config: default, host: ARM }
+ - { target: ARM64, config: default, host: ARM64 }
+ - { target: ARM64, config: pam, host: ARM64 }
+ - { target: debian-riscv64, config: default, host: debian-riscv64 }
+ - { target: openwrt-mips, config: default, host: openwrt-mips }
+ - { target: openwrt-mipsel, config: default, host: openwrt-mipsel }
steps:
- name: shutdown VM if running
run: vmshutdown
- - uses: actions/checkout@v2
+ working-directory: ${{ runner.temp }}
+ - uses: actions/checkout@main
- name: autoreconf
run: autoreconf
- name: startup VM
run: vmstartup
+ working-directory: ${{ runner.temp }}
- name: configure
- run: vmrun ./.github/configure.sh ${{ matrix.configs }}
+ run: vmrun ./.github/configure.sh ${{ matrix.config }}
- name: save config
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@main
with:
- name: ${{ matrix.os }}-${{ matrix.configs }}-config
+ name: ${{ matrix.target }}-${{ matrix.config }}-config
path: config.h
- name: make clean
run: vmrun make clean
- name: make
run: vmrun make
- name: make tests
- run: vmrun ./.github/run_test.sh ${{ matrix.configs }}
+ run: vmrun ./.github/run_test.sh ${{ matrix.config }}
timeout-minutes: 600
- name: save logs
if: failure()
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@main
with:
- name: ${{ matrix.os }}-${{ matrix.configs }}-logs
+ name: ${{ matrix.target }}-${{ matrix.config }}-logs
path: |
config.h
config.log
regress/*.log
regress/valgrind-out/
- name: shutdown VM
if: always()
run: vmshutdown
+ working-directory: ${{ runner.temp }}
diff --git a/crypto/openssh/.github/workflows/upstream.yml b/crypto/openssh/.github/workflows/upstream.yml
index 3cec069ede74..1e2c2acb7ac0 100644
--- a/crypto/openssh/.github/workflows/upstream.yml
+++ b/crypto/openssh/.github/workflows/upstream.yml
@@ -1,47 +1,52 @@
name: Upstream self-hosted
on:
push:
- branches: [ master, ci ]
+ branches: [ master ]
paths: [ '**.c', '**.h', '.github/**' ]
jobs:
selfhosted:
if: github.repository == 'openssh/openssh-portable-selfhosted'
- runs-on: ${{ matrix.os }}
+ runs-on: 'libvirt'
env:
- TARGET_HOST: ${{ matrix.os }}
+ HOST: 'libvirt'
+ TARGET_HOST: ${{ matrix.target }}
+ TARGET_CONFIG: ${{ matrix.config }}
strategy:
fail-fast: false
matrix:
- os: [ obsdsnap, obsdsnap-i386 ]
- configs: [ default, without-openssl, ubsan ]
+ target: [ obsdsnap, obsdsnap-i386 ]
+ config: [ default, without-openssl, ubsan ]
steps:
- - uses: actions/checkout@v2
- name: shutdown VM if running
run: vmshutdown
+ working-directory: ${{ runner.temp }}
+ - uses: actions/checkout@main
- name: startup VM
run: vmstartup
+ working-directory: ${{ runner.temp }}
- name: update source
run: vmrun "cd /usr/src && cvs up -dPA usr.bin/ssh regress/usr.bin/ssh"
- name: make clean
- run: vmrun "cd /usr/src/usr.bin/ssh && make obj && make clean && cd /usr/src/regress/usr.bin/ssh && make obj && make clean"
+ run: vmrun "cd /usr/src/usr.bin/ssh && make obj && make clean && cd /usr/src/regress/usr.bin/ssh && make obj && make clean && sudo chmod -R g-w /usr/src /usr/obj"
- name: make
- run: vmrun "cd /usr/src/usr.bin/ssh && case ${{ matrix.configs }} in without-openssl) make OPENSSL=no;; ubsan) make DEBUG='-fsanitize-minimal-runtime -fsanitize=undefined';; *) make; esac"
+ run: vmrun "cd /usr/src/usr.bin/ssh && case ${{ matrix.config }} in without-openssl) make OPENSSL=no;; ubsan) make DEBUG='-fsanitize-minimal-runtime -fsanitize=undefined';; *) make; esac"
- name: make install
run: vmrun "cd /usr/src/usr.bin/ssh && sudo make install"
- name: make tests`
- run: vmrun "cd /usr/src/regress/usr.bin/ssh && case ${{ matrix.configs }} in without-openssl) make OPENSSL=no;; ubsan) make DEBUG='-fsanitize-minimal-runtime -fsanitize=undefined';; *) make; esac"
+ run: vmrun "cd /usr/src/regress/usr.bin/ssh && case ${{ matrix.config }} in without-openssl) make OPENSSL=no;; ubsan) make DEBUG='-fsanitize-minimal-runtime -fsanitize=undefined';; *) make; esac"
env:
SUDO: sudo
timeout-minutes: 300
- name: save logs
if: failure()
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@main
with:
- name: ${{ matrix.os }}-${{ matrix.configs }}-logs
+ name: ${{ matrix.target }}-${{ matrix.config }}-logs
path: |
- /usr/obj/regress/usr.bin/ssh/*.log
+ /usr/obj/regress/usr.bin/ssh/obj/*.log
- name: shutdown VM
if: always()
run: vmshutdown
+ working-directory: ${{ runner.temp }}
diff --git a/crypto/openssh/.skipped-commit-ids b/crypto/openssh/.skipped-commit-ids
index b639678939dd..59e80518acf2 100644
--- a/crypto/openssh/.skipped-commit-ids
+++ b/crypto/openssh/.skipped-commit-ids
@@ -1,53 +1,55 @@
5317f294d63a876bfc861e19773b1575f96f027d remove libssh from makefiles
a337e886a49f96701ccbc4832bed086a68abfa85 Makefile changes
f2c9feb26963615c4fece921906cf72e248b61ee more Makefile
fa728823ba21c4b45212750e1d3a4b2086fd1a62 more Makefile refactoring
1de0e85522051eb2ffa00437e1885e9d7b3e0c2e moduli update
814b2f670df75759e1581ecef530980b2b3d7e0f remove redundant make defs
04431e8e7872f49a2129bf080a6b73c19d576d40 moduli update
c07772f58028fda683ee6abd41c73da3ff70d403 moduli update
db6375fc302e3bdf07d96430c63c991b2c2bd3ff moduli update
5ea3d63ab972691f43e9087ab5fd8376d48e898f uuencode.c Makefile accident
99dd10e72c04e93849981d43d64c946619efa474 include sshbuf-misc.c
9e1c23476bb845f3cf3d15d9032da3ed0cb2fcf5 sshbuf-misc.c in regress
569f08445c27124ec7c7f6c0268d844ec56ac061 Makefile tweaks for !openssl
58ec755be4e51978ecfee73539090eb68652a987 moduli update
4bd5551b306df55379afe17d841207990eb773bf Makefile.inc
14806a59353152f843eb349e618abbf6f4dd3ada Makefile.inc
8ea4455a2d9364a0a04f9e4a2cbfa4c9fcefe77e Makefile.inc
d9b910e412d139141b072a905e66714870c38ac0 Makefile.inc
7b7b619c1452a459310b0cf4391c5757c6bdbc0f moduli update
5010ff08f7ad92082e87dde098b20f5c24921a8f moduli regen script update
3bcae7a754db3fc5ad3cab63dd46774edb35b8ae moduli regen script update
52ff0e3205036147b2499889353ac082e505ea54 moduli update
07b5031e9f49f2b69ac5e85b8da4fc9e393992a0 Makefile.inc
cc12a9029833d222043aecd252d654965c351a69 moduli-gen Makefile
7ac6c252d2a5be8fbad4c66d9d35db507c9dac5b moduli update
6b52cd2b637f3d29ef543f0ce532a2bce6d86af5 makefile change
f9a0726d957cf10692a231996a1f34e7f9cdfeb0 moduli update
+1e0a2692b7e20b126dda60bf04999d1d30d959d8 sshd relinking makefile changes
+e1dc11143f83082e3154d6094f9136d0dc2637ad more relinking makefile tweaks
Old upstream tree:
321065a95a7ccebdd5fd08482a1e19afbf524e35 Update DH groups
d4f699a421504df35254cf1c6f1a7c304fb907ca Remove 1k bit groups
aafe246655b53b52bc32c8a24002bc262f4230f7 Remove intermediate moduli
8fa9cd1dee3c3339ae329cf20fb591db6d605120 put back SSH1 for 6.9
f31327a48dd4103333cc53315ec53fe65ed8a17a Generate new moduli
edbfde98c40007b7752a4ac106095e060c25c1ef Regen moduli
052fd565e3ff2d8cec3bc957d1788f50c827f8e2 Switch to tame-based sandbox
7cf73737f357492776223da1c09179fa6ba74660 Remove moduli <2k
180d84674be1344e45a63990d60349988187c1ae Update moduli
f6ae971186ba68d066cd102e57d5b0b2c211a5ee systrace is dead.
96c5054e3e1f170c6276902d5bc65bb3b87a2603 remove DEBUGLIBS from Makefile
6da9a37f74aef9f9cc639004345ad893cad582d8 Update moduli file
77bcb50e47b68c7209c7f0a5a020d73761e5143b unset REGRESS_FAIL_EARLY
38c2133817cbcae75c88c63599ac54228f0fa384 Change COMPILER_VERSION tests
30c20180c87cbc99fa1020489fe7fd8245b6420c resync integrity.sh shell
1e6b51ddf767cbad0a4e63eb08026c127e654308 integrity.sh reliability
fe5b31f69a60d47171836911f144acff77810217 Makefile.inc bits
5781670c0578fe89663c9085ed3ba477cf7e7913 Delete sshconnect1.c
ea80f445e819719ccdcb237022cacfac990fdc5c Makefile.inc warning flags
b92c93266d8234d493857bb822260dacf4366157 moduli-gen.sh tweak
b25bf747544265b39af74fe0716dc8d9f5b63b95 Updated moduli
1bd41cba06a7752de4df304305a8153ebfb6b0ac rsa.[ch] already removed
e39b3902fe1d6c4a7ba6a3c58e072219f3c1e604 Makefile changes
diff --git a/crypto/openssh/ChangeLog b/crypto/openssh/ChangeLog
index 02e11b023ca0..4251831a1732 100644
--- a/crypto/openssh/ChangeLog
+++ b/crypto/openssh/ChangeLog
@@ -1,11314 +1,11196 @@
-commit 0ffb46f2ee2ffcc4daf45ee679e484da8fcf338c
+commit 6dfb65de949cdd0a5d198edee9a118f265924f33
Author: Damien Miller <djm@mindrot.org>
-Date: Tue Oct 4 01:51:42 2022 +1100
+Date: Thu Feb 2 23:21:54 2023 +1100
- update .depend
+ crank versions in RPM specs
-commit 657e676ff696c7bb787bffb0e249ea1be3b474e1
+commit d07cfb11a0ca574eb68a3931d8c46fbe862a2021
Author: Damien Miller <djm@mindrot.org>
-Date: Tue Oct 4 01:45:52 2022 +1100
+Date: Thu Feb 2 23:21:45 2023 +1100
- update release notes URL
+ update version in README
-commit f059da2b29840c0f048448809c317ce2ae014da7
+commit 9fe207565b4ab0fe5d1ac5bb85e39188d96fb214
Author: Damien Miller <djm@mindrot.org>
-Date: Tue Oct 4 01:45:41 2022 +1100
+Date: Thu Feb 2 23:17:49 2023 +1100
- crank versions in RPM spec files
+ adapt compat_kex_proposal() test to portable
-commit b51f3f172d87cbdb80ca4eb7b2149e56a7647557
+commit 903c556b938fff2d7bff8da2cc460254430963c5
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Sep 26 22:18:40 2022 +0000
+Date: Thu Feb 2 12:12:52 2023 +0000
- upstream: openssh-9.1
+ upstream: test compat_kex_proposal(); by dtucker@
- OpenBSD-Commit-ID: 5a467b2ee81da01a86adf1ad93b62b1728494e56
+ OpenBSD-Regress-ID: 0e404ee264db546f9fdbf53390689ab5f8d38bf2
-commit 4cf8d0c0f3030f594a238bab21a0695735515487
+commit 405fba71962dec8409c0c962408e09049e5624b5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Wed Sep 21 22:26:50 2022 +0000
+Date: Thu Jan 19 07:53:45 2023 +0000
- upstream: Fix typo. From AlexanderStohr via github PR#343.
+ upstream: Check if we can copy sshd or need to use sudo to do so
- OpenBSD-Commit-ID: a134c9b4039e48803fc6a87f955b0f4a03181497
+ during reexec test. Skip test if neither can work. Patch from anton@, tweaks
+ from me.
+
+ OpenBSD-Regress-ID: 731b96ae74d02d5744e1f1a8e51d09877ffd9b6d
-commit 8179fed3264d5919899900ed8881d5f9bb57ca33
+commit b2a2a8f69fd7737ea17dc044353c514f2f962f35
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Sep 19 21:39:16 2022 +0000
+Date: Thu Feb 2 12:10:22 2023 +0000
- upstream: add RequiredRSASize to the list of keywords accepted by
+ upstream: openssh-9.2
- -o; spotted by jmc@
+ OpenBSD-Commit-ID: f7389f32413c74d6e2055f05cf65e7082de03923
+
+commit 12da7823336434a403f25c7cc0c2c6aed0737a35
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Thu Feb 2 12:10:05 2023 +0000
+
+ upstream: fix double-free caused by compat_kex_proposal(); bz3522
- OpenBSD-Commit-ID: fe871408cf6f9d3699afeda876f8adbac86a035e
+ by dtucker@, ok me
+
+ OpenBSD-Commit-ID: 2bfc37cd2d41f67dad64c17a64cf2cd3806a5c80
-commit 5f954929e9f173dd1e279e07d0e8b14fa845814d
-Author: Damien Miller <djm@mindrot.org>
-Date: Mon Sep 19 20:59:34 2022 +1000
+commit 79efd95ab5ff99f4cb3a955e2d713b3f54fb807e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Wed Feb 1 17:17:26 2023 +1100
- no need for glob.h here
+ Skip connection-timeout test on minix3.
- it also causes portability problems
+ Minix 3's Unix domain sockets don't seem to work the way we expect, so
+ skip connection-timeout test on that platform. While there, group
+ together all similarly skipped tests and explicitly comment.
-commit 03d94a47207d58b3db37eba4f87eb6ae5a63168a
+commit 6b508c4e039619842bcf5a16f8a6b08dd6bec44a
Author: Damien Miller <djm@mindrot.org>
-Date: Mon Sep 19 20:59:04 2022 +1000
+Date: Wed Feb 1 12:12:05 2023 +1100
- avoid Wuninitialized false positive in gcc-12ish
+ fix libfido2 detection without pkg-config
+
+ Place libfido2 before additional libraries (that it may depend upon)
+ and not after. bz3530 from James Zhang; ok dtucker@
-commit 9d952529113831fb3071ab6e408d2726fd72e771
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Sep 19 10:46:00 2022 +0000
+commit 358e300fed5e6def233a2c06326e51e20ebed621
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date: Wed Jan 18 20:56:36 2023 +0000
- upstream: use users-groups-by-id@openssh.com sftp-server extension
-
- (when available) to fill in user/group names for directory listings.
- Implement a client-side cache of see uid/gid=>user/group names. ok markus@
+ upstream: delete useless dependency
- OpenBSD-Commit-ID: f239aeeadfa925a37ceee36ee8b256b8ccf4466e
+ OpenBSD-Commit-ID: e1dc11143f83082e3154d6094f9136d0dc2637ad
-commit 8ff680368b0bccf88ae85d4c99de69387fbad7a6
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Sep 19 10:43:12 2022 +0000
+commit a4cb9be1b021b511e281ee55c356f964487d9e82
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date: Wed Jan 18 20:43:15 2023 +0000
- upstream: sftp client library support for
+ upstream: Create and install sshd random relink kit.
- users-groups-by-id@openssh.com; ok markus@
+ ../Makefile.inc and Makfile are concatenated for reuse, which hopefully won't
+ be too fragile, we'll see if we need a different approach. The resulting sshd
+ binary is tested with the new sshd -V option before installation. As the
+ binary layout is now semi-unknown (meaning relative, fixed, and gadget
+ offsets are not precisely known), change the filesystem permissions to 511 to
+ prevent what I call "logged in BROP". I have ideas for improving this further
+ but this is a first step ok djm
- OpenBSD-Commit-ID: ddb2f33a2da6349a9a89a8b5bcb9ca7c999394de
+ OpenBSD-Commit-ID: 1e0a2692b7e20b126dda60bf04999d1d30d959d8
-commit 488f6e1c582212c2374a4bf8cd1b703d2e70fb8b
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Sep 19 10:41:58 2022 +0000
+commit bc7de6f91a9a0ae2f148a9d31a4027d441a51999
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date: Wed Jan 18 06:55:32 2023 +0000
- upstream: extend sftp-common.c:extend ls_file() to support supplied
-
- user/group names; ok markus@
+ upstream: tweak previous; ok djm
- OpenBSD-Commit-ID: c70c70498b1fdcf158531117e405b6245863bfb0
+ OpenBSD-Commit-ID: df71ce4180c58202dfdc1d92626cfe900b91b7c3
-commit 74b77f7497dba3a58315c8f308883de448078057
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Sep 19 10:40:52 2022 +0000
+commit a20b7e999773e6333c8aa9b0a7fa41966e63b037
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Tue Jan 31 19:35:44 2023 +1100
- upstream: sftp-server(8): add a "users-groups-by-id@openssh.com"
-
- extension request that allows the client to obtain user/group names that
- correspond to a set of uids/gids.
-
- Will be used to make directory listings more useful and consistent
- in sftp(1).
+ Skip connection-timeout test under Valgrind.
- ok markus@
-
- OpenBSD-Commit-ID: 7ebabde0bcb95ef949c4840fe89e697e30df47d3
+ Valgrind slows things down so much that the timeout test fails. Skip
+ this test until we figure out if we can make it work.
-commit 231a346c0c67cc7ca098360f9a554fa7d4f1eddb
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Sep 19 08:49:50 2022 +0000
+commit c3ffb54b4fc5e608206037921db6ccbc2f5ab25f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Wed Jan 25 21:58:40 2023 +1100
- upstream: better debugging for connect_next()
+ Skip connection-timeout when missing FD passing.
- OpenBSD-Commit-ID: d16a307a0711499c971807f324484ed3a6036640
+ This tests uses multiplexing which uses file descriptor passing, so
+ skip it if we don't have that. Fixes test failures on Cygwin.
-commit 1875042c52a3b950ae5963c9ca3774a4cc7f0380
+commit 35253af01d8c0ab444c8377402121816e71c71f5
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sat Sep 17 10:34:29 2022 +0000
+Date: Wed Jan 18 02:00:10 2023 +0000
- upstream: Add RequiredRSASize for sshd(8); RSA keys that fall
+ upstream: when restoring non-blocking mode to stdio fds, restore
- beneath this limit will be ignored for user and host-based authentication.
+ exactly the flags that ssh started with and don't just clobber them with
+ zero, as this could also remove the append flag from the set;
- Feedback deraadt@ ok markus@
+ bz3523; ok dtucker@
- OpenBSD-Commit-ID: 187931dfc19d51873df5930a04f2d972adf1f7f1
+ OpenBSD-Commit-ID: 1336b03e881db7564a4b66014eb24c5230e9a0c0
-commit 54b333d12e55e6560b328c737d514ff3511f1afd
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sat Sep 17 10:33:18 2022 +0000
+commit 7d17ea151c0b2519f023bd9cc7f141128833ac47
+Author: millert@openbsd.org <millert@openbsd.org>
+Date: Wed Jan 18 01:50:21 2023 +0000
- upstream: add a RequiredRSASize for checking RSA key length in
-
- ssh(1). User authentication keys that fall beneath this limit will be
- ignored. If a host presents a host key beneath this limit then the connection
- will be terminated (unfortunately there are no fallbacks in the protocol for
- host authentication).
+ upstream: Add a -V (version) option to sshd like the ssh client
- feedback deraadt, Dmitry Belyavskiy; ok markus@
+ has. OK markus@ deraadt@
- OpenBSD-Commit-ID: 430e339b2a79fa9ecc63f2837b06fdd88a7da13a
+ OpenBSD-Commit-ID: abe990ec3e636fb040132aab8cbbede98f0c413e
-commit 07d8771bacfefbcfb37fa8a6dc6103bcc097e0ab
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sat Sep 17 10:30:45 2022 +0000
+commit 62360feb7f08f2a4c6fc36f3b3449309203c42c9
+Author: millert@openbsd.org <millert@openbsd.org>
+Date: Tue Jan 17 18:52:44 2023 +0000
- upstream: Add a sshkey_check_rsa_length() call for checking the
+ upstream: For "ssh -V" always exit 0, there is no need to check opt
- length of an RSA key; ok markus@
+ again. This was missed when the fallthrough in the switch case above it was
+ removed. OK deraadt@
- OpenBSD-Commit-ID: de77cd5b11594297eda82edc594b0d32b8535134
+ OpenBSD-Commit-ID: 5583e5d8f6d62a8a4215cfa95a69932f344c8120
-commit 3991a0cf947cf3ae0f0373bcec5a90e86a7152f5
+commit 12492c0abf1eb415d08a897cc1d8b9e789888230
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sat Sep 17 10:11:29 2022 +0000
+Date: Tue Jan 17 10:15:10 2023 +0000
- upstream: actually hook up restrict_websafe; the command-line flag
+ upstream: also check that an active session inhibits
- was never actually used. Spotted by Matthew Garrett
+ UnusedConnectionTimeout idea markus@
- OpenBSD-Commit-ID: 0b363518ac4c2819dbaa3dfad4028633ab9cdff1
+ OpenBSD-Regress-ID: 55c0fb61f3bf9e092b0a53f9041d3d2012f14003
-commit 30b2a7e4291fb9e357f80a237931ff008d686d3b
+commit cef2593c33ac46a58238ff998818754eabdf64ff
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Sep 16 06:55:37 2022 +0000
+Date: Tue Jan 17 10:02:34 2023 +0000
- upstream: correct error value
+ upstream: regression test for UnusedConnectionTimeout
- OpenBSD-Commit-ID: 780efcbad76281f11f14b2a5ff04eb6db3dfdad4
+ OpenBSD-Regress-ID: 7f29001374a68e71e5e078f69e4520cf4bcca084
-commit ac1ec9545947d9f9657259f55d04cb49d3a94c8a
+commit aff9493a89c71d6a080419b49ac64eead9730491
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Sep 16 03:33:14 2022 +0000
+Date: Mon Jan 16 04:11:29 2023 +0000
- upstream: sftp: Be a bit more clever about completions
-
- There are commands (e.g. "get" or "put") that accept two
- arguments, a local path and a remote path. However, the way
- current completion is written doesn't take this distinction into
- account and always completes remote or local paths.
-
- By expanding CMD struct and "cmds" array this distinction can be
- reflected and with small adjustment to completer code the correct
- path can be completed.
+ upstream: unbreak test: cannot access shell positional parameters
- By Michal Privoznik, ok dtucker@
+ past $9 without wrapping the position in braces (i.e. need ${10}, etc.)
- OpenBSD-Commit-ID: 1396d921c4eb1befd531f5c4a8ab47e7a74b610b
+ OpenBSD-Regress-ID: 3750ec98d5d409ce6a93406fedde6f220d2ea2ac
-commit 590db83384f9d99fc51c84505792d26d1ef60df9
+commit 0293c19807f83141cdf33b443154459f9ee471f6
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Sep 16 03:13:34 2022 +0000
+Date: Tue Jan 17 09:44:48 2023 +0000
- upstream: sftp: Don't attempt to complete arguments for
+ upstream: Add a sshd_config UnusedConnectionTimeout option to terminate
- non-existent commands
+ client connections that have no open channels for some length of time. This
+ complements the recently-added ChannelTimeout option that terminates inactive
+ channels after a timeout.
- If user entered a non-existent command (e.g. because they made a
- typo) there is no point in trying to complete its arguments. Skip
- calling complete_match() if that's the case.
+ ok markus@
- From Michal Privoznik
+ OpenBSD-Commit-ID: ca983be74c0350364c11f8ba3bd692f6f24f5da9
+
+commit 8ec2e3123802d2beeca06c1644b0b647f6d36dab
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Sun Jan 15 23:35:10 2023 +0000
+
+ upstream: adapt to ed25519 changes in src/usr.bin/ssh
- OpenBSD-Commit-ID: cf39c811a68cde2aeb98fc85addea4000ef6b07a
+ OpenBSD-Regress-ID: 4b3e7ba7ee486ae8a0b4790f8112eded2bb7dcd5
-commit ff9809fdfd1d9a91067bb14a77d176002edb153c
+commit 9fbbfeca1ce4c7ec0001c827bbf4189a3ba0964b
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Sep 14 00:14:37 2022 +0000
+Date: Sun Jan 15 23:05:32 2023 +0000
- upstream: sk_enroll: never drop SSH_SK_USER_VERIFICATION_REQD flag
+ upstream: update OpenSSH's Ed25519 code to the last version of SUPERCOP
- from response
+ (20221122) and change the import approach to the same one we use for
+ Streamlined NTRUPrime: use a shell script to extract the bits we need from
+ SUPERCOP, make some minor adjustments and squish them all into a single file.
- Now that all FIDO signing calls attempt first without PIN and then
- fall back to trying PIN only if that attempt fails, we can remove the
- hack^wtrick that removed the UV flag from the keys returned during
- enroll.
+ ok tb@ tobhe@
- By Corinna Vinschen
+ OpenBSD-Commit-ID: 1bc0fd624cb6af440905b8ba74ac7c03311b8e3b
+
+commit 6283f4bd83eee714d0f5fc55802eff836b06fea8
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Sat Jan 14 22:02:44 2023 +1100
+
+ Allow writev is seccomp sandbox.
- OpenBSD-Commit-ID: 684517608c8491503bf80cd175425f0178d91d7f
+ This seems to be used by recent glibcs at least in some configurations.
+ From bz#3512, ok djm@
-commit 940dc10729cb5a95b7ee82c10184e2b9621c8a1d
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Sep 14 00:13:13 2022 +0000
+commit 923c3f437f439cfca238fba37e97a7041782f615
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Sat Jan 14 10:05:54 2023 +0000
- upstream: a little extra debugging
+ upstream: Shell syntax fix. From ren mingshuai vi github PR#369.
- OpenBSD-Commit-ID: edf1601c1d0905f6da4c713f4d9cecc7d1c0295a
+ OpenBSD-Regress-ID: 6696b2eeefe128099fc3d7ea9f23252cc35156f9
-commit 4b5f91cb959358141181b934156513fcb8a6c1e3
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Sep 14 00:02:03 2022 +0000
+commit 4d87a00f704e0365e11c3c38b170c1275ec461fc
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Sat Jan 14 09:57:08 2023 +0000
- upstream: ssh-agent: attempt FIDO key signing without PIN and use
+ upstream: Instead of skipping the all-tokens test if we don't have
- the error to determine whether a PIN is required and prompt only if
- necessary. from Corinna Vinschen
+ OpenSSL (since we use it to compute the hash), put the hash at the end and
+ just omit it if we don't have it. Prompted by bz#3521.
- OpenBSD-Commit-ID: dd6be6a0b7148608e834ee737c3479b3270b00dd
+ OpenBSD-Regress-ID: c79ecba64250ed3b6417294b6c965e6b12ca5eea
-commit 113523bf0bc33600b07ebb083572c8c346b6fdf4
+commit b05406d6f93b8c8ec11ec8b27e7c76cc7a5a55fb
Author: jmc@openbsd.org <jmc@openbsd.org>
-Date: Sun Sep 11 06:38:11 2022 +0000
+Date: Fri Jan 13 07:13:40 2023 +0000
- upstream: .Li -> .Vt where appropriate; from josiah frentsos,
+ upstream: fix double phrase in previous;
- tweaked by schwarze
-
- ok schwarze
+ OpenBSD-Commit-ID: 671e6c8dc5e9230518b2bbfa143daaa88adc66c2
+
+commit 40564812b659c530eb1f4b62d09e85612aef3107
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Fri Jan 13 03:16:29 2023 +0000
+
+ upstream: Document "UserKnownHostsFile none". ok djm@
- OpenBSD-Commit-ID: 565046e3ce68b46c2f440a93d67c2a92726de8ed
+ OpenBSD-Commit-ID: f695742d39e34ecdcc3c861c3739a84648a4bce5
-commit 86af013b56cecb5ee58ae0bd9d495cd586fc5918
-Author: jsg@openbsd.org <jsg@openbsd.org>
-Date: Sat Sep 10 08:50:53 2022 +0000
+commit d03e245e034019a37388f6f5f893ce848ab6d2e2
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Fri Jan 13 23:02:34 2023 +1100
- upstream: fix repeated words ok miod@ jmc@
+ Retry package installation 3 times.
- OpenBSD-Commit-ID: 6765daefe26a6b648cc15cadbbe337596af709b7
+ When setting up the CI environment, retry package installation 3 times
+ before going up. Should help prevent spurious failures during
+ infrastructure issues.
-commit 0ba39b93b326a7d5dfab776cc9b9d326161a9b16
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Sep 9 03:31:42 2022 +0000
+commit 625f6bc39840167dafb3bf5b6a3e18503ac986e8
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Fri Jan 13 04:47:34 2023 +0000
- upstream: notifier_complete(NULL, ...) is a noop, so no need to test
+ upstream: Move scp path setting to a helper function. The previous
- that ctx!=NULL; from Corinna Vinschen
+ commit to add scp to the test sshd's path causes the t-envpass test to fail
+ when the test scp is given using a fully qualified path. Put this in a
+ helper function and only call it from the scp tests.
- OpenBSD-Commit-ID: ade2f2e9cc519d01a586800c25621d910bce384a
+ OpenBSD-Regress-ID: 7533dc1c4265c1de716abb062957994195b36df4
-commit be197635329feb839865fdc738e34e24afd1fca8
-Author: Sam James <sam@gentoo.org>
-Date: Thu Sep 8 02:49:29 2022 +0100
+commit 6e6f88647042b3cde54a628545c2f5fb656a9327
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Fri Jan 13 04:23:00 2023 +0000
- openbsd-compat/bsd-asprintf: add <stdio.h> include for vsnprintf
+ upstream: Add scp's path to test sshd's PATH.
- Fixes the following build failure with Clang 15 on musl:
- ```
- bsd-asprintf.c:51:8: error: call to undeclared library function 'vsnprintf' with type 'int (char *, unsigned long, const char *, struct __va_list_tag *)'; ISO C99 and laterclang -O2 -pipe -fdiagnostics-color=always -frecord-gcc-switches -pipe -Wunknown-warning-option -Qunused-arguments -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-result -Wmisleading-indentation -Wbitwise-instead-of-logical -fno-strict-aliasing -mretpoline -ftrapv -fzero-call-used-regs=all -fno-builtin-memset -fstack-protector-strong -fPIE -I. -I. -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -DSSHDIR=\"/etc/ssh\" -D_PATH_SSH_PROGRAM=\"/usr/bin/ssh\" -D_PATH_SSH_ASKPASS_DEFAULT=\"/usr/lib/misc/ssh-askpass\" -D_PATH_SFTP_SERVER=\"/usr/lib/misc/sftp-server\" -D_PATH_SSH_KEY_SIGN=\"/usr/lib/misc/ssh-keysign\" -D_PATH_SSH_PKCS11_HELPER=\"/usr/lib/misc/ssh-pkcs11-helper\" -D_PATH_SSH_SK_HELPER=\"/usr/lib/misc/ssh-sk-helper\" -D_PATH_SSH_PIDDIR=\"/run\" -D_PATH_PRIVSEP_CHROOT_DIR=\"/var/empty\" -DHAVE_CONFIG_H -c cipher-aes.c -o cipher-aes.o
- do not support
- implicit function declarations [-Wimplicit-function-declaration]
- ret = vsnprintf(string, INIT_SZ, fmt, ap2);
- ^
- bsd-asprintf.c:51:8: note: include the header <stdio.h> or explicitly provide a declaration for 'vsnprintf'
- 1 error generated.
- ```
+ If the scp we're testing is fully qualified (eg it's not in the system
+ PATH) then add its path to the under-test sshd's PATH so we can find
+ it. Prompted by bz#3518.
+
+ OpenBSD-Regress-ID: 7df4f5a0be3aa135495b7e5a6719d3cbc26cc4c0
-commit 6cb6f660bb35f77a0456dd2581ddf39c29398a5e
+commit 8a5e99a70fcf9b022a8aa175ebf6a71f58511da3
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Sep 2 16:43:27 2022 +1000
+Date: Fri Jan 13 15:49:48 2023 +1100
- Remove DEF_WEAK, it's already in defines.h.
+ Remove skipping test when scp not in path.
+
+ An upcoming change renders this obsolete by adding scp's path to the
+ test sshd's PATH, and removing this first will make the subsequent sync
+ easier.
-commit ce39e7d8b70c4726defde5d3bc4cb7d40d131153
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Sep 2 14:28:14 2022 +1000
+commit 41f36dd896c8fb8337d403fcf476762986976e9d
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Fri Jan 13 02:58:20 2023 +0000
- Resync arc4random with OpenBSD.
+ upstream: Add a "Host" line to the output of ssh -G showing the
- This brings us up to current, including djm's random-reseeding change,
- as prompted by logan at cyberstorm.mu in bz#3467. It brings the
- platform-specific hooks from LibreSSL Portable, simplified to match our
- use case. ok djm@.
+ original host arg. Inspired by patch from vincent at bernat.ch via bz#3343,
+ ok djm@
+
+ OpenBSD-Commit-ID: 59c0f60a222113a44d0650cd394376e3beecc883
-commit beaddde26f30e2195b8aa4f3193970e140e17305
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Sep 2 14:20:04 2022 +1000
+commit f673b49f3be3eb51074fbb8a405beb6cd0f7d93e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Jan 13 02:44:02 2023 +0000
- Move OPENBSD ORIGINAL marker.
+ upstream: avoid printf("%s", NULL) if using ssh
- Putting this after the copyright statement (which doesn't change)
- instead of before the version identifier (which does) prevents merge
- conflicts when resyncing changes.
+ -oUserKnownHostsFile=none and a hostkey in one of the system known hosts file
+ changes; ok dtucker@
+
+ OpenBSD-Commit-ID: 7ca87614bfc6da491315536a7f2301434a9fe614
-commit c83e467ead67a8cb48ef4bec8085d6fb880a2ff4
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Sep 2 14:17:28 2022 +1000
+commit 93fc7c576563e3d88a1dc019dd213f65607784cc
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Jan 11 05:39:38 2023 +0000
- Remove arc4random_uniform from arc4random.c
+ upstream: clamp the minimum buffer lengths and number of inflight
- This was previously moved into its own file (matching OpenBSD) which
- prematurely committed in commit 73541f2.
+ requests too
+
+ OpenBSD-Commit-ID: c4965f62fa0ba850940fd66ae3f60cf516bbcd56
-commit 5f45c2395c60865e59fa44152ff1d003a128c5bc
+commit 48bf234322e639d279c5a28435eae50155e9b514
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Sep 2 04:20:02 2022 +0000
+Date: Wed Jan 11 05:36:50 2023 +0000
- upstream: sk-usbhid: fix key_lookup() on tokens with built-in UV
+ upstream: ignore bogus upload/download buffer lengths in the limits
- explicitly test whether the token performs built-in UV (e.g. biometric
- tokens) and enable UV in that case. From Pedro Martelletto via GHPR#388
+ extension
- OpenBSD-Commit-ID: 007eb7e387d27cf3029ab06b88224e03eca62ccd
+ OpenBSD-Commit-ID: c5b023e0954693ba9a5376e4280c739b5db575f8
-commit 03277a4aa49b80af541a3e691f264c0c0d8f9cec
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Wed Aug 31 20:26:30 2022 +1000
+commit 36b00d31833ca74cb0f7c7d8eda1bde55700f929
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Jan 11 02:13:52 2023 +0000
- Move sftp from valgrind-2 to 3 to rebalance.
+ upstream: remove whitespace at EOL from code extracted from SUPERCOP
+
+ OpenBSD-Commit-ID: 1ec524ff2fbb9387d731601437c82008f35a60f4
-commit fcf5365da69c516817321ba89c3a91df98d098df
+commit d888de06c5e4d7dbf2f2b85f2b5bf028c570cf78
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Aug 31 02:56:40 2022 +0000
+Date: Wed Jan 11 00:51:27 2023 +0000
- upstream: whitespace
+ upstream: rewrite this test to use a multiplexed ssh session so we can
- OpenBSD-Commit-ID: c2bcbf93610d3d62ed206cdf9bf9ff98c6aaf232
+ control its lifecycle without risk of race conditions; fixes some of the
+ Github integration tests for openssh-portable
+
+ OpenBSD-Regress-ID: 5451cad59ba0d43ae9eeda48ec80f54405fee969
-commit e60136a3d7a223dd8e84ba8a6895bc3142360993
+commit 4bcc737a35fdd9cc4af7423d6c23dfd0c7ef4786
Author: Damien Miller <djm@mindrot.org>
-Date: Mon Aug 29 13:27:45 2022 +1000
+Date: Wed Jan 11 11:45:17 2023 +1100
- additional keys
+ remove buffer len workaround for NetBSD 4.x
+
+ Switching to from pipes to a socketpair for communicating with the
+ ssh process avoids the (kernel bug?) problem.
-commit 2b02dcb505288c462d1b5dd1ac04e603d01340eb
+commit f5154d2aac3e6a32a1b13dec23a701a087850cdc
Author: Damien Miller <djm@mindrot.org>
-Date: Mon Aug 29 13:23:43 2022 +1000
+Date: Wed Jan 11 11:44:19 2023 +1100
- cross-sign allowed_signers with PGP key
+ add back use of pipes in scp.c under USE_PIPES
- Provides continuity of trust from legacy PGP release key to
- the SSHSIG signing keys that we will use henceforth for git
- signing.
+ This matches sftp.c which prefers socketpair but uses pipes on
+ some older platforms.
-commit 51b345f177ae981b8755f6bdf8358b1cc5e83d67
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Aug 27 21:49:27 2022 +1000
+commit eec737b59cf13841de46134967a206607000acd4
+Author: millert@openbsd.org <millert@openbsd.org>
+Date: Tue Jan 10 23:22:15 2023 +0000
- Add libcrypt-devel to cygwin-release deps.
+ upstream: Switch scp from using pipes to a socketpair for
- Based on feedback from vinschen at redhat.com.
-
-commit 9f81736cf16dd8dda1c8942f1973a5f80b8cd78c
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Aug 27 09:37:40 2022 +1000
-
- Add Windows 2022 test targets.
+ communication with it's ssh sub-processes. We no longer need to reserve two
+ descriptors to ensure that we don't end up using fd 0-2 unexpectedly, that is
+ handled by sanitise_stdfd() in main(). Based on an original diff from djm@.
+ OK deraadt@ djm@
+
+ OpenBSD-Commit-ID: b80c372faac462471e955ddeab9480d668a2e48d
-commit 85e1a69243f12be8520438ad6a3cfdc0b7fcbb2d
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Aug 26 16:26:06 2022 +1000
+commit d213d126a4a343abd3a1eb13687d39c1891fe5c8
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date: Fri Jan 6 08:44:11 2023 +0000
- Add cygwin-release test target.
+ upstream: tweak previous; ok djm
- This also moves the cygwin package install from the workflow file to
- setup_ci.sh so that we can install different sets of Cygwin packages
- for different test configs.
+ OpenBSD-Commit-ID: 229c493452766d70a78b0f02f6ff9894f9028858
-commit 92382dbe8bf9ea1225b16858f9b9b208c15c7e8d
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Aug 26 08:16:27 2022 +0000
+commit 4a5590a5ee47b7dfd49773e9fdba48ad3089fe64
+Author: Damien Miller <djm@mindrot.org>
+Date: Mon Jan 9 16:33:56 2023 +1100
- upstream: whitespace
+ try to improve logging for dynamic-forward test
- OpenBSD-Commit-ID: a5d015efbfd228dc598ffdef612d2da3a579e5d8
+ previously the logs from the ssh used to exercise the forwarding
+ channel would clobber the logs from the ssh actually doing the
+ forwarding
-commit 70a5de0a50e84d7250eb4e4537f765599f64c4af
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Aug 26 08:12:56 2022 +0000
+commit 715bc25dcfccf9fb2bee820155fe071d01a618db
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Sat Jan 7 23:24:50 2023 +1100
- upstream: whitespace
+ Skip dynamic-forward test on minix3.
- OpenBSD-Commit-ID: d297e4387935d4aef091c5e9432578c2e513f538
+ This test relies on loopback addresses which minix does not have.
+ Previously the test would not run at all since it also doesn't have
+ netcat, but now we use our own netcat it tries and fails.
-commit 3a683a19fd116ea15ebf8aa13d02646cceb302a9
+commit dd1249bd5c45128a908395c61b26996a70f82205
Author: Damien Miller <djm@mindrot.org>
-Date: Fri Aug 26 14:23:55 2022 +1000
-
- initial list of allowed signers
+Date: Sun Jan 8 12:08:59 2023 +1100
-commit 6851f4b8c3fc1b3e1114c56106e4dc31369c8513
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Aug 19 17:22:18 2022 +1000
-
- Install Cygwin packages based on OS not config.
+ don't test IPv6 addresses if platform lacks support
-commit f96480906893ed93665df8cdf9065865c51c1475
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Aug 19 06:07:47 2022 +0000
+commit d77fc611a62f2dfee0b654c31a50a814b13310dd
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Fri Jan 6 12:33:33 2023 +0000
- upstream: attemp FIDO key signing without PIN and use the error
+ upstream: When OpenSSL is not available, skip parts of percent test
- code returned to fall back only if necessary. Avoids PIN prompts for FIDO
- tokens that don't require them; part of GHPR#302
+ that require it. Based on github pr#368 from ren mingshuai.
- OpenBSD-Commit-ID: 4f752aaf9f2e7c28bcaaf3d4f8fc290131bd038e
+ OpenBSD-Regress-ID: 49a375b2cf61ccb95b52e75e2e025cd10988ebb2
-commit 5453333b5d28e313284cb9aae82899704103f98d
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Aug 19 05:53:28 2022 +0000
+commit 1cd2aac312af9172f1b5cb06c2e1cd090abb83cf
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Sat Jan 7 23:01:11 2023 +1100
- upstream: remove incorrect check that can break enrolling a
-
- resident key (introduced in r1.40)
+ Use our own netcat for dynamic-forward test.
- OpenBSD-Commit-ID: 4cab364d518470e29e624af3d3f9ffa9c92b6f01
+ That way we can be surer about its behaviour rather than trying to
+ second-guess the behaviour of various netcat implementations.
-commit ff89b1bed80721295555bd083b173247a9c0484e
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Aug 19 04:02:46 2022 +0000
+commit 26cab41c05d7b0859d2a1ea5b6ed253d91848a80
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Sat Jan 7 14:30:43 2023 +1100
- upstream: Strictly enforce the maximum allowed SSH2 banner size in
-
- ssh-keyscan and prevent a one-byte buffer overflow. Patch from Qualys, ok
- djm@
+ Use autoconf to find openssl binary.
- OpenBSD-Commit-ID: 6ae664f9f4db6e8a0589425f74cd0bbf3aeef4e4
+ It's possible to install an OpenSSL in a path not in the system's
+ default library search path. OpenSSH can still use this (eg if you
+ specify an rpath) but the openssl binary there may not work. If one is
+ available on the system path just use that.
-commit 1b470b9036639cef4f32fb303bb35ea0b711178d
+commit 5532e010a0eeb6aa264396514f9aed7948471538
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Aug 19 15:18:09 2022 +1000
+Date: Sat Jan 7 10:34:18 2023 +1100
- Fix cygwin conditional steps.
+ Check openssl_bin path is executable before using.
-commit fd6ee741ab16714b7035d60aca924123ba28135a
+commit 5d7b16cff48598d5908db970bfdc9ff9326142c8
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Aug 19 15:12:57 2022 +1000
+Date: Fri Jan 6 23:19:07 2023 +1100
- Add a bit more debug output.
+ Set OPENSSL_BIN from OpenSSL directory.
-commit a9305c4c739f4d91a3d3a92c0b6d4949404a36c5
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Aug 12 15:08:47 2022 +1000
+commit 344a0e8240eaf08da5d46a5e3a9ecad6e4f64c35
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Fri Jan 6 08:50:33 2023 +0000
- Add Cygwin (on windows-2019) test target.
+ upstream: Save debug logs from ssh for debugging purposes.
- In addition to installing the requisite Cygwin packages, we also need to
- explicitly invoke "sh" for steps that run other scripts since the runner
- environment doesn't understand #! paths.
+ OpenBSD-Regress-ID: 109e40b06de1c006a3b8e0d8745b790b2c5870a0
-commit 5062ad48814b06162511c4f5924a33d97b6b2566
+commit e1ef172646f7f49c80807eea90225ef5e0be55a8
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Aug 19 03:06:30 2022 +0000
+Date: Fri Jan 6 08:07:39 2023 +0000
- upstream: double free() in error path; from Eusgor via GHPR333
+ upstream: regression test for ChannelTimeout
- OpenBSD-Commit-ID: 39f35e16ba878c8d02b4d01d8826d9b321be26d4
+ OpenBSD-Regress-ID: 280bfbefcfa415428ad744e43f69a8dede8ad685
-commit 5a5c580b48fc6006bdfa731fc2f6d4945c2c0e4e
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Thu Aug 18 21:36:39 2022 +1000
+commit 2393ea8daf25853459eb07a528d7577688847777
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Jan 6 07:18:18 2023 +0000
- Check for perms to run agent-getpeereid test.
+ upstream: fix typo in verbose logging
- Ubuntu 22.04 defaults to private home dirs which prevents "nobody"
- running ssh-add during the agent-getpeereid test. Check for this and
- add the necessary permissions.
+ OpenBSD-Regress-ID: 0497cdb66e003b2f50ed77291a9104fba2e017e9
-commit cd06a76b7ccc706e2bb4f1cc4aa9e9796a28a812
+commit 161a5378a3cc2e7aa3f9674cb7f4686ae6ce9586
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Jan 6 02:59:50 2023 +0000
+
+ upstream: unit tests for misc.c:ptimeout_* API
+
+ OpenBSD-Regress-ID: 01f8fb12d08e5aaadd4bd4e71f456b6588be9a94
+
+commit 018d671d78145f03d6f07ae9d64d51321da70325
+Author: tb@openbsd.org <tb@openbsd.org>
+Date: Wed Jan 4 22:48:57 2023 +0000
+
+ upstream: Copy bytes from the_banana[] rather than banana()
+
+ Fixes test failure due to segfault seen on arm64 with xonly snap.
+
+ ok djm
+
+ OpenBSD-Regress-ID: 86e2aa4bbd1dff1bc4ebb2969c0d6474485be046
+
+commit ab6bb69e251faa8b24f81b25c72ec0120f20cad4
Author: Damien Miller <djm@mindrot.org>
-Date: Wed Aug 17 16:04:16 2022 +1000
+Date: Fri Jan 6 19:13:36 2023 +1100
- on Cygwin, prefer WinHello FIDO device
+ unbreak scp on NetBSD 4.x
- If no FIDO device was explictly specified, then prefer the
- windows://hello FIDO device. An exception to this is when
- probing resident FIDO keys, in which case hardware FIDO
- devices are preferred.
+ e555d5cad5 effectively increased the default copy buffer size for SFTP
+ transfers. This caused NetBSD 4.x to hang during the "copy local file to
+ remote file in place" scp.sh regression test.
+
+ This puts back the original 32KB copy buffer size until we can properly
+ figure out why.
+
+ lots of debugging assistance from dtucker@
-commit 47f72f534ac5cc2cd3027675a3df7b00a8f77575
+commit 2d1ff2b9431393ad99ef496d5e3b9dd0d4f5ac8c
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Aug 17 06:01:57 2022 +0000
+Date: Fri Jan 6 02:47:18 2023 +0000
- upstream: add an extra flag to sk_probe() to indicate whether we're
+ upstream: Implement channel inactivity timeouts
- probing for a FIDO resident key or not. Unused here, but will make like
- easier for portable
+ This adds a sshd_config ChannelTimeouts directive that allows channels that
+ have not seen traffic in a configurable interval to be automatically closed.
+ Different timeouts may be applied to session, X11, agent and TCP forwarding
+ channels.
- OpenBSD-Commit-ID: 432c8ff70e270378df9dbceb9bdeaa5b43b5a832
+ Note: this only affects channels over an opened SSH connection and not
+ the connection itself. Most clients close the connection when their channels
+ go away, with a notable exception being ssh(1) in multiplexing mode.
+
+ ok markus dtucker
+
+ OpenBSD-Commit-ID: ae8bba3ed9d9f95ff2e2dc8dcadfa36b48e6c0b8
-commit edb0bcb3c79b16031dc87a8e57aecc3c4a3414f0
-Author: jmc@openbsd.org <jmc@openbsd.org>
-Date: Tue Aug 16 20:24:08 2022 +0000
+commit 0e34348d0bc0b1522f75d6212a53d6d1d1367980
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Jan 6 02:42:34 2023 +0000
- upstream: use .Cm for "sign"; from josiah frentsos
+ upstream: Add channel_set_xtype()
- OpenBSD-Commit-ID: 7f80a53d54857ac6ae49ea6ad93c5bd12231d1e4
+ This sets an "extended" channel type after channel creation (e.g.
+ "session:subsystem:sftp") that will be used for setting channel inactivity
+ timeouts.
+
+ ok markus dtucker
+
+ OpenBSD-Commit-ID: 42564aa92345045b4a74300528f960416a15d4ca
-commit cccb011e130cbbac538b1689d10e4a067298df8b
-Author: Corinna Vinschen <vinschen@redhat.com>
-Date: Thu Aug 11 20:19:35 2022 +0200
+commit ceedf09b2977f3a756c759a6e7eb8f8e9db86a18
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Jan 6 02:41:49 2023 +0000
- Revert "check_sk_options: add temporary WinHello workaround"
+ upstream: tweak channel ctype names
- Cygwin now comes with libfido2 1.11.0, so this workaround
- isn't required anymore.
+ These are now used by sshd_config:ChannelTimeouts to specify timeouts by
+ channel type, so force them all to use a similar format without whitespace.
- This reverts commit 242c044ab111a37aad3b0775727c36a4c5f0102c.
+ ok dtucker markus
- Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
+ OpenBSD-Commit-ID: 66834765bb4ae14f96d2bb981ac98a7dae361b65
-commit 9468cd7cf9d989dfa2ac20e2a0268ba6e93bfa5a
-Author: Corinna Vinschen <vinschen@redhat.com>
-Date: Thu Aug 11 20:18:17 2022 +0200
+commit c60438158ad4b2f83d8504257aba1be7d0b0bb4b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Jan 6 02:39:59 2023 +0000
- fido_dev_is_winhello: return 0, not "false"
+ upstream: Add channel_force_close()
- "false" is not used anywhere in OpenSSH, so return 0 like
- everywhere else.
+ This will forcibly close an open channel by simulating read/write errors,
+ draining the IO buffers and calling the detach function.
- Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
+ Previously the detach function was only ever called during channel garbage
+ collection, but there was no way to signal the user of a channel (e.g.
+ session.c) that its channel was being closed deliberately (vs. by the
+ usual state-machine logic). So this adds an extra "force" argument to the
+ channel cleanup callback to indicate this condition.
+
+ ok markus dtucker
+
+ OpenBSD-Commit-ID: 23052707a42bdc62fda2508636e624afd466324b
-commit 730a80609472ee0451c99482d75c9c41f3ebc42d
+commit d478cdc7ad6edd4b1bcd1e86fb2f23194ff33d5a
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Aug 12 05:20:28 2022 +0000
+Date: Fri Jan 6 02:38:23 2023 +0000
- upstream: sftp-server: support home-directory request
+ upstream: replace manual poll/ppoll timeout math with ptimeout API
- Add support to the sftp-server for the home-directory extension defined
- in draft-ietf-secsh-filexfer-extensions-00. This overlaps a bit with the
- existing expand-path@openssh.com, but uses a more official protocol name,
- and so is a bit more likely to be implemented by non-OpenSSH clients.
+ feedback markus / ok markus dtucker
- From Mike Frysinger, ok dtucker@
+ OpenBSD-Commit-ID: c5ec4f2d52684cdb788cd9cbc1bcf89464014be2
+
+commit 4adf3817a24efe99b06e62630577d683c7cd8065
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Jan 6 02:37:04 2023 +0000
+
+ upstream: add ptimeout API for keeping track of poll/ppoll
- OpenBSD-Commit-ID: bfc580d05cc0c817831ae7ecbac4a481c23566ab
+ timeouts; ok dtucker markus
+
+ OpenBSD-Commit-ID: 3335268ca135b3ec15a947547d7cfbb8ff929ead
-commit 5e820bf79ce3ce99ef7e98b0ab642b0a0a4f396c
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Aug 12 14:56:55 2022 +1000
+commit 8c7c69d32375d2f3ce9da0109c9bffc560842316
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Thu Jan 5 05:49:13 2023 +0000
- Replace deprecated ubuntu-18.04 runners with 22.04
+ upstream: suppress "Connection closed" message when in quiet mode
+
+ OpenBSD-Commit-ID: 8a3ab7176764da55f60bfacfeae9b82d84e3908f
-commit 87b0d9c1b789d3ff958ec45df2ac912e24461bae
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Thu Aug 11 22:48:23 2022 +1000
+commit 845ceecea2ac311b0c267f9ecbd34862e1876fc6
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Mon Jan 2 07:03:57 2023 +0000
- Add a timegm implementation from Heimdal via Samba.
+ upstream: regression test for PermitRemoteOpen
- Fixes build on (at least Solaris 10).
+ OpenBSD-Regress-ID: 8271aafbf5c21950cd5bf966f08e585cebfe630c
-commit d0c4fa58594577994921b593f10037c5282597ca
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Thu Aug 11 14:23:58 2022 +1000
+commit b3daa8dc582348d6ab8150bc1e571b7aa08c5388
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Mon Jan 2 07:03:30 2023 +0000
- Rerun tests if any .github config file changes.
+ upstream: fix bug in PermitRemoteOpen which caused it to ignore its
+
+ first argument unless it was one of the special keywords "any" or "none".
+
+ Reported by Georges Chaudy in bz3515; ok dtucker@
+
+ OpenBSD-Commit-ID: c5678a39f1ff79993d5ae3cfac5746a4ae148ea5
-commit 113fe6c77ab43769fc61e953d07cb619fd7ea54b
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Thu Aug 11 13:33:51 2022 +1000
+commit 0872663a7be0301bcc3d49acdbc9b740a3d972d4
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date: Mon Dec 26 19:16:03 2022 +0000
- Skip hostbased during Valgrind tests.
+ upstream: spelling fixes; from paul tagliamonte amendments to his
- Valgrind doesn't let ssh exec ssh-keysign (because it's setuid) so skip
- it during the Valgrind based tests.
+ diff are noted on tech
- See https://bugs.kde.org/show_bug.cgi?id=119404 for a discussion of this
- (ironically there the problematic binary was ssh(1) back when it could
- still be setuid).
+ OpenBSD-Commit-ID: d776dd03d0b882ca9c83b84f6b384f6f9bd7de4a
-commit b98a42afb69d60891eb0488935990df6ee571c4d
+commit 797da2812a71785b34890bb6eb44767a7d09cd34
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Thu Aug 11 01:57:50 2022 +0000
+Date: Fri Dec 16 07:13:22 2022 +0000
- upstream: add some tests for parse_absolute_time(), including cases
+ upstream: Mention that scp uses the SFTP protocol and remove
- where it is forced to the UTC timezone. bz3468 ok dtucker
+ reference to legacy flag. Spotted by, feedback and ok jmc@
- OpenBSD-Regress-ID: ea07ca31c2f3847a38df028ca632763ae44e8759
+ OpenBSD-Commit-ID: 9dfe04966f52e941966b46c7a2972147f95281b3
-commit ec1ddb72a146fd66d18df9cd423517453a5d8044
+commit 93f2ce8c050a7a2a628646c00b40b9b53fef93ef
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Thu Aug 11 01:56:51 2022 +0000
+Date: Fri Dec 16 06:56:47 2022 +0000
- upstream: allow certificate validity intervals, sshsig verification
+ upstream: Clear signal mask early in main(); sshd may have been
- times and authorized_keys expiry-time options to accept dates in the UTC time
- zone in addition to the default of interpreting them in the system time zone.
- YYYYMMDD and YYMMDDHHMM[SS] dates/times will be interpreted as UTC if
- suffixed with a 'Z' character.
+ started with one or more signals masked (sigprocmask(2) is not cleared
+ on fork/exec) and this could interfere with various things, e.g. the
+ login grace timer.
- Also allow certificate validity intervals to be specified in raw
- seconds-since-epoch as hex value, e.g. -V 0x1234:0x4567890. This
- is intended for use by regress tests and other tools that call
- ssh-keygen as part of a CA workflow.
+ Execution environments that fail to clear the signal mask before running
+ sshd are clearly broken, but apparently they do exist.
- bz3468 ok dtucker
+ Reported by Sreedhar Balasubramanian; ok dtucker@
- OpenBSD-Commit-ID: 454db1cdffa9fa346aea5211223a2ce0588dfe13
+ OpenBSD-Commit-ID: 77078c0b1c53c780269fc0c416f121d05e3010ae
-commit 4df246ec75751da7eb925e1880498300d8bda187
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Thu Aug 11 10:23:55 2022 +1000
+commit 4acfaabfae41badb9d334a2ee88c5c6ad041c0d5
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date: Fri Dec 16 06:52:48 2022 +0000
- Fix conditional for running hostbased tests.
+ upstream: add -X to usage();
+
+ OpenBSD-Commit-ID: 1bdc3df7de11d766587b0428318336dbffe4a9d0
-commit 2580916e48721802220c61ce9e0df1297c00bc07
-Author: Damien Miller <djm@mindrot.org>
-Date: Thu Aug 11 08:58:28 2022 +1000
+commit e555d5cad5afae7d5ef2bbc02ca591178fe16fed
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Dec 16 03:40:03 2022 +0000
- fix SANDBOX_SECCOMP_FILTER_DEBUG
+ upstream: add a -X option to both scp(1) and sftp(1) to allow
+
+ control over some SFTP protocol knobs: the copy buffer length and
+ the number of inflight requests, both of which are used during
+ upload/download.
+
+ Previously these could be controlled in sftp(1) using the -b/-R options.
+ This makes them available in both SFTP protocol clients using the same
+ option character sequence.
+
+ ok dtucker@
+
+ OpenBSD-Commit-ID: 27502bffc589776f5da1f31df8cb51abe9a15f1c
-commit fdbd5bf507fc271ff813714fab8a72ff2c6cb5ca
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Wed Aug 10 17:35:52 2022 +1000
+commit 5a7a7acab2f466dc1d7467b5d05d35268c3137aa
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date: Thu Dec 15 18:20:39 2022 +0000
- Test hostbased auth on github runners.
+ upstream: The idiomatic way of coping with signed char vs unsigned
+
+ char (which did not come from stdio read functions) in the presence of
+ ctype macros, is to always cast to (unsigned char). casting to (int)
+ for a "macro" which is documented to take int, is weird. And sadly wrong,
+ because of the sing extension risk.. same diff from florian
+
+ OpenBSD-Commit-ID: 65b9a49a68e22ff3a0ebd593f363e9f22dd73fea
-commit 7e2f51940ba48a1c0fae1107801ea643fa83c971
+commit b0b58222c7cc62efd8212c4fb65a545f58ebb22d
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Wed Aug 10 17:25:24 2022 +1000
+Date: Mon Dec 19 18:49:51 2022 +1100
- Rename our getentropy to prevent possible loops.
+ Simply handling of SSH_CONNECTION PAM env var.
- Since arc4random seeds from getentropy, and we use OpenSSL for that
- if enabled, there's the possibility that if we build on a system that
- does not have getentropy then run on a system that does have it, then
- OpenSSL could end up calling our getentropy and getting stuck in a loop.
- Pointed out by deraadt@, ok djm@
+ Prompted by bz#3508: there's no need to cache the value of
+ sshpam_conninfo so remove the global. While there, add check of
+ return value from pam_putenv. ok djm@
-commit 7a01f61be8d0aca0e975e7417f26371495fe7674
+commit ed8444572ae684fdb892f97bae342c6cb6456f04
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Aug 8 12:17:04 2022 +1000
+Date: Mon Dec 19 18:42:34 2022 +1100
- Actually put HAVE_STDINT_H around the stdint.h.
+ Add tests for LibreSSL 3.7.0 and OpenSSL 1.1.1s.
-commit 73541f29f0b50480da6c20dceb7a7191bd8ea7d3
+commit abb9a8aaddfcacbd12641f6e4f203da0fa85a287
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Aug 8 10:30:34 2022 +1000
+Date: Sun Dec 18 21:36:25 2022 +1100
- Give unused param a name.
-
- Fixes builds on platforms that do have fido2 but don't have
- fido_dev_is_winhello.
-
-commit 2a108c0ea960381bd9b14ee0d84e818a23df4482
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Aug 5 05:01:40 2022 +0000
-
- upstream: don't prompt for FIDO passphrase before attempting to enroll
-
- the credential, just let the enroll operating fail and we'll attempt to get a
- PIN anyway. Might avoid some unneccessary PIN prompts.
-
- Part of GHPR#302 from Corinna Vinschen; ok dtucker@
-
- OpenBSD-Commit-ID: bd5342ffc353ee37d39617906867c305564d1ce2
+ Use sudo when resetting perms on directories.
-commit 2886975c0ad9244e60dc5e4be34fde3aa573a4b5
-Author: Corinna Vinschen <vinschen@redhat.com>
-Date: Fri Feb 11 14:33:41 2022 +0100
+commit 2f5664c5908d84697cbe91302d5d5c4d83cb2121
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Sun Dec 18 21:19:33 2022 +1100
- sk_sign: set FIDO2 uv attribute explicitely for WinHello
-
- WinHello via libfido2 performs user verification by default.
- However, if we stick to that, there's no way to differentiate
- between keys created with or without "-O verify-required".
- Set FIDO2 uv attribute explicitely to FIDO_OPT_FALSE, then check
- if user verification has been requested.
+ Set group perms on regress dir.
- Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
+ This ensures that the tests don't fail due to StrictMode checks.
-commit 242c044ab111a37aad3b0775727c36a4c5f0102c
-Author: Corinna Vinschen <vinschen@redhat.com>
-Date: Tue Feb 15 11:28:08 2022 +0100
+commit 137196300fc1540affadde880210f02ba6cb4abf
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Sun Dec 18 21:13:42 2022 +1100
- check_sk_options: add temporary WinHello workaround
-
- Up to libfido 1.10.0, WinHello advertises "clientPin" rather
- than "uv" capability. This is fixed in 1.11.0. For the time
- being, workaround it here.
-
- Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
+ Fetch regress logs from obj dir.
-commit 78774c08cc4b4997382975b0f414a86e06b6780c
-Author: Corinna Vinschen <vinschen@redhat.com>
-Date: Thu Feb 10 18:19:29 2022 +0100
+commit 5f93c4836527d9fda05de8944a1c7b4a205080c7
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Tue Dec 13 20:59:54 2022 +1100
- compat code for fido_dev_is_winhello()
-
- Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
+ obsdsnap test VMs runs-on libvirt too.
-commit 3d3a932a019aedfb891e0779bb4990cd5008a390
+commit 8386886fb1ab7fda73069fb0db1dbe0e5a52f758
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Aug 5 13:12:27 2022 +1000
+Date: Tue Dec 13 20:55:37 2022 +1100
- Factor out getrnd() and rename to getentropy().
-
- Factor out the arc4random seeding into its own file and change the
- interface to match getentropy. Use native getentropy if available.
- This will make it easier to resync OpenBSD changes to arc4random.
- Prompted by bz#3467, ok djm@.
+ Run upstream obsdsnap tests on ephemeral runners.
-commit 9385d277b787403be9dfcb229cf372202496d2f3
+commit b6e01459b55ece85d7f296b2bc719d1841e1009e
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Thu Aug 4 18:55:48 2022 +1000
+Date: Tue Dec 13 20:48:56 2022 +1100
- Include CHANNEL and FIDO2 libs in configure output
+ Move obsdsnap test VMs to ephemeral runners.
-commit 141535b904b6fba01724444f38193a8599201f82
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Aug 1 11:09:26 2022 +0000
+commit ea6fdf9a1aa71a411f7db218a986392c4fb55693
+Author: Damien Miller <djm@mindrot.org>
+Date: Fri Dec 9 18:00:21 2022 +1100
- upstream: avoid double-free in error path introduced in r1.70; report
-
- and fix based on GHPR#332 by v-rzh ok dtucker@
+ use calloc for allocating arc4random structs
- OpenBSD-Commit-ID: 3d21aa127b1f37cfc5bdc21461db369a663a951f
+ ok dtucker
-commit dba7099ffcba3ca07b3946f017ba6a4c3158d9b1
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Wed Jul 27 18:40:12 2022 +1000
+commit 4403b62f5548e91389cb3339d26a9d0c4bb07b34
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Fri Dec 9 00:22:29 2022 +0000
- Remove deprecated MacOS 10.15 runners.
+ upstream: Warn if no host keys for hostbased auth can be loaded.
+
+ OpenBSD-Commit-ID: 2a0a13132000cf8d3593133c1b49768aa3c95977
-commit 722a56439aa5972c830e4a9a724cf52aff4a950a
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Wed Jul 27 18:31:14 2022 +1000
+commit a6183e25e3f1842e21999fe88bc40bb99b121dc3
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Fri Dec 9 00:17:40 2022 +0000
- Move stale-configure check as early as possible.
+ upstream: Add server debugging for hostbased auth.
- We added a check in Makefile to catch the case where configure needs to
- be rebuilt, however this did not happen until a build was attempted in
- which case all of the work done by configure was wasted. Move this check
- to the start of configure to catch it as early as possible. ok djm@
+ auth_debug_add queues messages about the auth process which is sent to
+ the client after successful authentication. This also sends those to
+ the server debug log to aid in debugging. From bz#3507, ok djm@
+
+ OpenBSD-Commit-ID: 46ff67518cccf9caf47e06393e2a121ee5aa258a
-commit 099d6b56288b421ba38531d26dc1bd6bb685e311
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jul 22 10:47:19 2022 +1000
+commit b85c3581c16aaf6e83b9a797c80705a56b1f312e
+Author: cheloha@openbsd.org <cheloha@openbsd.org>
+Date: Sun Dec 4 23:50:49 2022 +0000
- Move libcrypto into CHANNELLIBS.
+ upstream: remove '?' from getopt(3) loops
- This will result in sftp, sftp-server and scp no longer being linked
- against libcrypto. ok djm@
+ userspace: remove vestigial '?' cases from top-level getopt(3) loops
+
+ getopt(3) returns '?' when it encounters a flag not present in the in
+ the optstring or if a flag is missing its option argument. We can
+ handle this case with the "default" failure case with no loss of
+ legibility. Hence, remove all the redundant "case '?':" lines.
+
+ Prompted by dlg@. With help from dlg@ and millert@.
+
+ Link: https://marc.info/?l=openbsd-tech&m=167011979726449&w=2
+
+ ok naddy@ millert@ dlg@
+
+ OpenBSD-Commit-ID: b2f89346538ce4f5b33ab8011a23e0626a67e66e
-commit 1bdf86725b77733bb5f17c54888b88a10b2f6538
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jul 22 10:45:47 2022 +1000
+commit 9a067e8d28a2249fd73f004961e30c113ee85e5d
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Wed Dec 7 11:45:43 2022 +0000
- Remove seed_rng calls from scp, sftp, sftp-server.
+ upstream: Fix comment typo.
- These binaries don't use OpenSSL's random functions. The next step
- will be to stop linking them against libcrypto. ok djm@
+ OpenBSD-Regress-ID: 3b04faced6511bb5e74648c6a4ef4bf2c4decf03
-commit d73f77b8cb9b422f1ac4facee7890aa10ff2bc21
+commit ce3c3e78ce45d68a82c7c8dc89895f297a67f225
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jul 22 09:51:51 2022 +1000
+Date: Wed Dec 7 18:58:25 2022 +1100
- Group libcrypto and PRNGD checks together.
-
- They're related more than the libcrypt or libiaf checks which are
- currently between them. ok djm@
+ Add SANDBOX_DEBUG to the kitchensink test build.
-commit f117e372b3f42f2fbdb0a578d063b2609ab58e1f
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jul 22 09:24:45 2022 +1000
+commit bc234605fa3eb10f56bf0d74c8ecb0d91ada9d05
+Author: Damien Miller <djm@mindrot.org>
+Date: Wed Dec 7 18:38:25 2022 +1100
- Do not link scp, sftp and sftp-server w/ zlib.
+ disable SANDBOX_SECCOMP_FILTER_DEBUG
- Some of our binaries (eg sftp, sftp-server, scp) do not interact with
- the channels code and thus do use libraries such as zlib and libcrypto
- although they are linked with them. This adds a CHANNELLIBS and starts
- by moving zlib into it, which means the aformentioned binaries are no
- longer linked against zlib. ok djm@
+ It was mistakenly enabled in 2580916e4872
+
+ Reported by Peter sec-openssh-com.22.fichtner AT 0sg.net
-commit 800c2483e68db38bd1566ff69677124be974aceb
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Jul 25 21:49:04 2022 +1000
+commit b087c5cfa011b27992e01589314fec830266f99d
+Author: Rose <83477269+AtariDreams@users.noreply.github.com>
+Date: Tue Nov 29 15:12:54 2022 -0500
- Remove workarounds for OpenSSL missing AES-CTR.
+ Update autotools
- We have some compatibility hacks that were added to support OpenSSL
- versions that do not support AES CTR mode. Since that time, however,
- the minimum OpenSSL version that we support has moved to 1.0.1 which
- *does* have CTR, so this is no longer needed. ok djm@
+ Regenerate config files using latest autotools
-commit b7c56b65c12f51fe0dbae798d19c8f58224a5d95
+commit d63f5494978a185c7421d492b9c2f6f05bb54138
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Jul 25 21:43:00 2022 +1000
+Date: Tue Dec 6 12:22:36 2022 +1100
- Remove workarounds for OpenSSL missing AES-GCM.
-
- We have some compatibility hacks that were added to support OpenSSL
- versions that do not support AES GCM mode. Since that time, however,
- the minimum OpenSSL version that we support has moved to 1.0.1 which
- *does* have GCM, so this is no longer needed. ok djm@
+ Fix typo in comment. Spotted by tim@
-commit 5a4a9f7a968fbf92cc1eac519c65638e79ae9f1f
+commit 73dcca12115aa12ed0d123b914d473c384e52651
Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Mon Jul 25 07:12:45 2022 +0000
+Date: Sun Dec 4 11:03:11 2022 +0000
- upstream: Restore missing "!" in TEST_SSH_ELAPSED_TIMES test.
+ upstream: Remove duplicate includes.
- OpenBSD-Regress-ID: 38783f9676ec348c5a792caecee9a16e354b37b0
+ Patch from AtariDreams via github PR#364.
+
+ OpenBSD-Commit-ID: b9186638a05cb8b56ef7c0de521922b6723644ea
-commit 0ff886be132299386cc29d87c2aa16ff68a1aa08
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Sun Jul 24 23:29:10 2022 +0000
+commit 3cec15543010bc8d6997d896b1717a650afb7e92
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Dec 2 04:40:27 2022 +0000
- upstream: Test TEST_SSH_ELAPSED_TIMES for empty string not
+ upstream: make struct sshbuf private
- executable. No-op on most platforms but should prevent warnings in -portable
- on systems that don't have 'date %s'.
+ and remove an unused field; ok dtucker
- OpenBSD-Regress-ID: e39d79867b8065e33d0c5926fa1a31f85659d2a4
+ OpenBSD-Commit-ID: c7a3d77c0b8c153d463398606a8d57569186a0c3
-commit f69319ad8ad1dd50f90bbcf5912e11cc8ed3e037
+commit 5796bf8ca9535f9fa7d01829a540d2550e05c860
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Jul 23 14:38:22 2022 +1000
+Date: Fri Dec 2 11:43:36 2022 +1100
- Convert "have_prog" function into "which".
+ Restore ssh-agent permissions on exit.
- "which" and its behaviour is not standardized, so convert the existing
- have_prog function into "which" so we can rely on it being available
- and what its semantics are. Add a have_prog wrapper that maintains the
- existing behaviour.
+ ...enough that subsequent builds can overwrite ssh-agent if necessary.
-commit ea7ecc2c3ae39fdf5c6ad97b7bc0b47a98847f43
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Jul 23 14:36:38 2022 +1000
+commit ccf5a13868cbb4659107458cac1e017c98abcbda
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Thu Dec 1 02:22:13 2022 +0000
- Skip scp3 test if there's no scp on remote path.
+ upstream: Clean up ssh-add and ssh-agent logs.
- scp -3 ends up using the scp that's in the remote path and will fail if
- one is not available. Based on a patch from rapier at psc.edu.
+ OpenBSD-Regress-ID: 9eda8e4c3714d7f943ab2e73ed58a233bd29cd2c
-commit c46f6fed419167c1671e4227459e108036c760f8
-Author: Damien Miller <djm@mindrot.org>
-Date: Wed Jul 20 13:39:14 2022 +1000
+commit 7a8b40cf6a5eda80173140cc6750a6db8412fa87
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Thu Dec 1 02:19:29 2022 +0000
- crank SSH_SK_VERSION_MAJOR in sk-dummy.so
+ upstream: Log output of ssh-agent and ssh-add
+
+ This should make debugging easier.
+
+ OpenBSD-Regress-ID: 5974b02651f428d7e1079b41304c498ca7e306c8
-commit f208e3b9ffb5ee76cf9c95df7ff967adc7f51c7d
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Jul 20 03:33:22 2022 +0000
+commit 4a1805d532616233dd6072e5cd273b96dd3062e6
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Tue Nov 29 22:41:14 2022 +0000
- upstream: ssh-keygen: fix touch prompt, pin retries;
-
- part of GHPR329 from Pedro Martelletto
+ upstream: Add void to client_repledge args to fix compiler warning. ok djm@
- OpenBSD-Commit-ID: 75d1005bd2ef8f29fa834c90d2684e73556fffe8
+ OpenBSD-Commit-ID: 7e964a641ce4a0a0a11f047953b29929d7a4b866
-commit 8638a2ce7e90c8a51d9af3143404282126c524f8
+commit 815c4704930aa449edf6e812e99d69e9ffd31f01
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Jul 20 03:31:42 2022 +0000
+Date: Mon Nov 28 01:38:22 2022 +0000
- upstream: sk-usbhid: preserve error code returned by key_lookup()
+ upstream: tighten pledge(2) after session establishment
- it conveys useful information, such as the supplied pin being wrong.
-
- Part of GHPR329 from Pedro Martelletto
+ feedback, ok & testing in snaps deraadt@
- OpenBSD-Commit-ID: c0647eb9290f793add363d81378439b273756c1b
+ OpenBSD-Commit-ID: aecf4d49d28586dfbcc74328d9333398fef9eb58
-commit 9ab929ca2d820520327b41929372bcb9e261534c
+commit f7cebbbf407d772ed71403d314343766782fe540
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Jul 20 03:29:14 2022 +0000
+Date: Mon Nov 28 01:37:36 2022 +0000
- upstream: when enrolling a resident key on a security token, check
-
- if a credential with matching application and user ID strings already exists.
- if so, prompt the user for confirmation before overwriting the credential.
+ upstream: New EnableEscapeCommandline ssh_config(5) option
- patch from Pedro Martelletto via GHPR329
+ This option (default "no") controls whether the ~C escape is available.
+ Turning it off by default means we will soon be able to use a stricter
+ default pledge(2) in the client.
- NB. cranks SSH_SK_VERSION_MAJOR, so any third-party FIDO middleware
- implementations will need to adjust
+ feedback deraadt@ dtucker@; tested in snaps for a while
- OpenBSD-Commit-ID: e45e9f1bf2b2f32d9850669e7a8dbd64acc5fca4
+ OpenBSD-Commit-ID: 7e277595d60acb8263118dcb66554472257b387a
-commit 5bcfc788b38d5b64e4c347bdc04bd9a01bbc36da
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Jul 20 03:13:04 2022 +0000
+commit d323f7ecf52e3d4ec1f4939bf31693e02f891dca
+Author: mbuhl@openbsd.org <mbuhl@openbsd.org>
+Date: Fri Nov 18 19:47:40 2022 +0000
- upstream: pull passphrase reading and confirmation into a separate
+ upstream: In channel_request_remote_forwarding the parameters for
- function so it can be used for FIDO2 PINs; no functional change
+ permission_set_add are leaked as they are also duplicated in the call. Found
+ by CodeChecker. ok djm
- OpenBSD-Commit-ID: bf34f76b8283cc1d3f54633e0d4f13613d87bb2f
+ OpenBSD-Commit-ID: 4aef50fa9be7c0b138188814c8fe3dccc196f61e
-commit eb679e2959bdb15454eb94751930eb4c9110da94
+commit 62cc33e6eed847aafdc29e34aa69e9bd82a0ee16
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jul 15 21:31:48 2022 +1000
+Date: Wed Nov 30 11:23:11 2022 +1100
- Move vmshutdown to first step.
+ Use -fzero-call-used-regs=used on clang 15.
- If a previous run on a physical runner has failed to clean up, the next
- run will fail because it'll try to check out the code to a broken
- directory mount. Make cleanup the first step.
+ clang 15 seems to have a problem with -fzero-call-used-reg=all which
+ causes spurious "incorrect signature" failures with ED25519. On those
+ versions, use -fzero-call-used-regs=used instead. (We may add exceptions
+ later if specific versions prove to be OK). Also move the GCC version
+ check to match.
+
+ Initial investigation by Daniel Pouzzner (douzzer at mega nu), workaround
+ suggested by Bill Wendling (morbo at google com). bz#3475, ok djm@
-commit 46b91b70ff3cb9c147e2875ef5dc609fd64c0c96
+commit f84b9cffd52c9c5c359a54a1929f9948e803ab1d
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jul 15 20:25:27 2022 +1000
+Date: Mon Nov 28 21:09:28 2022 +1100
- Rename bbone test target to ARM.
+ Skip unit tests on slow riscv64 hardware.
-commit 751d22cdeffed9fe921db78eedc32a29f9e80510
+commit 9f2747e0bed3faca92679eae69aef10c95dc82f5
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jul 15 13:37:29 2022 +1000
+Date: Sun Nov 27 15:26:22 2022 +1100
- Add AUDIT_ARCH_PPC to supported seccomp arches.
+ Rework how selfhosted tests interact with runners.
- Patch from dries.deschout at dodeco.eu.
+ Previously there was one runner per test target (mostly VMs). This had
+ a few limitations:
+ - multiple tests that ran on the same target (eg multiple build
+ configs) were serialized on availability or that runner.
+ - it needed manual balancing of VMs over host machines.
+
+ To address this, make VMs that use ephemeral disks (ie most of them)
+ all use a pool of runners with the "libvirt" label. This requires that
+ we distinguish between "host" and "target" for those. Native runners
+ and VMs with persistent disks (eg the constantly-updated snapshot ones)
+ specify the same host and target.
+
+ This should improve test throughput.
-commit a061792a6e8d235fc40a9b5d4c22a1762bb75a7b
+commit d664ddaec87bdc7385be8ef7f1337793e1679d48
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Thu Jul 14 19:20:24 2022 +1000
+Date: Sun Nov 27 12:19:37 2022 +1100
- Remove unintended changes.
+ Run vmstartup from temp dir.
- I inadvertently included a couple of local changes with the OpenSSL
- 3.0.4 change. Revert, anything that should be there will be committed
- separately.
+ This will allow us to create ephemeral disk images per-runner.
-commit 527cb43fa1b4e55df661feabbac51b8e608b6519
+commit 0fa16e952b1fc1c4cf65e3dd138b0e87003e2e45
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Thu Jul 14 11:22:08 2022 +1000
+Date: Sun Nov 27 12:14:00 2022 +1100
- Return ERANGE from getcwd() if buffer size is 1.
-
- If getcwd() is supplied a buffer size of exactly 1 and a path of "/", it
- could result in a nul byte being written out of array bounds. POSIX says
- it should return ERANGE if the path will not fit in the available buffer
- (with terminating nul). 1 byte cannot fit any possible path with its nul,
- so immediately return ERANGE in that case.
+ Make "config" in matrix singular and pass in env.
- OpenSSH never uses getcwd() with this buffer size, and all current
- (and even quite old) platforms that we are currently known to work
- on have a native getcwd() so this code is not used on those anyway.
- Reported by Qualys, ok djm@
+ This will allow the startup scripts to adapt their behaviour based on
+ the type and config.
-commit 36857fefd8849c4b0e877cfd9d1eb22f79b76650
+commit e8857043af54809187be1e8b06749db61112899f
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Thu Jul 14 10:02:35 2022 +1000
+Date: Sun Nov 27 11:42:22 2022 +1100
- Split README.platform into its own line.
-
- README.platform has general platform-specific information, having it
- following text about FIDO2 on the same line could imply that it only
- has information about FIDO2.
+ Add "libvirt" label to dfly30.
-commit 00a496c6c14f2d41f2a9365714d494dd5f3aac9f
+commit 9775473d84902dc37753686cd10ae71fbe67efda
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Thu Jul 14 09:56:01 2022 +1000
+Date: Sun Nov 27 09:28:20 2022 +1100
- Clarify README.md text.
+ Rename "os" in matrix to "target".
- Clarify the text about the implications of building without OpenSSL, and
- prefix the "configure --help" example command with a "./" so it's likely
- to work as-is in more shells. From bz#3461.
+ This is in preparation to distinguish this from the host that the runner
+ runs on in case where they are separate (eg VMs).
-commit f40b52f21fbc52eb513279168a49d3285c65256c
+commit 04fd00ceff39f4544ced6f5342060abe584835d0
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Jul 12 19:48:44 2022 +1000
+Date: Sun Nov 27 09:23:04 2022 +1100
- Remove special casing of crypt().
+ Remove unused self-hosted test targets.
+
+commit c9d9fcad2a11c1cd1550a541f44091d65f0b5584
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Sun Nov 27 09:16:15 2022 +1100
+
+ Remove explicit "default" test config argument.
- Configure goes to some lengths to pick crypt() from either libcrypt
- or OpenSSL's libcrypto because they can more or less featureful (eg
- supporting md5-style passwords).
-
- OpenSSL removed its crypt() interface in 2002:
- https://github.com/openssl/openssl/commit/69deec58 so these hijinks
- should no longer be necessary. This also only links sshd with libcrypt
- which is the only thing that needs it. ok djm@
-
-commit 76f4e48631d7b09fb243b47d7b393d100d3741b7
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Wed Jul 13 13:17:47 2022 +1000
-
- Only refuse to use OpenSSL 3.0.4 on x86_64.
-
- The potential RCE only impacts x86_64, so only refuse to use it if we're
- targetting a potentially impacted architecture. ok djm@
+ Not specifying the test config implicitly selects default args.
-commit e75bbc1d88491fa85e61b2cc8783d4bbd00cd131
+commit 15a01cf15f396f87c6d221c5a6af98331c818962
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Jul 12 14:37:15 2022 +1000
+Date: Wed Nov 23 13:18:54 2022 +1100
- Capture stderr output from configure.
+ Add fallback for old platforms w/out MAP_ANON.
-commit d9eaea4bea6271bcee6a2b9428f1271faf2d033b
+commit 6b9bbbfe8b26db6e9a30a7e08c223e85421aed98
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Jul 12 12:54:49 2022 +1000
+Date: Wed Nov 23 13:09:11 2022 +1100
- Refuse to use OpenSSL 3.0.4 due to potential RCE.
+ If we haven't found it yet, recheck for sys/stat.h.
- OpenSSL has a potential RCE in its RSA implementation (CVE-2022-2274)
- so refuse to use that specific version.
+ On some very old platforms, sys/stat.h needs sys/types.h, however
+ autoconf 2.71's AC_CHECK_INCLUDES_DEFAULT checks for them in the
+ opposite order, which in combination with modern autoconf's
+ "present but cannot be compiled" behaviour causes it to not be
+ detected.
-commit fb2f3a61bf3d28fff285524535f7ffcd177c9235
+commit 8926956f22639132a9f2433fcd25224e01b900f5
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Jul 12 12:54:24 2022 +1000
+Date: Fri Nov 11 11:25:37 2022 +1100
- Move unset to before we set anything.
+ Add dfly62 test target.
-commit c483a5c0fb8e8b8915fad85c5f6113386a4341ca
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Wed Jul 6 11:52:54 2022 +1000
+commit 650de7ecd3567b5a5dbf16dd1eb598bd8c20bca8
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Thu Nov 10 23:03:10 2022 +0000
- Test against openssl-3.0.5.
+ upstream: Handle dynamic remote port forwarding in escape commandline's
+
+ -R processing. bz#3499, ok djm@
+
+ OpenBSD-Commit-ID: 194ee4cfe7ed0e2b8ad0727f493c798a50454208
-commit 669a56bcfe73f8b985f2bba476ba834d55253acf
+commit 5372db7e7985ba2c00f20fdff8942145ca99e033
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Jul 5 18:35:53 2022 +1000
+Date: Thu Nov 10 12:44:51 2022 +1100
- Update sanitizer test targets:
+ Remove seed passing over reexec.
- - remove clang-sanitize-memory for now. It takes so long that the test
- times out.
- - add gcc sanitize-address and sanitize-undefined test targets.
+ This was added for the benefit of platforms using ssh-rand-helper to
+ prevent a delay on each connection as sshd reseeded itself.
+
+ ssh-random-helper is long gone, and since the re-exec happens before the
+ chroot the re-execed sshd can reseed itself normally. ok djm@
-commit 48cc68b69118b3ce8d07fd4f82e00d58667d5379
+commit ca98d3f8c64cfc51af81e1b01c36a919d5947ec2
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Jul 5 16:23:28 2022 +1000
+Date: Wed Nov 9 20:59:20 2022 +1100
- Add GCC address sanitizer build/test.
+ Skip reexec test on OpenSSL 1.1.1 specifically.
+
+ OpenSSL 1.1.1 has a bug in its RNG that breaks reexec fallback, so skip
+ that test. See bz#3483 for details.
-commit 55c60bdd39b82457e92efa77da8d16cfa6a49391
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Jul 5 12:02:33 2022 +1000
+commit 5ec4ebc2548e5f7f1b55b2a5cef5b67bdca8146f
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Wed Nov 9 09:04:12 2022 +0000
- Move sanitizer logs into regress for collection.
+ upstream: Fix typo in fatal error message.
+
+ Patch from vapier at chromium.org.
+
+ OpenBSD-Commit-ID: 8a0c164a6a25eef0eedfc30df95bfa27644e35cf
-commit 35ef2b3b6ef198f8574904a45780487ec2f17858
+commit e6abafe9a6d809422d3432b95b3f9747b0acaa71
Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Mon Jul 4 09:10:31 2022 +0000
+Date: Wed Nov 9 09:01:52 2022 +0000
- upstream: Add TEST_REGRESS_CACHE_DIR.
+ upstream: Remove errant colon and simplify format
- If set, it is used to cache regress test names that have succeeded and
- skip those on a re-run.
+ string in error messages. Patch from vapier at chromium.org.
- OpenBSD-Regress-ID: a7570dd29a58df59f2cca647c3c2ec989b49f247
+ OpenBSD-Commit-ID: fc28466ebc7b74e0072331947a89bdd239c160d3
-commit 7394ed80c4de8b228a43c8956cf2fa1b9c6b2622
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sun Jul 3 21:46:44 2022 +1000
+commit db2027a687516f87c3fb141e87154bb3d8a7807c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Nov 9 01:37:44 2022 +0000
- Add clang sanitizer tests.
+ upstream: rename client_global_hostkeys_private_confirm() to
+
+ client_global_hostkeys_prove_confirm(), as it handles the
+ "hostkeys-prove00@openssh.com" message; no functional change
+
+ OpenBSD-Commit-ID: 31e09bd3cca6eed26855b88fb8beed18e9bd026d
-commit bfce0e66b6017a9bfab450b9dc7d4b16f90de817
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sun Jul 3 18:14:09 2022 +1000
+commit 1c2be7c2004cf1abcd172fee9fe3eab57cd4c426
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Nov 9 00:15:59 2022 +0000
- Skip all rlimit tests when sandboxing disabled.
+ upstream: typo in comment
- The rlimit tests can hang when being run with some compiler sanitizers
- so skip all of them if sandbox=no.
+ OpenBSD-Commit-ID: 39c58f41e0f32d1ff31731fa6f5bbbc3ad25084a
-commit 6208d611520f9ea94d5369f9da404b709930029d
+commit cf1a9852d7fc93e4abc4168aed09529a57427cdc
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sun Jul 3 17:54:49 2022 +1000
+Date: Wed Nov 9 09:23:47 2022 +1100
- Move checks for pollfd.fd and nfds_t.
+ Defer seed_rng until after closefrom call.
- Move the checks for struct pollfd.fd and nfds_t to before the sandboxing
- checks. This groups all the sandbox checks together so we can skip them
- all when sandboxing is disabled.
+ seed_rng will initialize OpenSSL, and some engine providers (eg Intel's
+ QAT) will open descriptors for their own use. bz#3483, patch from
+ joel.d.schuetze at intel.com, ok djm@
-commit 322964f8f2e9c321e77ebae1e4d2cd0ccc5c5a0b
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jul 1 05:08:23 2022 +0000
+commit dffa64480163fbf76af7e4fb62c26bb0dd6642aa
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Wed Nov 9 08:27:47 2022 +1100
- upstream: Remove leftover line.
+ Fix comment text. From emaste at freebsd.org.
+
+commit d9df5689c29823ab830ec4f54c83c6cc3c0077ad
+Author: Pierre Ossman <ossman@cendio.se>
+Date: Wed Jul 6 13:52:10 2022 +0200
+
+ Avoid assuming layout of fd_set
- Remove extra line leftover from merge conflict. ok djm@
+ POSIX doesn't specify the internal layout of the fd_set object, so let's
+ not assume it is just a bit mask. This increases compatibility with
+ systems that have a different layout.
- OpenBSD-Commit-ID: 460e2290875d7ae64971a7e669c244b1d1c0ae2e
+ The assumption is also worthless as we already refuse to use file
+ descriptors over FD_SETSIZE anyway. Meaning that the default size of
+ fd_set is quite sufficient.
-commit 7ec81daad0e03a64e8d91c5590960c48c1a899a3
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jul 1 04:45:50 2022 +0000
+commit 419aa8a312e8d8f491933ca3d5933e602cb05aae
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Tue Nov 8 12:42:52 2022 +1100
- upstream: use consistent field names (s/char/byte)
+ Shutdown any VM before trying to check out repo.
- in format description
+ In the case where the previous run did not clean up, the checkout will
+ fail as it'll leave a stale mount.
+
+commit a32c07cbb78f65d8527642b96474a83b413f8108
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Tue Nov 8 11:33:25 2022 +1100
+
+ Run vm startup and shutdown from runner temp dir.
- OpenBSD-Commit-ID: 3de33572733ee7fcfd7db33d37db23d2280254f0
+ Should work even if the github workspace dir is on a stale sshfs mount.
-commit 32e82a392d9f263485effdd606ff5862d289a4a0
+commit 2b40a7dfcdb8e616155b9504145aa52b271455aa
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jul 1 13:55:19 2022 +1000
+Date: Tue Nov 8 11:03:31 2022 +1100
- Skip select+rlimit check if sandboxing is disabled
+ Add valrind-5 test here too.
+
+commit 2ea03d1f6d0a05ee2b63ed2dc0f2d54f1e4655a1
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Tue Nov 8 09:21:10 2022 +1100
+
+ Update checkout and upload actions.
- It's not needed in that case, and the test can fail when being built
- with some compiler memory sanitizer flags. bz#3441
+ Update actions/checkout and actions/upload-artifact to main branch for
+ compatibility with node.js v16.
-commit 4be7184ebe2a2ccef175983517a35ee06766e1b4
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jul 1 03:52:57 2022 +0000
+commit 4e316ff0f18a118232bb9ac6512ee62773a9e8ea
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Tue Nov 8 09:17:04 2022 +1100
- upstream: bump up loglevel from debug to info when unable to open
+ Split out rekey test since it runs the longest.
+
+commit 21625a6424258a92a96a3bb73ae6aabc5ed8a6b4
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Mon Nov 7 10:09:28 2022 +0000
+
+ upstream: The IdentityFile option in ssh_config can also be used to
- authorized keys/principals file for errno != ENOENT; bz2042 ok dtucker
+ specify a public key file, as documented in ssh.1 for the -i option. Document
+ this also for IdentityFile in ssh_config.5, for documentation completeness.
+ From laalsaas at systemli.org via portable github PR#352, ok jmc@ djm@
- OpenBSD-Commit-ID: e79aa550d91ade6a80f081bda689da24c086d66b
+ OpenBSD-Commit-ID: 2f943be9f96e60ef81a9a4faa25b009999f9883b
-commit 6c31ba10e97b6953c4f325f526f3e846dfea647a
+commit 747691604d3325ed2b62bad85b6fd8563ad32f6c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jul 1 03:39:44 2022 +0000
+Date: Mon Nov 7 10:05:38 2022 +0000
- upstream: Don't leak the strings allocated by order_hostkeyalgs()
-
- and list_hostkey_types() that are passed to compat_pkalg_proposal(). Part of
- github PR#324 from ZoltanFridrich, ok djm@
+ upstream: Remove some set but otherwise unused variables, spotted
- This is a roll-forward of the previous rollback now that the required
- changes in compat.c have been done.
+ in -portable by clang 16's -Wunused-but-set-variable. ok djm@
- OpenBSD-Commit-ID: c7cd93730b3b9f53cdad3ae32462922834ef73eb
+ OpenBSD-Commit-ID: 3d943ddf2369b38fbf89f5f19728e7dc1daf3982
-commit 486c4dc3b83b4b67d663fb0fa62bc24138ec3946
+commit 1d78d25653805aefc7a8dd9d86cd7359ada3823c
Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jul 1 03:35:45 2022 +0000
+Date: Mon Nov 7 10:02:59 2022 +0000
- upstream: Always return allocated strings from the kex filtering so
+ upstream: Check for and disallow MaxStartups values less than or
- that we can free them later. Fix one leak in compat_kex_proposal. Based on
- github PR#324 from ZoltanFridrich with some simplications by me. ok djm@
+ equal to zero during config parsing, rather than faling later at runtime.
+ bz#3489, ok djm@
- OpenBSD-Commit-ID: 9171616da3307612d0ede086fd511142f91246e4
+ OpenBSD-Commit-ID: d79c2b7a8601eb9be493629a91245d761154308b
-commit 96faa0de6c673a2ce84736eba37fc9fb723d9e5c
+commit a00f59a645072e5f5a8d207af15916a7b23e2642
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jul 1 00:36:30 2022 +0000
+Date: Mon Nov 7 04:04:40 2022 +0000
- upstream: ignore SIGPIPE earlier in main(), specifically before
+ upstream: fix parsing of hex cert expiry time; was checking whether the
- muxclient() which performs operations that could cause one; Reported by Noam
- Lewis via bz3454, ok dtucker@
+ start time began with "0x", not the expiry time.
- OpenBSD-Commit-ID: 63d8e13276869eebac6d7a05d5a96307f9026e47
+ from Ed Maste
+
+ OpenBSD-Commit-ID: 6269242c3e1a130b47c92cfca4d661df15f05739
-commit 33efac790f6b09d54894ba6c3e17dfb08b6fc7e1
-Author: jmc@openbsd.org <jmc@openbsd.org>
-Date: Tue Jun 28 06:09:14 2022 +0000
+commit f58acaf8c7315483f4ac87d46a1aa2142a713cd8
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Mon Nov 7 15:10:59 2022 +1100
- upstream: reflect the update to -D arg name in usage();
-
- OpenBSD-Commit-ID: abdcde4f92b1ef094ae44210ee99d3b0155aad9c
+ Fix merge conflict.
-commit c71a1442d02f0a3586109dfe2cb366de36dee08e
+commit 162e5741020a8d996c0c12b988b118e71ed728e6
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Wed Jun 29 18:28:47 2022 +1000
+Date: Mon Nov 7 15:04:33 2022 +1100
- Update OpenSSL tests to the most recent releases.
+ Branch-specific links for master status badges.
-commit 2a822f29300b2de7335fbff65f0b187a0c582304
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Jun 27 21:41:55 2022 +0000
+commit e4b7c12ab24579312aa3ed38ce7041a439ec2d56
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Mon Nov 7 14:46:38 2022 +1100
- upstream: allow arguments to sftp -D option, e.g. sftp -D
-
- "/usr/libexec/sftp-server -el debug3"
-
- ok markus@
+ Add CIFuzz status badge.
+
+commit b496b9f831acd1e5bcd875e26e797488beef494a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Mon Nov 7 14:45:16 2022 +1100
+
+ Do not run CIFuzz on selfhosted tree.
- OpenBSD-Commit-ID: 5a002b9f3a7aef2731fc0ffa9c921cf15f38ecce
+ We already run it on the regular tree, no need to double up.
-commit 2369a2810187e08f2af5d58b343956062fb96ee8
+commit 2138b1c4ddb300129a41a5104627b0d561184c7b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Mon Nov 7 14:41:58 2022 +1100
+
+ Whitespace change to trigger CIFuzz workflow.
+
+commit 4670b97ef87c7b0f21283c9b07c7191be88dda05
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Mon Nov 7 14:34:04 2022 +1100
+
+ Run cifuzz workflow on the actions as regular CI.
+
+commit 79391e66ce851ace1baf3c6a35e83a23f08ec2ba
+Author: David Korczynski <david@adalogics.com>
+Date: Tue Nov 30 11:45:20 2021 +0000
+
+ Add CIFuzz integration
+
+commit c1893364a0be243270014d7d34362a8101d55112
Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jun 24 10:45:06 2022 +0000
+Date: Mon Nov 7 02:21:22 2022 +0000
- upstream: Roll back previous KEX changes as they aren't safe until
-
- compat_pkalg_proposal and friends always allocate their returned strings.
- Reported by Qualys.
+ upstream: Import regenerated moduli.
- OpenBSD-Commit-ID: 1c7a88a0d5033f42f88ab9bec58ef1cf72c81ad0
+ OpenBSD-Commit-ID: b0e54ee4d703bd6929bbc624068666a7a42ecb1f
-commit 646686136c34c2dbf6a01296dfaa9ebee029386d
+commit 5c3f18fb994ef27e685b205ee2351851b80fdbd1
Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jun 24 04:37:00 2022 +0000
+Date: Mon Nov 7 01:53:01 2022 +0000
- upstream: Don't leak the strings allocated by order_hostkeyalgs()
+ upstream: Fix typo. From pablomh via -portable github PR#344.
- and list_hostkey_types() that are passed to compat_pkalg_proposal(). Part of
- github PR#324 from ZoltanFridrich, ok djm@
-
- OpenBSD-Commit-ID: b2f6e5f60f2bba293b831654328a8a0035ef4a1b
+ OpenBSD-Commit-ID: d056ee2e73691dc3ecdb44a6de68e6b88cd93827
-commit 193c6d8d905dde836b628fc07a7b9cf2d347e2a3
+commit e1c6fcc142066417c9832e634463faa3dd5d116c
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Jun 25 12:16:15 2022 +1000
+Date: Mon Nov 7 12:46:58 2022 +1100
- Zero out LIBFIDO2 when SK support not usable.
-
- Prevents us from trying to link them into ssh-sk-helper and failing to
- build.
+ Link to branch-specific queries for V_9_1 status.
-commit 40f5d849d25c60b4ae21261e78484d435f5cfd51
+commit 4f4a5fad6d8892c3f8ee9cd81ec7de6458210c9f
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Jun 25 11:47:28 2022 +1000
+Date: Sun Nov 6 10:55:59 2022 +1100
- Disable SK support if FIDO libs not found.
+ Use "prohibit-password" in -portable comments.
+
+ "without-password" is the deprecated alias for "prohibit-password",
+ so we should reference the latter. From emaste at freebsd.org.
-commit 5fd922ade1b25880fe8a8249f5c0385e413108f9
-Author: Damien Miller <djm@mindrot.org>
-Date: Fri Jun 24 14:43:54 2022 +1000
+commit 0f7e1eba55259ec037f515000b4c4afbf446230a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Sun Nov 6 10:50:01 2022 +1100
- fix broken case statement in previous
+ Fix tracing disable on FreeBSD.
+
+ Some versions of FreeBSD do not support using id 0 to refer to the
+ current pid for procctl, so pass getpid() explicitly. From
+ emaste at freebsd.org.
-commit f51423bdaf0008d46b6af082bcfd7a22a87375f0
-Author: Damien Miller <djm@mindrot.org>
-Date: Fri Jun 24 14:40:42 2022 +1000
+commit 32fddb982fd61b11a2f218a115975a87ab126d43
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Mon Nov 7 10:39:01 2022 +1100
- request 1.1x API compatibility for OpenSSL >=3.x
+ Fix setres*id checks to work with clang-16.
- idea/patch from Pedro Martelletto via GHPR#322; ok dtucker@
+ glibc has the prototypes for setresuid and setresgid behind _GNU_SOURCE,
+ and clang 16 will error out on implicit function definitions, so add
+ _GNU_SOURCE and the required headers to the configure checks. From
+ sam at @gentoo.org via bz#3497.
-commit 455cee8d6c2e4c48c5af9faead3599c49948411e
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jun 24 04:27:14 2022 +0000
+commit 12af712d116f42164bcfa56db901d06e4fa27199
+Author: Sam James <sam@gentoo.org>
+Date: Sun Nov 6 04:52:38 2022 +0000
- upstream: make it clear that RekeyLimit applies to both transmitted
+ configure.ac: Fix -Wstrict-prototypes
- and received data. GHPR#328 from Jan Pazdziora
+ Clang 16 now warns on this and it'll be removed in C23, so let's
+ just be future proof. It also reduces noise when doing general
+ Clang 16 porting work (which is a big job as it is). github PR#355.
- OpenBSD-Commit-ID: d180a905fec9ff418a75c07bb96ea41c9308c3f9
+ Signed-off-by: Sam James <sam@gentoo.org>
-commit 17904f05802988d0bb9ed3c8d1d37411e8f459c3
-Author: tobhe@openbsd.org <tobhe@openbsd.org>
-Date: Tue Jun 21 14:52:13 2022 +0000
+commit 40b0a5eb6e3edfa2886b60c09c7803353b0cc7f5
+Author: Sam James <sam@gentoo.org>
+Date: Sun Nov 6 04:47:35 2022 +0000
- upstream: Make sure not to fclose() the same fd twice in case of an
-
- error.
+ configure.ac: Add <pty.h> include for openpty
- ok dtucker@
+ Another Clang 16ish fix (which makes -Wimplicit-function-declaration
+ an error by default). github PR#355.
- OpenBSD-Commit-ID: e384c4e05d5521e7866b3d53ca59acd2a86eef99
+ See: 2efd71da49b9cfeab7987058cf5919e473ff466b
+ See: be197635329feb839865fdc738e34e24afd1fca8
-commit f29d6cf98c25bf044079032d22c1a57c63ab9d8e
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Sat Jun 18 02:17:16 2022 +0000
+commit 6b17e128879ec6cc32ca2c28b5d894b4aa72e32d
+Author: Rochdi Nassah <rochdinassah.1998@gmail.com>
+Date: Fri Oct 28 01:26:31 2022 +0100
- upstream: Don't attempt to fprintf a null identity comment. From
-
- Martin Vahlensieck via tech@.
-
- OpenBSD-Commit-ID: 4c54d20a8e8e4e9912c38a7b4ef5bfc5ca2e05c2
+ Fix broken zlib link.
-commit ad1762173bb38716a106e8979806149fd0f2753e
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jun 17 01:00:03 2022 +0000
+commit 99500df246ccb736ddbdd04160dcc82165d81a77
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Fri Nov 4 16:59:26 2022 +1100
- upstream: Log an error if pipe() fails while accepting a
-
- connection. bz#3447, from vincent-openssh at vinc17 net, ok djm@
+ Don't run openbsd-compat tests on Cygwin.
- OpenBSD-Commit-ID: 9d59f19872b94900a5c79da2d57850241ac5df94
+ Add "compat-tests" to the default TEST_TARGET so we can override as
+ necessary. Override TEST_TARGET for Cygwin as the tests don't currently
+ compile there.
-commit 9c59e7486cc8691401228b43b96a3edbb06e0412
-Author: Damien Miller <djm@mindrot.org>
-Date: Fri Jun 24 14:20:43 2022 +1000
+commit 3cae9f92a31897409666aa1e6f696f779759332b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Thu Nov 3 21:59:20 2022 +0000
- automatically enable built-in FIDO support
+ upstream: replace recently-added valid_domain() check for hostnames
- If libfido2 is found and usable, then enable the built-in
- security key support unless --without-security-key-builtin
- was requested.
+ going to known_hosts with a more relaxed check for bad characters; previous
+ commit broke address literals. Reported by/feedback from florian@
- ok dtucker@
+ OpenBSD-Commit-ID: 10b86dc6a4b206adaa0c11b58b6d5933898d43e0
-commit 7d25b37fb2a5ff4dadabcbdac6087a97479434f5
-Author: Damien Miller <djm@mindrot.org>
-Date: Fri Jun 24 13:46:39 2022 +1000
+commit 9655217231c9056200bea7ae2dffcc9c0c3eb265
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Nov 3 23:07:50 2022 +1100
- fix possible NULL deref when built without FIDO
+ Rerun tests on changes to Makefile.in in any dir.
+
+commit 3500f0405a3ab16b59a26f3508c4257a3fc3bce6
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Nov 3 23:04:08 2022 +1100
+
+ Link libssh into compat tests.
- Analysis/fix from kircher in bz3443; ok dtucker@
+ The cygwin compat code uses xmalloc, so add libssh.a so pick up that.
-commit f5ba85daddfc2da6a8dab6038269e02c0695be44
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Jun 15 16:08:25 2022 +0000
+commit ec59effcf65b8a4c85d47ff5a271123259dd0ab8
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Nov 3 21:44:23 2022 +1100
- upstream: make sure that UseDNS hostname lookup happens in the monitor
-
- and not in the pledge(2)'d unprivileged process; fixes regression caused by
- recent refactoring spotted by henning@
-
- OpenBSD-Commit-ID: a089870b95101cd8881a2dff65b2f1627d13e88d
+ Fix compat regress to work with non-GNU make.
-commit acb2059febaddd71ee06c2ebf63dcf211d9ab9f2
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jun 3 04:47:21 2022 +0000
+commit 73550a218e7dfbbd599534cbf856309bc924f6fd
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Nov 3 13:41:16 2022 +1100
- upstream: move auth_openprincipals() and auth_openkeyfile() over to
-
- auth2-pubkeyfile.c too; they make more sense there.
+ Increase selfhosted job timeout.
- OpenBSD-Commit-ID: 9970d99f900e1117fdaab13e9e910a621b7c60ee
+ The default job timeout of 360 (6h) is not enough to complete the
+ regress tests for some of the slow VMs depending on the load on the host.
+ Increase to 600 (10h).
-commit 3d9b0845f34510111cc693bb99a667662ca50cd8
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jun 3 04:31:54 2022 +0000
+commit db97d8d0b90c6ce52b94b153d6f8f5f7d3b11777
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Nov 3 10:00:43 2022 +1100
- upstream: test setenv in both client and server, test first-match-wins
-
- too
-
- OpenBSD-Regress-ID: 4c8804f9db38a02db480b9923317457b377fe34b
+ Only run opensslver tests if built with OpenSSL.
-commit 22e1a3a71ad6d108ff0c5f07f93c3fcbd30f8b40
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jun 3 04:30:46 2022 +0000
+commit ba053709638dff2f6603df0c1f340352261d63ea
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Wed Nov 2 14:16:04 2022 +1100
- upstream: Make SetEnv directives first-match-wins in both
-
- sshd_config and sshd_config; previously if the same name was reused then the
- last would win (which is the opposite to how the config is supposed to work).
-
- While there, make the ssh_config parsing more like sshd_config.
-
- bz3438, ok dtucker
-
- OpenBSD-Commit-ID: 797909c1e0262c0d00e09280459d7ab00f18273b
+ Add tests for OpenSSL 3.0.7 and LibreSSL 3.6.1.
-commit 38ed6c57e9e592c08e020fa6e82b45b4e1040970
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jun 3 04:00:15 2022 +0000
+commit edd24101c7e17d1a8f6576e1aaf62233b47ad6f5
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Nov 3 08:17:39 2022 +1100
- upstream: Add missing *-sk types to ssh-keyscan manpage. From
+ Run compat regress tests too.
+
+commit fe88d67e7599b0bc73f6e4524add28d743e7f977
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Nov 3 08:14:05 2022 +1100
+
+ Compat tests need libcrypto.
- skazi0 via github PR#294.
+ This was moved to CHANNELLIBS during the libs refactor. Spotted by
+ rapier at psc.edu.
+
+commit 96b519726b7944eee3c23a54eee3d5c031ba1533
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Nov 3 04:24:39 2022 +1100
+
+ Include time.h when defining timegm.
- OpenBSD-Commit-ID: fda2c869cdb871f3c90a89fb3f985370bb5d25c0
+ Fixes build on some platforms eg recent AIX.
-commit ea97ec98c41ec2b755dfab459347db674ff9a5de
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jun 3 03:21:09 2022 +0000
+commit da6038bd5cd55eb212eb2aec1fc8ae79bbf76156
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Tue Nov 1 19:10:30 2022 +1100
- upstream: Add period at end of "not known by any other names"
+ Always use compat getentropy.
- message. github PR#320 from jschauma, ok djm@
+ Have it call native getentropy and fall back as required. Should fix
+ issues of platforms where libc has getentropy but it is not implemented
+ in the kernel. Based on github PR#354 from simsergey.
+
+commit 5ebe18cab6be3247b44c807ac145164010465b82
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Wed Nov 2 10:51:48 2022 +1100
+
+ Check for sockaddr_in.sin_len.
- OpenBSD-Commit-ID: bd60809803c4bfd3ebb7c5c4d918b10e275266f2
+ If found, set SOCK_HAS_LEN which is used in addr.c. Should fix keyscan
+ tests on platforms with this (eg old NetBSD).
-commit 88e376fcd67478ad1660d94bc73ab348ac9f4527
+commit a1febadf426536612c2734168d409147c392e7cf
Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jun 3 03:17:42 2022 +0000
+Date: Sun Oct 30 18:42:07 2022 +0000
- upstream: ssh-keygen -A: do not generate DSA keys by default.
+ upstream: Use variable for diff options
- Based on github PR#303 from jsegitz with man page text from jmc@, ok markus@
- djm@
+ instead of unconditionally specifying "-rN". This will make life easier
+ in -portable where not all diff's understand -N.
- OpenBSD-Commit-ID: 5c4c57bdd7063ff03381cfb6696659dd3f9f5b9f
+ OpenBSD-Regress-ID: 8b8a407115546be1c6d72d350b1e4f1f960d3cd3
-commit 6b3fb624675082a1e5aa615d1b8479873d8b5731
-Author: naddy@openbsd.org <naddy@openbsd.org>
-Date: Tue May 31 14:05:12 2022 +0000
+commit f6d3ed9a8a9280cbb68d6a499850cfe810e92bd0
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Mon Oct 31 05:13:02 2022 +1100
- upstream: ssh-keygen: implement "verify-required" certificate option.
+ OpenSSL dev branch is 302 not 320.
- This was already documented when support for user-verified FIDO
- keys was added, but the ssh-keygen(1) code was missing.
+ While there, also accept 301 which it shat it was previously.
+
+commit 25c8a2bbcc10c493d27faea57c42a6bf13fa51f2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Oct 28 02:47:04 2022 +0000
+
+ upstream: put sshkey_check_rsa_length() back in sshkey.c to unbreak
- ok djm@
+ OPENSSL=no builds
- OpenBSD-Commit-ID: f660f973391b593fea4b7b25913c9a15c3eb8a06
+ OpenBSD-Commit-ID: 99eec58abe382ecd14b14043b195ee1babb9cf6e
-commit b7f86ffc301be105bba9a3e0618b6fab3ae379bd
-Author: jmc@openbsd.org <jmc@openbsd.org>
-Date: Sat May 28 05:57:56 2022 +0000
+commit 1192588546c29ceec10775125f396555ea71850f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Oct 28 02:29:34 2022 +0000
- upstream: keywords ref ssh_config.5;
+ upstream: allow ssh-keyscan(1) to accept CIDR address ranges, e.g.
- from caspar schutijser
+ ssh-keyscan 192.168.0.0/24
- OpenBSD-Commit-ID: f146a19d7d5c9374c3b9c520da43b2732d7d1a4e
+ If a CIDR range is passed, then it will be expanded to all possible
+ addresses in the range including the all-0s and all-1s addresses.
+
+ bz#976 feedback/ok markus@
+
+ OpenBSD-Commit-ID: ce6c5211f936ac0053fd4a2ddb415277931e6c4b
-commit dc7bc52372f2744fa39191577be5306ee57aacd4
+commit 64af4209309461c79c39eda2d13f9d77816c6398
Author: Damien Miller <djm@mindrot.org>
-Date: Mon May 30 09:29:09 2022 +1000
-
- fix some bugs in the fuzzer
-
-commit 1781f507c113667613351c19898efaf1e311a865
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri May 27 18:19:48 2022 +1000
-
- Test against OpenSSL 1.1.1o and 3.0.3.
-
-commit c53906e0c59e569691b4095d3e8db79cf78fa058
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri May 27 18:18:31 2022 +1000
+Date: Fri Oct 28 12:54:35 2022 +1100
- Test against LibreSSL 3.5.3.
+ fix merge botch
-commit 9b3ad432ad2f19319bcc089370e356c6315d682f
-Author: Damien Miller <djm@mindrot.org>
-Date: Fri May 27 17:00:43 2022 +1000
+commit 27267642699342412964aa785b98afd69d952c88
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Oct 28 00:44:44 2022 +0000
- fuzzer for authorized_keys parsing
+ upstream: refactor sshkey_private_deserialize
- mostly redundant to authopt_fuzz, but it's sensitive code so IMO it
- makes sense to test this layer too
+ feedback/ok markus@
+
+ OpenBSD-Commit-ID: f5ca6932fdaf840a5e8250becb38315a29b5fc9f
-commit c83d8c4d6f3ccceef84d46de107f6b71cda06359
+commit 2519a7077a9332f70935e5242ba91ee670ed6b87
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri May 27 05:02:46 2022 +0000
+Date: Fri Oct 28 00:44:17 2022 +0000
- upstream: split the low-level file handling functions out from
+ upstream: refactor sshkey_private_serialize_opt()
- auth2-pubkey.c
+ feedback/ok markus@
- Put them in a new auth2-pubkeyfile.c to make it easier to refer to them
- (e.g. in unit/fuzz tests) without having to refer to everything else
- pubkey auth brings in.
+ OpenBSD-Commit-ID: 61e0fe989897901294efe7c3b6d670cefaf44cbd
+
+commit 11a768adf98371fe4e43f3b06014024c033385d5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Oct 28 00:43:30 2022 +0000
+
+ upstream: refactor certify
- ok dtucker@
+ feedback/ok markus@
- OpenBSD-Commit-ID: 3fdca2c61ad97dc1b8d4a7346816f83dc4ce2217
+ OpenBSD-Commit-ID: 35d742992e223eaca3537e6fb3d3002c08eed4f6
-commit 3b0b142d2a0767d8cd838e2f3aefde8a0aaa41e1
+commit 3fbc58bb249d967cc43ebdc554f6781bb73d4a58
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri May 27 05:01:25 2022 +0000
+Date: Fri Oct 28 00:43:08 2022 +0000
- upstream: refactor authorized_keys/principals handling
-
- remove "struct ssh *" from arguments - this was only used to pass the
- remote host/address. These can be passed in instead and the resulting
- code is less tightly coupled to ssh_api.[ch]
+ upstream: refactor sshkey_sign() and sshkey_verify()
- ok dtucker@
+ feedback/ok markus@
- OpenBSD-Commit-ID: 9d4373d013edc4cc4b5c21a599e1837ac31dda0d
+ OpenBSD-Commit-ID: 368e662c128c99d05cc043b1308d2b6c71a4d3cc
-commit 2c334fd36f80cb91cc42e4b978b10aa35e0df236
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri May 27 04:29:40 2022 +0000
+commit a1deb6cdbbe6afaab74ecb08fcb62db5739267be
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Oct 28 00:41:52 2022 +0000
- upstream: f sshpkt functions fail, then password is not cleared
+ upstream: refactor sshkey_from_blob_internal()
- with freezero. Unconditionally call freezero to guarantee that password is
- removed from RAM.
-
- From tobias@ and c3h2_ctf via github PR#286, ok djm@
+ feedback/ok markus@
- OpenBSD-Commit-ID: 6b093619c9515328e25b0f8093779c52402c89cd
+ OpenBSD-Commit-ID: 1f46c0cbb8060ee9666a02749594ad6658c8e283
-commit 5d3a77f4c5ae774c6796387266503f52c7cdc7c2
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri May 27 04:27:49 2022 +0000
+commit 7d00799c935271ce89300494c5677190779f6453
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Oct 28 00:41:17 2022 +0000
- upstream: Avoid kill with -1 argument. The out_ctx label can be
-
- reached before fork has been called. If this happens, then kill -1 would be
- called, sending SIGTERM to all processes reachable by the current process.
+ upstream: refactor sshkey_from_private()
- From tobias@ and c3h2_ctf via github PR#286, ok djm@
+ feedback/ok markus@
- OpenBSD-Commit-ID: 6277af1207d81202f5daffdccfeeaed4c763b1a8
+ OpenBSD-Commit-ID: e5dbe7a3545930c50f70ee75c867a1e08b382b53
-commit 533b31cd08e4b97f455466f91c36915e2924c15a
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri May 27 04:13:24 2022 +0000
+commit 262647c2e920492ca57f1b9320d74f4a0f6e482b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Oct 28 00:39:29 2022 +0000
- upstream: Note that ProxyJump also accepts the same tokens as
+ upstream: factor out key generation
- ProxyCommand. From pallxk via github PR#305.
+ feedback/ok markus@
- OpenBSD-Commit-ID: 7115ac351b129205f1f1ffa6bbfd62abd76be7c5
+ OpenBSD-Commit-ID: 5b4211bff4de8d9adb84bc72857a8c42c44e7ceb
-commit 9d8c80f8a304babe61ca28f2e3fb5eb6dc9c39bf
+commit 401c74e7dc15eab60540653d2f94d9306a927bab
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed May 25 06:03:44 2022 +0000
+Date: Fri Oct 28 00:38:58 2022 +0000
- upstream: revert previous; it was broken (spotted by Theo)
+ upstream: refactor and simplify sshkey_read()
- OpenBSD-Commit-ID: 457c79afaca2f89ec2606405c1059b98b30d8b0d
+ feedback/ok markus@
+
+ OpenBSD-Commit-ID: 0d93b7a56e31cd06a8bb0d2191d084ce254b0971
-commit 9e0d02ef7ce88b67643bfb1c2272c9f5f04cc680
+commit 591fed94e66a016acf87f4b7cd416ce812f2abe8
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed May 25 00:31:13 2022 +0000
+Date: Fri Oct 28 00:37:24 2022 +0000
- upstream: make SSHBUF_DBG/SSHBUF_TELL (off by default and only enabled
+ upstream: factor out public key serialization
- via #define) dump to stderr rather than stdout
+ feedback/ok markus@
- OpenBSD-Commit-ID: 10298513ee32db8390aecb0397d782d68cb14318
+ OpenBSD-Commit-ID: a3570c4b97290c5662890aea7328d87f55939033
-commit 2487163630f28be28b7e2396b4bd6511b98f1d3e
-Author: Tim Rice <tim@multitalents.net>
-Date: Tue May 24 10:21:25 2022 -0700
+commit 1e78844ae2b2dc01ba735d5ae740904c57e13685
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Oct 28 00:36:31 2022 +0000
- configure.ac: Add missing AC_DEFINE for caph_cache_tzdata test causing
- HAVE_CAPH_CACHE_TZDATA to be missing from config.h.in.
- Spotted by Bryan Drewery
+ upstream: factor out sshkey_equal_public()
+
+ feedback/ok markus@
+
+ OpenBSD-Commit-ID: 1368ba114cb37732fe6ec3d89c7e6d27ea6fdc94
-commit bedb93415b60db3dfd704a3d525e82adb14a2481
+commit 25de1c01a8b9a2c8ab9b1da22444a03e89c982de
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sun May 15 23:48:07 2022 +0000
+Date: Fri Oct 28 00:35:40 2022 +0000
- upstream: regress test for in-place transfers and clobbering larger
+ upstream: begin big refactor of sshkey
- files with smaller ones; would have caught last regression in scp(1)
+ Move keytype data and some of the type-specific code (allocation,
+ cleanup, etc) out into each key type's implementation. Subsequent
+ commits will move more, with the goal of having each key-*.c file
+ owning as much of its keytype's implementation as possible.
- OpenBSD-Regress-ID: 19de4e88dd3a4f7e5c1618c9be3c32415bd93bc2
+ lots of feedback + ok markus@
+
+ OpenBSD-Commit-ID: 0f2b4334f73914344e9e5b3d33522d41762a57ec
-commit b4f0d719c2548cb74da509fb65f384dada4ebd37
-Author: anton@openbsd.org <anton@openbsd.org>
-Date: Fri Apr 22 05:08:43 2022 +0000
+commit 445363433ba20b8a3e655b113858c836da46a1cb
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Mon Oct 24 22:43:36 2022 +0000
- upstream: Only run agent-ptrace.sh if gdb is available as all
+ upstream: Be more paranoid with host/domain names coming from the
- architectures do not ship with gdb.
+ never write a name with bad characters to a known_hosts file.
- OpenBSD-Regress-ID: ec53e928803e6b87f9ac142d38888ca79a45348d
+ reported by David Leadbeater, ok deraadt@
+
+ OpenBSD-Commit-ID: ba9b25fa8b5490b49398471e0c9657b0cbc7a5ad
-commit 9b73345f80255a7f3048026462f2c0c6a241eeac
+commit 7190154de2c9fe135f0cc1ad349cb2fa45152b89
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sun May 15 23:47:21 2022 +0000
+Date: Mon Oct 24 21:52:50 2022 +0000
- upstream: fix in-place copies; r1.163 incorrectly skipped truncation in
+ upstream: regress test for unmatched glob characters; fails before
- all cases, not just at the start of a transfer. This could cause overwrites
- of larger files to leave junk at the end. Spotted by tb@
+ previous commit but passes now. bz3488; prodded by dtucker@
- OpenBSD-Commit-ID: b189f19cd68119548c8e24e39c79f61e115bf92c
+ OpenBSD-Regress-ID: 0cc5cc9ea4a6fd170dc61b9212f15badaafb3bbd
-commit 56a0697fe079ff3e1ba30a2d5c26b5e45f7b71f8
+commit a4821a592456c3add3cd325db433110cdaaa3e5c
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri May 13 06:31:50 2022 +0000
+Date: Mon Oct 24 21:51:55 2022 +0000
- upstream: arrange for scp, when in sftp mode, to not ftruncate(3) files
+ upstream: when scp(1) is using the SFTP protocol for transport (the
- early
+ default), better match scp/rcp's handling of globs that don't match the
+ globbed characters but do match literally (e.g. trying to transfer
+ "foo.[1]").
- previous behavious of unconditionally truncating the destination file
- would cause "scp ~/foo localhost:" and "scp localhost:foo ~/" to
- delete all the contents of their destination.
+ Previously scp(1) in SFTP mode would not match these pathnames but
+ legacy scp/rcp mode would.
- spotted by solene@ sthen@, also bz3431; ok dtucker@
+ Reported by Michael Yagliyan in bz3488; ok dtucker@
- OpenBSD-Commit-ID: ca39fdd39e0ec1466b9666f15cbcfddea6aaa179
+ OpenBSD-Commit-ID: d8a3773f53015ba811fddba7473769a2fd343e11
-commit fbcef70c2832712f027bccea1aa9bc4b4103da93
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Mon May 9 08:25:27 2022 +0000
+commit 18376847b8043ba967eabbe23692ef74c9a3fddc
+Author: jsg@openbsd.org <jsg@openbsd.org>
+Date: Thu Oct 13 09:09:28 2022 +0000
- upstream: Remove errant apostrophe. From haruyama at queen-ml org.
+ upstream: use correct type with sizeof ok djm@
- OpenBSD-Commit-ID: dc6b294567cb84b384ad6ced9ca469f2bbf0bd10
+ OpenBSD-Commit-ID: d6c882c2e8a42ff831a5b3cbc2c961ecb2dd6143
-commit 0086a286ea6bbd11ca9b664ac3bb12b27443d6eb
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon May 9 03:09:53 2022 +0000
+commit 4a4883664d6b4e9e4e459a8cdc16bd8d4b735de9
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date: Fri Oct 7 06:00:58 2022 +0000
- upstream: Allow existing -U (use agent) flag to work with "-Y sign"
+ upstream: ssh-agent.1: - use Nm not Xr for self-ref - while here,
- operations, where it will be interpreted to require that the private keys is
- hosted in an agent; bz3429, suggested by Adam Szkoda; ok dtucker@
+ wrap a long line
- OpenBSD-Commit-ID: a7bc69873b99c32c42c7628ed9ea91565ba08c2f
+ ssh-agent.c:
+ - add -O to usage()
+
+ OpenBSD-Commit-ID: 855dac4695cef22e96d69c53436496bc408ca389
-commit cb010744cc98f651b1029bb09efa986eb54e4ccf
+commit 9fd2441113fce2a83fc7470968c3b27809cc7f10
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sun May 8 22:58:35 2022 +0000
+Date: Fri Oct 7 04:06:26 2022 +0000
- upstream: improve error message when 'ssh-keygen -Y sign' is unable to
+ upstream: document "-O no-restrict-websafe"; spotted by Ross L
- load a private key; bz3429, reported by Adam Szkoda ok dtucker@
+ Richardson
- OpenBSD-Commit-ID: bb57b285e67bea536ef81b1055467be2fc380e74
+ OpenBSD-Commit-ID: fe9eaa50237693a14ebe5b5614bf32a02145fe8b
-commit aa61fc82c63d309a90c22ca74fb1da6c6f4372fd
-Author: Tobias Heider <me@tobhe.de>
-Date: Mon May 9 02:00:01 2022 +0200
+commit 614252b05d70f798a0929b1cd3d213030ad4d007
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Tue Oct 18 06:29:16 2022 +1100
- Remove duplicate bcrypt_pbkdf.o from Makefile
-
- bcrypt_pbkdf.o is duplicated in the openbsd-compat Makefile's object
- file list.
+ OpenSSL dev branch now identifies as 3.2.0.
-commit deb506d00da8d11fb04c1e7b9b1e1cc379c1705c
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sun May 8 22:32:36 2022 +0000
+commit 195e5a65fd793a738ea8451ebfdd1919db5aff3e
+Author: Damien Miller <djm@mindrot.org>
+Date: Mon Oct 17 09:41:47 2022 +1100
- upstream: When performing operations that glob(3) a remote path, ensure
-
- that the implicit working directory used to construct that path escapes
- glob(3) characters.
+ revert c64b62338b4 and guard POLL* defines instead
- This prevents glob characters from being processed in places they
- shouldn't, e.g. "cd /tmp/a*/", "get *.txt" should have the get operation
- treat the path "/tmp/a*" literally and not attempt to expand it.
+ c64b62338b4 broke OSX builds, which do have poll.h but lack ppoll(2)
+ Spotted by dtucker
+
+commit bc2e480d99613bd59720edae244d1764636544c4
+Author: Damien Miller <djm@mindrot.org>
+Date: Fri Oct 14 14:52:22 2022 +1100
+
+ undef _get{short,long} before redefining
+
+commit 5eb796a369c64f18d55a6ae9b1fa9b35eea237fb
+Author: Harmen Stoppels <harmenstoppels@gmail.com>
+Date: Thu Oct 13 16:08:46 2022 +0200
+
+ Fix snprintf configure test for clang 15
- Reported by Lusia Kundel; ok markus@
+ Clang 15 -Wimplicit-int defaults to an error in C99 mode and above.
+ A handful of tests have "main(..." and not "int main(..." which caused
+ the tests to produce incorrect results.
+
+commit c64b62338b46ffa08839f05f21ad69fa6234dc17
+Author: Damien Miller <djm@mindrot.org>
+Date: Mon Oct 10 12:32:43 2022 +1100
+
+ skip bsd-poll.h if poll.h found; ok dtucker
+
+commit 5ee2b8ccfcf4b606f450eb0ff2305e311f68b0be
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Thu Oct 6 22:42:37 2022 +0000
+
+ upstream: honour user's umask if it is more restrictive then the ssh
- OpenBSD-Commit-ID: 4f647f58482cbad3d58b1eab7f6a1691433deeef
+ default (022); based on patch from Alex Henrie, ok dtucker@ deraadt@
+
+ OpenBSD-Commit-ID: fe1b9e15fc9a4f49fc338e848ce14d8727abe82d
-commit f38cf74f20b5da113cfa823afd5bfb5c6ba65f3d
+commit a75cffc2700cebd3e2dd9093f7f7388d2be95cb7
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri May 6 14:50:18 2022 +1000
+Date: Fri Oct 7 03:54:56 2022 +1100
- Also retest OpenBSD upstream on .yml changes.
+ Add LibreSSL 3.6.0 to test suite.
+
+ While there, bump OpenSSL to latest 1.1.1q release.
-commit f87a132800ba3710ab130d703448a31ef1128d77
+commit fcc0f0c0e96a30076683fea9a7c9eedc72931742
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri May 6 14:46:09 2022 +1000
+Date: Thu Oct 6 21:18:16 2022 +1100
- Note that, for now, we need variadic macros.
+ Add 9.1 branch to CI status page.
-commit 217b518e0f7c52c4b909e935141a55344c61e644
+commit ef211eee63821d894a8bf81f22bfba9f6899d0fe
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri May 6 14:39:34 2022 +1000
+Date: Tue Oct 4 23:20:23 2022 +1100
- Add ubsan minimal testcase on OpenBSD.
+ Test commits to all branches of portable.
- As suggested by djm@.
+ Only test OpenBSD upstream on commits to master since that's what it
+ tracks.
-commit 457dce2cfef6a48f5442591cd8b21c7e8cba13f8
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Thu May 5 01:04:14 2022 +0000
+commit fe646de03cafb6593ff4e4954bca9ec4b4b753a8
+Author: Damien Miller <djm@mindrot.org>
+Date: Wed Oct 5 03:47:26 2022 +1100
- upstream: sshkey_unshield_private() contains a exact duplicate of
-
- the code in private2_check_padding(). Pull private2_check_padding() up so the
- code can be reused. From Martin Vahlensieck, ok deraadt@
-
- OpenBSD-Commit-ID: 876884c3f0e62e8fd8d1594bab06900f971c9c85
+ whitespace at EOL
-commit 0e44db4d9cb313e68a59a44d27884af66c02356e
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Thu May 5 00:56:58 2022 +0000
+commit a6e1852d10c63a830196e82168dadd957aaf28ec
+Author: Damien Miller <djm@mindrot.org>
+Date: Wed Oct 5 03:40:01 2022 +1100
- upstream: channel_new no longer frees remote_name. So update the
-
- comment accordingly. As remote_name is not modified, it can be const as
- well. From Martin Vahlensieck
-
- OpenBSD-Commit-ID: e4e10dc8dc9f40c166ea5a8e991942bedc75a76a
+ mention libfido2 autodetection
-commit 37b62fd5caf19c85a48241535277cefff65adace
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Thu May 5 00:55:11 2022 +0000
+commit 7360c2c206f33d309edbaf64036c96fadf74d640
+Author: Damien Miller <djm@mindrot.org>
+Date: Wed Oct 5 03:37:36 2022 +1100
- upstream: mux.c: mark argument as const; from Martin Vahlensieck
+ remove mention of --with-security-key-builtin
- OpenBSD-Commit-ID: 69a1a93a55986c7c2ad9f733c093b46a47184341
+ it is enabled by default when libfido2 is installed
-commit f4e67c0ad259b4cf10177277a5827fa5545bac53
-Author: markus@openbsd.org <markus@openbsd.org>
-Date: Wed May 4 07:31:22 2022 +0000
+commit 0ffb46f2ee2ffcc4daf45ee679e484da8fcf338c
+Author: Damien Miller <djm@mindrot.org>
+Date: Tue Oct 4 01:51:42 2022 +1100
- upstream: make sure stdout is non-blocking; ok djm@
-
- OpenBSD-Commit-ID: 64940fffbd1b882eda2d7c8c7a43c79368309c0d
+ update .depend
-commit e5c036d2092c00bef395e9161dc5ce42d4be9565
-Author: florian@openbsd.org <florian@openbsd.org>
-Date: Tue May 3 07:42:27 2022 +0000
+commit 657e676ff696c7bb787bffb0e249ea1be3b474e1
+Author: Damien Miller <djm@mindrot.org>
+Date: Tue Oct 4 01:45:52 2022 +1100
- upstream: Add FIDO AUTHENTICATOR section and explain a bit how FIDO
-
- works. The wording came mostly from the 8.2 OpenSSH release notes, addapted
- to fit the man page. Then move the -O bits into the new section as is already
- done for CERTIFICATES and MODULI GENERATION. Finally we can explain the
- trade-offs of resident keys. While here, consistently refer to the FIDO
- thingies as "FIDO authenticators", not "FIDO tokens".
-
- input & OK jmc, naddy
-
- OpenBSD-Commit-ID: dd98748d7644df048f78dcf793b3b63db9ab1d25
+ update release notes URL
-commit 575771bf79bef7127be6aaccddc46031ea15529e
-Author: jmc@openbsd.org <jmc@openbsd.org>
-Date: Mon May 2 05:40:37 2022 +0000
+commit f059da2b29840c0f048448809c317ce2ae014da7
+Author: Damien Miller <djm@mindrot.org>
+Date: Tue Oct 4 01:45:41 2022 +1100
- upstream: remove an obsolete rsa1 format example from an example;
-
- from megan batty
- ok djm
-
- OpenBSD-Commit-ID: db2c89879c29bf083df996bd830abfb1e70d62bf
+ crank versions in RPM spec files
-commit 0bc6b4c8f04e292577bdb44d5dc6b630d3448087
+commit b51f3f172d87cbdb80ca4eb7b2149e56a7647557
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sun May 1 23:20:30 2022 +0000
+Date: Mon Sep 26 22:18:40 2022 +0000
- upstream: fix some integer overflows in sieve_large() that show up when
+ upstream: openssh-9.1
- trying to generate modp groups > 16k bits. Reported via GHPR#306 by Bertram
- Felgenhauer, but fixed in a different way. feedback/ok tb@
+ OpenBSD-Commit-ID: 5a467b2ee81da01a86adf1ad93b62b1728494e56
+
+commit 4cf8d0c0f3030f594a238bab21a0695735515487
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Wed Sep 21 22:26:50 2022 +0000
+
+ upstream: Fix typo. From AlexanderStohr via github PR#343.
- OpenBSD-Commit-ID: 81cbc6dd3a21c57bd6fadea10e44afe37bca558e
+ OpenBSD-Commit-ID: a134c9b4039e48803fc6a87f955b0f4a03181497
-commit a45615cb172bc827e21ec76750de39dfb30ecc05
+commit 8179fed3264d5919899900ed8881d5f9bb57ca33
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Apr 29 04:55:07 2022 +0000
+Date: Mon Sep 19 21:39:16 2022 +0000
- upstream: be stricter in which characters will be accepted in
+ upstream: add RequiredRSASize to the list of keywords accepted by
- specifying a mask length; allow only 0-9. From khaleesicodes via GHPR#278; ok
- dtucker@
+ -o; spotted by jmc@
- OpenBSD-Commit-ID: e267746c047ea86665cdeccef795a8a56082eeb2
-
-commit 4835544d2dd31de6ffc7dba59f92093aea98155b
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Apr 30 10:56:41 2022 +1000
-
- Add Mac OS X 12 test target.
+ OpenBSD-Commit-ID: fe871408cf6f9d3699afeda876f8adbac86a035e
-commit 97a6a8b8c1f2da09712d0e72d0ef800e4edd34cd
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Apr 29 18:27:34 2022 +1000
+commit 5f954929e9f173dd1e279e07d0e8b14fa845814d
+Author: Damien Miller <djm@mindrot.org>
+Date: Mon Sep 19 20:59:34 2022 +1000
- Only run tests when source files change.
+ no need for glob.h here
- Also run tests on changes to V_9_0 branch.
+ it also causes portability problems
-commit 6d0392b9ff4b50a56ac5685d1b9392e2cd432ca3
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Apr 29 18:22:34 2022 +1000
+commit 03d94a47207d58b3db37eba4f87eb6ae5a63168a
+Author: Damien Miller <djm@mindrot.org>
+Date: Mon Sep 19 20:59:04 2022 +1000
- Remove now-empty int32_minmax.inc.
+ avoid Wuninitialized false positive in gcc-12ish
-commit af59463553b5ad52d3b42c4455ee3c5600158bb7
+commit 9d952529113831fb3071ab6e408d2726fd72e771
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Apr 29 03:24:30 2022 +0000
+Date: Mon Sep 19 10:46:00 2022 +0000
- upstream: mention that the helpers are used by ssh(1), ssh-agent(1)
+ upstream: use users-groups-by-id@openssh.com sftp-server extension
- and ssh-keygen(1). Previously only ssh(1) was mentioned. From Pedro
- Martelletto
+ (when available) to fill in user/group names for directory listings.
+ Implement a client-side cache of see uid/gid=>user/group names. ok markus@
- OpenBSD-Commit-ID: 30f880f989d4b329589c1c404315685960a5f153
+ OpenBSD-Commit-ID: f239aeeadfa925a37ceee36ee8b256b8ccf4466e
-commit 3e26b3a6eebcee27be177207cc0846fb844b7a56
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Apr 29 03:16:48 2022 +0000
+commit 8ff680368b0bccf88ae85d4c99de69387fbad7a6
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Mon Sep 19 10:43:12 2022 +0000
- upstream: Don't leak SK device. Patch from Pedro Martelletto via
+ upstream: sftp client library support for
- github PR#316. ok djm@
+ users-groups-by-id@openssh.com; ok markus@
- OpenBSD-Commit-ID: 17d11327545022e727d95fd08b213171c5a4585d
+ OpenBSD-Commit-ID: ddb2f33a2da6349a9a89a8b5bcb9ca7c999394de
-commit 247082b5013f0d4fcae8f97453f2a2f01bcda811
+commit 488f6e1c582212c2374a4bf8cd1b703d2e70fb8b
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Apr 29 03:13:32 2022 +0000
+Date: Mon Sep 19 10:41:58 2022 +0000
- upstream: fix memleak on session-bind path; from Pedro Martelletto, ok
+ upstream: extend sftp-common.c:extend ls_file() to support supplied
- dtucker@
+ user/group names; ok markus@
- OpenBSD-Commit-ID: e85899a26ba402b4c0717b531317e8fc258f0a7e
+ OpenBSD-Commit-ID: c70c70498b1fdcf158531117e405b6245863bfb0
-commit e05522008092ceb86a87bdd4ad7878424315db89
+commit 74b77f7497dba3a58315c8f308883de448078057
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Thu Apr 28 02:53:31 2022 +0000
+Date: Mon Sep 19 10:40:52 2022 +0000
- upstream: avoid printing hash algorithm twice; from lucas AT sexy.is
+ upstream: sftp-server(8): add a "users-groups-by-id@openssh.com"
- OpenBSD-Commit-ID: 9d24671e10a84141b7c504396cabad600e47a941
+ extension request that allows the client to obtain user/group names that
+ correspond to a set of uids/gids.
+
+ Will be used to make directory listings more useful and consistent
+ in sftp(1).
+
+ ok markus@
+
+ OpenBSD-Commit-ID: 7ebabde0bcb95ef949c4840fe89e697e30df47d3
-commit 0979e29356915261d69a9517a1e0aaade7c9fc75
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Wed Apr 27 11:08:55 2022 +0000
+commit 231a346c0c67cc7ca098360f9a554fa7d4f1eddb
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Mon Sep 19 08:49:50 2022 +0000
- upstream: Add authfd path to debug output. ok markus@
+ upstream: better debugging for connect_next()
- OpenBSD-Commit-ID: f735a17d1a6f2bee63bfc609d76ef8db8c090890
+ OpenBSD-Commit-ID: d16a307a0711499c971807f324484ed3a6036640
-commit 67b7c784769c74fd4d6b147d91e17e1ac1a8a96d
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Tue Apr 26 07:41:44 2022 +0000
+commit 1875042c52a3b950ae5963c9ca3774a4cc7f0380
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Sat Sep 17 10:34:29 2022 +0000
- upstream: Check sshauthopt_new() for NULL. bz#3425, from
+ upstream: Add RequiredRSASize for sshd(8); RSA keys that fall
- tessgauthier at microsoft.com. ok djm@
+ beneath this limit will be ignored for user and host-based authentication.
- OpenBSD-Commit-ID: af0315bc3e44aa406daa7e0ae7c2d719a974483f
+ Feedback deraadt@ ok markus@
+
+ OpenBSD-Commit-ID: 187931dfc19d51873df5930a04f2d972adf1f7f1
-commit d571314d14b919fbd7c84a61f9bf2065fc0a6841
-Author: millert@openbsd.org <millert@openbsd.org>
-Date: Wed Apr 20 16:00:25 2022 +0000
+commit 54b333d12e55e6560b328c737d514ff3511f1afd
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Sat Sep 17 10:33:18 2022 +0000
- upstream: Remove unnecessary includes: openssl/hmac.h and
+ upstream: add a RequiredRSASize for checking RSA key length in
- openssl/evp.h. From Martin Vahlensieck.
+ ssh(1). User authentication keys that fall beneath this limit will be
+ ignored. If a host presents a host key beneath this limit then the connection
+ will be terminated (unfortunately there are no fallbacks in the protocol for
+ host authentication).
- OpenBSD-Commit-ID: a6debb5fb0c8a44e43e8d5ca7cc70ad2f3ea31c3
+ feedback deraadt, Dmitry Belyavskiy; ok markus@
+
+ OpenBSD-Commit-ID: 430e339b2a79fa9ecc63f2837b06fdd88a7da13a
-commit da8dddf8cc1f2516ff894b8183e83a7c5ba3ef80
-Author: millert@openbsd.org <millert@openbsd.org>
-Date: Wed Apr 20 15:59:18 2022 +0000
+commit 07d8771bacfefbcfb37fa8a6dc6103bcc097e0ab
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Sat Sep 17 10:30:45 2022 +0000
- upstream: Add missing includes of stdlib.h and stdint.h. We need
+ upstream: Add a sshkey_check_rsa_length() call for checking the
- stdlib.h for malloc(3) and stdint.h for SIZE_MAX. Unlike the other xmss
- files, ssh-xmss.c does not include xmss_commons.h so ssh-xmss.c must include
- those headers itself. From Martin Vahlensieck
+ length of an RSA key; ok markus@
- OpenBSD-Commit-ID: 70e28a9818cee3da1be2ef6503d4b396dd421e6b
+ OpenBSD-Commit-ID: de77cd5b11594297eda82edc594b0d32b8535134
-commit fe9d87a6800a7a33be08f4d5ab662a758055ced2
-Author: millert@openbsd.org <millert@openbsd.org>
-Date: Wed Apr 20 15:56:49 2022 +0000
+commit 3991a0cf947cf3ae0f0373bcec5a90e86a7152f5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Sat Sep 17 10:11:29 2022 +0000
- upstream: Avoid an unnecessary xstrdup in rm_env() when matching
+ upstream: actually hook up restrict_websafe; the command-line flag
- patterns. Since match_pattern() doesn't modify its arguments (they are
- const), there is no need to make an extra copy of the strings in
- options->send_env. From Martin Vahlensieck
+ was never actually used. Spotted by Matthew Garrett
- OpenBSD-Commit-ID: 2c9db31e3f4d3403b49642c64ee048b2a0a39351
-
-commit 7bf2eb958fbb551e7d61e75c176bb3200383285d
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Apr 26 23:30:59 2022 +1000
-
- Add debian-riscv64 test target.
-
-commit 3913c935523902482974c4c503bcff20bd850a6a
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Apr 25 17:20:06 2022 +1000
-
- Update OpenSSL and LibreSSL versions in tests.
+ OpenBSD-Commit-ID: 0b363518ac4c2819dbaa3dfad4028633ab9cdff1
-commit dcd8dca29bcdb193ff6be35b96fc55e6e30d37d9
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Apr 23 20:40:28 2022 +1000
+commit 30b2a7e4291fb9e357f80a237931ff008d686d3b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Sep 16 06:55:37 2022 +0000
- Include stdlib.h for free() prototype.
+ upstream: correct error value
- ... which is used inside the CUSTOM_SYS_AUTH_GET_LASTLOGIN_MSG block.
+ OpenBSD-Commit-ID: 780efcbad76281f11f14b2a5ff04eb6db3dfdad4
-commit 4cc05de568e1c3edd7834ff3bd9d8214eb34861b
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Apr 23 20:17:26 2022 +1000
+commit ac1ec9545947d9f9657259f55d04cb49d3a94c8a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Sep 16 03:33:14 2022 +0000
- Cache timezone data in capsicum sandbox.
+ upstream: sftp: Be a bit more clever about completions
- From emaste at freebsd.org, originally part of FreeBSD commit r339216
- / fc3c19a9 with autoconf bits added by me.
-
-commit c31404426d212e2964ff9e5e58e1d0fce3d83f27
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Thu Apr 21 01:36:46 2022 +0000
-
- upstream: It looks like we can't completely avoid
+ There are commands (e.g. "get" or "put") that accept two
+ arguments, a local path and a remote path. However, the way
+ current completion is written doesn't take this distinction into
+ account and always completes remote or local paths.
- waiting for processes to exit so retrieve the pid via controlmaster and
- use that.
+ By expanding CMD struct and "cmds" array this distinction can be
+ reflected and with small adjustment to completer code the correct
+ path can be completed.
- OpenBSD-Regress-ID: 8246f00f22b14e49d2ff1744c94897ead33d457b
+ By Michal Privoznik, ok dtucker@
+
+ OpenBSD-Commit-ID: 1396d921c4eb1befd531f5c4a8ab47e7a74b610b
-commit d19b21afab5c8e2f3df6bd8aee9766bdad3d8c58
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Wed Apr 20 13:25:55 2022 +0000
+commit 590db83384f9d99fc51c84505792d26d1ef60df9
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Sep 16 03:13:34 2022 +0000
- upstream: Use ssh -f and ControlPersist ..
+ upstream: sftp: Don't attempt to complete arguments for
- to start up test forwards and ssh -O stop to shut them down intead of
- sleep loops. This speeds up the test by an order of magnitude.
+ non-existent commands
- OpenBSD-Regress-ID: eb3db5f805100919b092a3b2579c611fba3e83e7
+ If user entered a non-existent command (e.g. because they made a
+ typo) there is no point in trying to complete its arguments. Skip
+ calling complete_match() if that's the case.
+
+ From Michal Privoznik
+
+ OpenBSD-Commit-ID: cf39c811a68cde2aeb98fc85addea4000ef6b07a
-commit 5f76286a126721fa005de6edf3d1c7a265555f19
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Wed Apr 20 05:24:13 2022 +0000
+commit ff9809fdfd1d9a91067bb14a77d176002edb153c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Sep 14 00:14:37 2022 +0000
- upstream: Simplify forward-control test.
+ upstream: sk_enroll: never drop SSH_SK_USER_VERIFICATION_REQD flag
- Since we no longer need to support SSH1 we don't need to run shell
- commands on the other end of the connection and can use ssh -N instead.
- This also makes the test less racy.
+ from response
- OpenBSD-Regress-ID: 32e94ce272820cc398f30b848b2b0f080d10302c
+ Now that all FIDO signing calls attempt first without PIN and then
+ fall back to trying PIN only if that attempt fails, we can remove the
+ hack^wtrick that removed the UV flag from the keys returned during
+ enroll.
+
+ By Corinna Vinschen
+
+ OpenBSD-Commit-ID: 684517608c8491503bf80cd175425f0178d91d7f
-commit 687bbf23572d8bdf25cbbcdf8ac583514e1ba710
+commit 940dc10729cb5a95b7ee82c10184e2b9621c8a1d
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Thu Mar 31 03:07:33 2022 +0000
+Date: Wed Sep 14 00:13:13 2022 +0000
- upstream: regression test for sftp cp command
+ upstream: a little extra debugging
- OpenBSD-Regress-ID: c96bea9edde3a384b254785e7f9b2b24a81cdf82
+ OpenBSD-Commit-ID: edf1601c1d0905f6da4c713f4d9cecc7d1c0295a
-commit f1233f19a6a9fe58f52946f50df4772f5b136761
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Wed Apr 20 01:13:47 2022 +0000
+commit 4b5f91cb959358141181b934156513fcb8a6c1e3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Sep 14 00:02:03 2022 +0000
- upstream: Import regenerated moduli
+ upstream: ssh-agent: attempt FIDO key signing without PIN and use
- OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0
+ the error to determine whether a PIN is required and prompt only if
+ necessary. from Corinna Vinschen
+
+ OpenBSD-Commit-ID: dd6be6a0b7148608e834ee737c3479b3270b00dd
-commit fec014785de198b9a325d1b94e324bb958c5fe7b
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Apr 20 04:19:11 2022 +0000
+commit 113523bf0bc33600b07ebb083572c8c346b6fdf4
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date: Sun Sep 11 06:38:11 2022 +0000
- upstream: Try to continue running local I/O for channels in state
+ upstream: .Li -> .Vt where appropriate; from josiah frentsos,
- OPEN during SSH transport rekeying. The most visible benefit is that it
- should make ~-escapes work in the client (e.g. to exit) if the connection
- happened to have stalled during a rekey event. Based work by and ok dtucker@
+ tweaked by schwarze
- OpenBSD-Commit-ID: a66e8f254e92edd4ce09c9f750883ec8f1ea5f45
+ ok schwarze
+
+ OpenBSD-Commit-ID: 565046e3ce68b46c2f440a93d67c2a92726de8ed
-commit e68154b0d4f0f5085a050ea896955da1b1be6e30
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Wed Apr 20 01:13:47 2022 +0000
+commit 86af013b56cecb5ee58ae0bd9d495cd586fc5918
+Author: jsg@openbsd.org <jsg@openbsd.org>
+Date: Sat Sep 10 08:50:53 2022 +0000
- upstream: Import regenerated moduli
+ upstream: fix repeated words ok miod@ jmc@
- OpenBSD-Commit-ID: f9a0726d957cf10692a231996a1f34e7f9cdfeb0
+ OpenBSD-Commit-ID: 6765daefe26a6b648cc15cadbbe337596af709b7
-commit 69928b106d8f0fa15b88cf3850d992ed81c44ae0
-Author: tj@openbsd.org <tj@openbsd.org>
-Date: Sat Apr 16 00:22:31 2022 +0000
+commit 0ba39b93b326a7d5dfab776cc9b9d326161a9b16
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Sep 9 03:31:42 2022 +0000
- upstream: list the correct version number
+ upstream: notifier_complete(NULL, ...) is a noop, so no need to test
- for when usage of the sftp protocol became default and fix a typo
- from ed maste
+ that ctx!=NULL; from Corinna Vinschen
- OpenBSD-Commit-ID: 24e1795ed2283fdeacf16413c2f07503bcdebb31
+ OpenBSD-Commit-ID: ade2f2e9cc519d01a586800c25621d910bce384a
-commit 21042a05c0b304c16f655efeec97438249d2e2cc
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Tue Apr 12 05:09:49 2022 +0000
+commit be197635329feb839865fdc738e34e24afd1fca8
+Author: Sam James <sam@gentoo.org>
+Date: Thu Sep 8 02:49:29 2022 +0100
- upstream: Correct path for system known hosts file in description
-
- of IgnoreUserKnownHosts. Patch from Martin Vahlensieck via tech@
+ openbsd-compat/bsd-asprintf: add <stdio.h> include for vsnprintf
- OpenBSD-Commit-ID: 9b7784f054fa5aa4d63cb36bd563889477127215
+ Fixes the following build failure with Clang 15 on musl:
+ ```
+ bsd-asprintf.c:51:8: error: call to undeclared library function 'vsnprintf' with type 'int (char *, unsigned long, const char *, struct __va_list_tag *)'; ISO C99 and laterclang -O2 -pipe -fdiagnostics-color=always -frecord-gcc-switches -pipe -Wunknown-warning-option -Qunused-arguments -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-result -Wmisleading-indentation -Wbitwise-instead-of-logical -fno-strict-aliasing -mretpoline -ftrapv -fzero-call-used-regs=all -fno-builtin-memset -fstack-protector-strong -fPIE -I. -I. -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -DSSHDIR=\"/etc/ssh\" -D_PATH_SSH_PROGRAM=\"/usr/bin/ssh\" -D_PATH_SSH_ASKPASS_DEFAULT=\"/usr/lib/misc/ssh-askpass\" -D_PATH_SFTP_SERVER=\"/usr/lib/misc/sftp-server\" -D_PATH_SSH_KEY_SIGN=\"/usr/lib/misc/ssh-keysign\" -D_PATH_SSH_PKCS11_HELPER=\"/usr/lib/misc/ssh-pkcs11-helper\" -D_PATH_SSH_SK_HELPER=\"/usr/lib/misc/ssh-sk-helper\" -D_PATH_SSH_PIDDIR=\"/run\" -D_PATH_PRIVSEP_CHROOT_DIR=\"/var/empty\" -DHAVE_CONFIG_H -c cipher-aes.c -o cipher-aes.o
+ do not support
+ implicit function declarations [-Wimplicit-function-declaration]
+ ret = vsnprintf(string, INIT_SZ, fmt, ap2);
+ ^
+ bsd-asprintf.c:51:8: note: include the header <stdio.h> or explicitly provide a declaration for 'vsnprintf'
+ 1 error generated.
+ ```
-commit 53f4aff60a7c1a08a23917bd47496f8901c471f5
+commit 6cb6f660bb35f77a0456dd2581ddf39c29398a5e
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Apr 16 14:33:20 2022 +1000
+Date: Fri Sep 2 16:43:27 2022 +1000
- Resync moduli.5 with upstream.
-
- 1.18: remove duplicate publication year; carsten dot kunze at arcor dot de
- 1.19: ssh-keygen's -G/-T have been replaced with -M generate/screen.
+ Remove DEF_WEAK, it's already in defines.h.
-commit d2b888762b9844eb0d8eb59909cdf5af5159f810
+commit ce39e7d8b70c4726defde5d3bc4cb7d40d131153
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Apr 16 14:31:13 2022 +1000
+Date: Fri Sep 2 14:28:14 2022 +1000
- Retire fbsd6 test VM.
+ Resync arc4random with OpenBSD.
- It's long since out of support, relatively slow (it's i686) and the
- compiler has trouble with PIE.
+ This brings us up to current, including djm's random-reseeding change,
+ as prompted by logan at cyberstorm.mu in bz#3467. It brings the
+ platform-specific hooks from LibreSSL Portable, simplified to match our
+ use case. ok djm@.
-commit cd1f70009860a154b51230d367c55ea5f9a4504e
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Apr 11 22:52:08 2022 +0000
+commit beaddde26f30e2195b8aa4f3193970e140e17305
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Fri Sep 2 14:20:04 2022 +1000
- upstream: clear io_want/io_ready flags at start of poll() cycle;
-
- avoids plausible spin during rekeying if channel io_want flags are reused
- across cycles. ok markus@ deraadt@
+ Move OPENBSD ORIGINAL marker.
- OpenBSD-Commit-ID: 91034f855b7c73cd2591657c49ac30f10322b967
+ Putting this after the copyright statement (which doesn't change)
+ instead of before the version identifier (which does) prevents merge
+ conflicts when resyncing changes.
-commit aa1920302778273f7f94c2091319aba199068ca0
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Apr 8 05:43:39 2022 +0000
+commit c83e467ead67a8cb48ef4bec8085d6fb880a2ff4
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Fri Sep 2 14:17:28 2022 +1000
- upstream: Note that curve25519-sha256 was later published in
-
- RFC8731. ok djm@
+ Remove arc4random_uniform from arc4random.c
- OpenBSD-Commit-ID: 2ac2b5d642d4cf5918eaec8653cad9a4460b2743
+ This was previously moved into its own file (matching OpenBSD) which
+ prematurely committed in commit 73541f2.
-commit 4673fa8f2be983f2f88d5afd754adb1a2a39ec9e
+commit 5f45c2395c60865e59fa44152ff1d003a128c5bc
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Apr 8 04:40:40 2022 +0000
+Date: Fri Sep 2 04:20:02 2022 +0000
- upstream: two defensive changes from Tobias Stoeckmann via GHPR287
-
- enforce stricter invarient for sshbuf_set_parent() - never allow
- a buffer to have a previously-set parent changed.
+ upstream: sk-usbhid: fix key_lookup() on tokens with built-in UV
- In sshbuf_reset(), if the reallocation fails, then zero the entire
- buffer and not the (potentially smaller) default initial alloc size.
+ explicitly test whether the token performs built-in UV (e.g. biometric
+ tokens) and enable UV in that case. From Pedro Martelletto via GHPR#388
- OpenBSD-Commit-ID: 14583203aa5d50ad38d2e209ae10abaf8955e6a9
+ OpenBSD-Commit-ID: 007eb7e387d27cf3029ab06b88224e03eca62ccd
-commit 26eef015e2d2254375e13afaaf753b78932b1bf5
-Author: Damien Miller <djm@mindrot.org>
-Date: Mon Apr 11 16:07:09 2022 +1000
+commit 03277a4aa49b80af541a3e691f264c0c0d8f9cec
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Wed Aug 31 20:26:30 2022 +1000
- Revert "update build-aux files to match autoconf-2.71"
-
- This reverts commit 0a8ca39fac6ad19096b6c263436f8b2dd51606f2.
-
- It turns out that the checked-in copies of these files are actually newer
- than autoconf-2.71's copies, so this was effectively a downgrade.
- Spotted by Bo Anderson via github
+ Move sftp from valgrind-2 to 3 to rebalance.
-commit 0a8ca39fac6ad19096b6c263436f8b2dd51606f2
-Author: Damien Miller <djm@mindrot.org>
-Date: Fri Apr 8 14:48:58 2022 +1000
+commit fcf5365da69c516817321ba89c3a91df98d098df
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Aug 31 02:56:40 2022 +0000
- update build-aux files to match autoconf-2.71
+ upstream: whitespace
- i.e. config.guess, config.sub and install-sh
+ OpenBSD-Commit-ID: c2bcbf93610d3d62ed206cdf9bf9ff98c6aaf232
-commit 94eb6858efecc1b4f02d8a6bd35e149f55c814c8
+commit e60136a3d7a223dd8e84ba8a6895bc3142360993
Author: Damien Miller <djm@mindrot.org>
-Date: Wed Apr 6 10:47:48 2022 +1000
+Date: Mon Aug 29 13:27:45 2022 +1000
- update version numbers for release
+ additional keys
-commit 8e4a8eadf4fe74e65e6492f34250f8cf7d67e8da
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Apr 4 22:45:25 2022 +0000
+commit 2b02dcb505288c462d1b5dd1ac04e603d01340eb
+Author: Damien Miller <djm@mindrot.org>
+Date: Mon Aug 29 13:23:43 2022 +1000
- upstream: openssh-9.0
+ cross-sign allowed_signers with PGP key
- OpenBSD-Commit-ID: 0dfb461188f4513ec024c1534da8c1ce14c20b64
+ Provides continuity of trust from legacy PGP release key to
+ the SSHSIG signing keys that we will use henceforth for git
+ signing.
-commit a9f23ea2e3227f406880c2634d066f6f50fa5eaa
-Author: naddy@openbsd.org <naddy@openbsd.org>
-Date: Thu Mar 31 17:58:44 2022 +0000
+commit 51b345f177ae981b8755f6bdf8358b1cc5e83d67
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Sat Aug 27 21:49:27 2022 +1000
- upstream: ssh: document sntrup761x25519-sha512@openssh.com as
-
- default KEX
+ Add libcrypt-devel to cygwin-release deps.
- OpenBSD-Commit-ID: 12545bfa10bcbf552d04d9d9520d0f4e98b0e171
+ Based on feedback from vinschen at redhat.com.
-commit 9ec2713d122af79d66ebb9c1d6d9ae8621a8945f
-Author: naddy@openbsd.org <naddy@openbsd.org>
-Date: Thu Mar 31 17:27:27 2022 +0000
+commit 9f81736cf16dd8dda1c8942f1973a5f80b8cd78c
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Sat Aug 27 09:37:40 2022 +1000
- upstream: man pages: add missing commas between subordinate and
-
- main clauses
+ Add Windows 2022 test targets.
+
+commit 85e1a69243f12be8520438ad6a3cfdc0b7fcbb2d
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Fri Aug 26 16:26:06 2022 +1000
+
+ Add cygwin-release test target.
- jmc@ dislikes a comma before "then" in a conditional, so leave those
- untouched.
+ This also moves the cygwin package install from the workflow file to
+ setup_ci.sh so that we can install different sets of Cygwin packages
+ for different test configs.
+
+commit 92382dbe8bf9ea1225b16858f9b9b208c15c7e8d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Aug 26 08:16:27 2022 +0000
+
+ upstream: whitespace
- ok jmc@
+ OpenBSD-Commit-ID: a5d015efbfd228dc598ffdef612d2da3a579e5d8
+
+commit 70a5de0a50e84d7250eb4e4537f765599f64c4af
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Aug 26 08:12:56 2022 +0000
+
+ upstream: whitespace
- OpenBSD-Commit-ID: 9520801729bebcb3c9fe43ad7f9776ab4dd05ea3
+ OpenBSD-Commit-ID: d297e4387935d4aef091c5e9432578c2e513f538
-commit 3741df98ffaaff92b474ee70d8ef276b5882f85a
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Apr 4 23:52:11 2022 +1000
+commit 3a683a19fd116ea15ebf8aa13d02646cceb302a9
+Author: Damien Miller <djm@mindrot.org>
+Date: Fri Aug 26 14:23:55 2022 +1000
- Disable security key on fbsd6 test host.
+ initial list of allowed signers
-commit 32c12236f27ae83bfe6d2983b67c9bc67a83a417
+commit 6851f4b8c3fc1b3e1114c56106e4dc31369c8513
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Apr 4 15:16:51 2022 +1000
+Date: Fri Aug 19 17:22:18 2022 +1000
- Specify TEST_SHELL=bash on AIX.
+ Install Cygwin packages based on OS not config.
+
+commit f96480906893ed93665df8cdf9065865c51c1475
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Aug 19 06:07:47 2022 +0000
+
+ upstream: attemp FIDO key signing without PIN and use the error
- The system shells cause the agent-restrict test to fail due to some
- quoting so explicitly specify bash until we can get configure to
- autmatically work around that.
+ code returned to fall back only if necessary. Avoids PIN prompts for FIDO
+ tokens that don't require them; part of GHPR#302
+
+ OpenBSD-Commit-ID: 4f752aaf9f2e7c28bcaaf3d4f8fc290131bd038e
-commit 90452c8b69d065b7c7c285ff78b81418a75bcd76
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Apr 1 23:38:44 2022 +1100
+commit 5453333b5d28e313284cb9aae82899704103f98d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Aug 19 05:53:28 2022 +0000
- Only return events from ppoll that were requested.
+ upstream: remove incorrect check that can break enrolling a
- If the underlying system's select() returns bits that were not in the
- request set, our ppoll() implementation can return revents for events
- not requested, which can apparently cause a hang. Only return revents
- for activity in the requested event set. bz#3416, analysis and fix by
- yaroslav.kuzmin at vmssoftware com, ok djm@
+ resident key (introduced in r1.40)
+
+ OpenBSD-Commit-ID: 4cab364d518470e29e624af3d3f9ffa9c92b6f01
-commit 6c49eb5fabc56f4865164ed818aa5112d09c31a8
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Apr 1 23:21:40 2022 +1100
+commit ff89b1bed80721295555bd083b173247a9c0484e
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Fri Aug 19 04:02:46 2022 +0000
- Only run regression tests on slow VMs.
+ upstream: Strictly enforce the maximum allowed SSH2 banner size in
+
+ ssh-keyscan and prevent a one-byte buffer overflow. Patch from Qualys, ok
+ djm@
+
+ OpenBSD-Commit-ID: 6ae664f9f4db6e8a0589425f74cd0bbf3aeef4e4
-commit f67e47903977b42cb6abcd5565a61bd7293e4dc3
+commit 1b470b9036639cef4f32fb303bb35ea0b711178d
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Apr 1 23:21:06 2022 +1100
+Date: Fri Aug 19 15:18:09 2022 +1000
- Increase test timeout to allow slow VMs to finish
+ Fix cygwin conditional steps.
-commit 02488c1b54065ddc4f25835dbd2618b2a2fe21f5
+commit fd6ee741ab16714b7035d60aca924123ba28135a
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Apr 1 16:27:38 2022 +1100
+Date: Fri Aug 19 15:12:57 2022 +1000
- Use bash or ksh if available for SH in Makefile.
+ Add a bit more debug output.
-commit 34c7018c316af4773e432066de28d0ef9d0888cd
+commit a9305c4c739f4d91a3d3a92c0b6d4949404a36c5
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Apr 1 14:56:54 2022 +1100
+Date: Fri Aug 12 15:08:47 2022 +1000
- Set Makefile SHELL as determined by configure.
+ Add Cygwin (on windows-2019) test target.
- This should improve compatibility for users with non-POSIX shells. If
- using Makefile.in directly (eg make -f Makefile.in distprep) then SHELL
- will need to be specified on the command line (along with MANFMT in that
- particular case). ok djm@
+ In addition to installing the requisite Cygwin packages, we also need to
+ explicitly invoke "sh" for steps that run other scripts since the runner
+ environment doesn't understand #! paths.
-commit 5b054d76402faab38c48377efd112426469553a0
+commit 5062ad48814b06162511c4f5924a33d97b6b2566
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Aug 19 03:06:30 2022 +0000
+
+ upstream: double free() in error path; from Eusgor via GHPR333
+
+ OpenBSD-Commit-ID: 39f35e16ba878c8d02b4d01d8826d9b321be26d4
+
+commit 5a5c580b48fc6006bdfa731fc2f6d4945c2c0e4e
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Apr 1 13:16:47 2022 +1100
+Date: Thu Aug 18 21:36:39 2022 +1000
- Skip slow tests on (very) slow test targets.
+ Check for perms to run agent-getpeereid test.
+
+ Ubuntu 22.04 defaults to private home dirs which prevents "nobody"
+ running ssh-add during the agent-getpeereid test. Check for this and
+ add the necessary permissions.
-commit b275818065b31a865142c48c2acf6a7c1655c542
+commit cd06a76b7ccc706e2bb4f1cc4aa9e9796a28a812
Author: Damien Miller <djm@mindrot.org>
-Date: Thu Mar 31 14:11:36 2022 +1100
+Date: Wed Aug 17 16:04:16 2022 +1000
- depend
+ on Cygwin, prefer WinHello FIDO device
+
+ If no FIDO device was explictly specified, then prefer the
+ windows://hello FIDO device. An exception to this is when
+ probing resident FIDO keys, in which case hardware FIDO
+ devices are preferred.
-commit 3fa539c3ffaabd6211995512d33e29150f88c5c5
+commit 47f72f534ac5cc2cd3027675a3df7b00a8f77575
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Thu Mar 31 03:07:03 2022 +0000
+Date: Wed Aug 17 06:01:57 2022 +0000
- upstream: add a sftp client "cp" command that supports server-side
+ upstream: add an extra flag to sk_probe() to indicate whether we're
- copying of files. Useful for this task and for testing the copy-data
- extension. Patch from Mike Frysinger; ok dtucker@
+ probing for a FIDO resident key or not. Unused here, but will make like
+ easier for portable
- OpenBSD-Commit-ID: 1bb1b950af0d49f0d5425b1f267e197aa1b57444
+ OpenBSD-Commit-ID: 432c8ff70e270378df9dbceb9bdeaa5b43b5a832
-commit 7988bfc4b701c4b3fe9b36c8561a3d1c5d4c9a74
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Thu Mar 31 03:05:49 2022 +0000
+commit edb0bcb3c79b16031dc87a8e57aecc3c4a3414f0
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date: Tue Aug 16 20:24:08 2022 +0000
- upstream: add support for the "corp-data" protocol extension to
-
- allow server-side copies to be performed without having to go via the client.
- Patch by Mike Frysinger, ok dtucker@
+ upstream: use .Cm for "sign"; from josiah frentsos
- OpenBSD-Commit-ID: 00aa510940fedd66dab1843b58682de4eb7156d5
+ OpenBSD-Commit-ID: 7f80a53d54857ac6ae49ea6ad93c5bd12231d1e4
-commit 32dc1c29a4ac9c592ddfef0a4895eb36c1f567ba
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Mar 30 21:13:23 2022 +0000
+commit cccb011e130cbbac538b1689d10e4a067298df8b
+Author: Corinna Vinschen <vinschen@redhat.com>
+Date: Thu Aug 11 20:19:35 2022 +0200
- upstream: select post-quantum KEX
+ Revert "check_sk_options: add temporary WinHello workaround"
- sntrup761x25519-sha512@openssh.com as the default; ok markus@
+ Cygwin now comes with libfido2 1.11.0, so this workaround
+ isn't required anymore.
- OpenBSD-Commit-ID: f02d99cbfce22dffec2e2ab1b60905fbddf48fb9
+ This reverts commit 242c044ab111a37aad3b0775727c36a4c5f0102c.
+
+ Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
-commit d6556de1db0822c76ba2745cf5c097d9472adf7c
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Mar 30 21:10:25 2022 +0000
+commit 9468cd7cf9d989dfa2ac20e2a0268ba6e93bfa5a
+Author: Corinna Vinschen <vinschen@redhat.com>
+Date: Thu Aug 11 20:18:17 2022 +0200
- upstream: fix poll() spin when a channel's output fd closes without
+ fido_dev_is_winhello: return 0, not "false"
- data in the channel buffer. Introduce more exact packing of channel fds into
- the pollfd array. fixes bz3405 and bz3411; ok deraadt@ markus@
+ "false" is not used anywhere in OpenSSH, so return 0 like
+ everywhere else.
- OpenBSD-Commit-ID: 06740737849c9047785622ad5d472cb6a3907d10
+ Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
-commit 8a74a96d25ca4d32fbf298f6c0ac5a148501777d
+commit 730a80609472ee0451c99482d75c9c41f3ebc42d
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Mar 30 04:33:09 2022 +0000
+Date: Fri Aug 12 05:20:28 2022 +0000
- upstream: ssh is almost out of getopt() characters; note the
-
- remaining remaining available ones in a comment
+ upstream: sftp-server: support home-directory request
- OpenBSD-Commit-ID: 48d38cef59d6bc8e84c6c066f6d601875d3253fd
-
-commit 6d4fc51adb9d8a42f67b5474f02f877422379de6
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Mar 30 04:27:51 2022 +0000
-
- upstream: avoid NULL deref via ssh-keygen -Y find-principals.
+ Add support to the sftp-server for the home-directory extension defined
+ in draft-ietf-secsh-filexfer-extensions-00. This overlaps a bit with the
+ existing expand-path@openssh.com, but uses a more official protocol name,
+ and so is a bit more likely to be implemented by non-OpenSSH clients.
- bz3409, reported by Mateusz Adamowski
+ From Mike Frysinger, ok dtucker@
- OpenBSD-Commit-ID: a3b2c02438052ee858e0ee18e5a288586b5df2c5
+ OpenBSD-Commit-ID: bfc580d05cc0c817831ae7ecbac4a481c23566ab
-commit e937514920335b92b543fd9be79cd6481d1eb0b6
+commit 5e820bf79ce3ce99ef7e98b0ab642b0a0a4f396c
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Mar 28 17:51:03 2022 +1100
+Date: Fri Aug 12 14:56:55 2022 +1000
- Add AIX 5.1 test target.
+ Replace deprecated ubuntu-18.04 runners with 22.04
-commit 4bbe815ba974b4fd89cc3fc3e3ef1be847a0befe
+commit 87b0d9c1b789d3ff958ec45df2ac912e24461bae
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Mar 26 22:01:31 2022 +1100
+Date: Thu Aug 11 22:48:23 2022 +1000
- Drop leading "v" from release version identifier.
+ Add a timegm implementation from Heimdal via Samba.
- It's present in the git tags but not in the release tarball names.
- Also drop extra "/" from URL path.
+ Fixes build on (at least Solaris 10).
-commit f5cdd3b3c275dffaebfca91df782dca29975e9ac
+commit d0c4fa58594577994921b593f10037c5282597ca
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Mar 26 16:28:04 2022 +1100
+Date: Thu Aug 11 14:23:58 2022 +1000
- Use tarballs when testing LibreSSL releases.
+ Rerun tests if any .github config file changes.
+
+commit 113fe6c77ab43769fc61e953d07cb619fd7ea54b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Aug 11 13:33:51 2022 +1000
+
+ Skip hostbased during Valgrind tests.
- This means they'll still work when the combination of -portable and
- openbsd github repos no longer match.
+ Valgrind doesn't let ssh exec ssh-keysign (because it's setuid) so skip
+ it during the Valgrind based tests.
+
+ See https://bugs.kde.org/show_bug.cgi?id=119404 for a discussion of this
+ (ironically there the problematic binary was ssh(1) back when it could
+ still be setuid).
-commit 24dc37d198f35a7cf71bf4d5384363c7ef4209d4
+commit b98a42afb69d60891eb0488935990df6ee571c4d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Thu Aug 11 01:57:50 2022 +0000
+
+ upstream: add some tests for parse_absolute_time(), including cases
+
+ where it is forced to the UTC timezone. bz3468 ok dtucker
+
+ OpenBSD-Regress-ID: ea07ca31c2f3847a38df028ca632763ae44e8759
+
+commit ec1ddb72a146fd66d18df9cd423517453a5d8044
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Thu Aug 11 01:56:51 2022 +0000
+
+ upstream: allow certificate validity intervals, sshsig verification
+
+ times and authorized_keys expiry-time options to accept dates in the UTC time
+ zone in addition to the default of interpreting them in the system time zone.
+ YYYYMMDD and YYMMDDHHMM[SS] dates/times will be interpreted as UTC if
+ suffixed with a 'Z' character.
+
+ Also allow certificate validity intervals to be specified in raw
+ seconds-since-epoch as hex value, e.g. -V 0x1234:0x4567890. This
+ is intended for use by regress tests and other tools that call
+ ssh-keygen as part of a CA workflow.
+
+ bz3468 ok dtucker
+
+ OpenBSD-Commit-ID: 454db1cdffa9fa346aea5211223a2ce0588dfe13
+
+commit 4df246ec75751da7eb925e1880498300d8bda187
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Mar 26 15:02:45 2022 +1100
+Date: Thu Aug 11 10:23:55 2022 +1000
- Remove now-unused passwd variable.
+ Fix conditional for running hostbased tests.
-commit 5b467ceef2c356f0a77f5e8ab4eb0fac367e4d24
+commit 2580916e48721802220c61ce9e0df1297c00bc07
+Author: Damien Miller <djm@mindrot.org>
+Date: Thu Aug 11 08:58:28 2022 +1000
+
+ fix SANDBOX_SECCOMP_FILTER_DEBUG
+
+commit fdbd5bf507fc271ff813714fab8a72ff2c6cb5ca
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Mar 26 13:15:44 2022 +1100
+Date: Wed Aug 10 17:35:52 2022 +1000
- Missing semicolon.
+ Test hostbased auth on github runners.
-commit 2923d026e55998133c0f6e5186dca2a3c0fa5ff5
+commit 7e2f51940ba48a1c0fae1107801ea643fa83c971
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Mar 26 12:49:50 2022 +1100
+Date: Wed Aug 10 17:25:24 2022 +1000
- Factor out platform-specific locked account check.
+ Rename our getentropy to prevent possible loops.
- Also fixes an incorrect free on platforms with both libiaf and shadow
- passwords (probably only Unixware). Prompted by github PR#284,
- originally from @c3h2_ctf and stoeckmann@.
+ Since arc4random seeds from getentropy, and we use OpenSSL for that
+ if enabled, there's the possibility that if we build on a system that
+ does not have getentropy then run on a system that does have it, then
+ OpenSSL could end up calling our getentropy and getting stuck in a loop.
+ Pointed out by deraadt@, ok djm@
-commit d23efe4b12886ffe416be10bc0a7da6ca8aa72d1
+commit 7a01f61be8d0aca0e975e7417f26371495fe7674
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Mar 26 08:13:46 2022 +1100
+Date: Mon Aug 8 12:17:04 2022 +1000
- Add OpenWRT mips and mipsel test targets.
+ Actually put HAVE_STDINT_H around the stdint.h.
-commit 16ea8b85838dd7a4dbeba4e51ac4f43fd68b1e5b
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sun Mar 20 08:52:17 2022 +0000
+commit 73541f29f0b50480da6c20dceb7a7191bd8ea7d3
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Mon Aug 8 10:30:34 2022 +1000
- upstream: don't leak argument list; bz3404, reported by Balu
-
- Gajjala ok dtucker@
+ Give unused param a name.
- OpenBSD-Commit-ID: fddc32d74e5dd5cff1a49ddd6297b0867eae56a6
+ Fixes builds on platforms that do have fido2 but don't have
+ fido_dev_is_winhello.
-commit a72bde294fe0518c9a44ba63864093a1ef2425e3
+commit 2a108c0ea960381bd9b14ee0d84e818a23df4482
Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sun Mar 20 08:51:21 2022 +0000
+Date: Fri Aug 5 05:01:40 2022 +0000
- upstream: make addargs() and replacearg() a little more robust and
-
- improve error reporting
+ upstream: don't prompt for FIDO passphrase before attempting to enroll
- make freeargs(NULL) a noop like the other free functions
+ the credential, just let the enroll operating fail and we'll attempt to get a
+ PIN anyway. Might avoid some unneccessary PIN prompts.
- ok dtucker as part of bz3403
+ Part of GHPR#302 from Corinna Vinschen; ok dtucker@
- OpenBSD-Commit-ID: 15f86da83176978b4d1d288caa24c766dfa2983d
+ OpenBSD-Commit-ID: bd5342ffc353ee37d39617906867c305564d1ce2
-commit 731087d2619fa7f01e675b23f57af10d745e8af2
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Mar 18 04:04:11 2022 +0000
+commit 2886975c0ad9244e60dc5e4be34fde3aa573a4b5
+Author: Corinna Vinschen <vinschen@redhat.com>
+Date: Fri Feb 11 14:33:41 2022 +0100
- upstream: don't try to resolve ListenAddress directives in the sshd
+ sk_sign: set FIDO2 uv attribute explicitely for WinHello
- re-exec path - we're never going to use the result and if the operation fails
- then it can prevent connections from being accepted. Reported by Aaron
- Poffenberger; with / ok dtucker@
+ WinHello via libfido2 performs user verification by default.
+ However, if we stick to that, there's no way to differentiate
+ between keys created with or without "-O verify-required".
+ Set FIDO2 uv attribute explicitely to FIDO_OPT_FALSE, then check
+ if user verification has been requested.
- OpenBSD-Commit-ID: 44c53a43909a328e2f5ab26070fdef3594eded60
+ Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
-commit 1c83c082128694ddd11ac05fdf31d70312ff1763
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Mar 18 02:50:21 2022 +0000
+commit 242c044ab111a37aad3b0775727c36a4c5f0102c
+Author: Corinna Vinschen <vinschen@redhat.com>
+Date: Tue Feb 15 11:28:08 2022 +0100
- upstream: remove blank line
+ check_sk_options: add temporary WinHello workaround
- OpenBSD-Commit-ID: d5e0182965b2fbfb03ad5f256d1a1ce5706bcddf
+ Up to libfido 1.10.0, WinHello advertises "clientPin" rather
+ than "uv" capability. This is fixed in 1.11.0. For the time
+ being, workaround it here.
+
+ Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
-commit 807be68684da7a1fe969c399ddce2fafb7997dcb
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Mar 18 02:32:22 2022 +0000
+commit 78774c08cc4b4997382975b0f414a86e06b6780c
+Author: Corinna Vinschen <vinschen@redhat.com>
+Date: Thu Feb 10 18:19:29 2022 +0100
- upstream: helpful comment
+ compat code for fido_dev_is_winhello()
- OpenBSD-Commit-ID: e3315a45cb04e7feeb614d76ec80a9fe4ca0e8c7
+ Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
-commit a0b5816f8f1f645acdf74f7bc11b34455ec30bac
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Mar 18 02:31:25 2022 +0000
+commit 3d3a932a019aedfb891e0779bb4990cd5008a390
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Fri Aug 5 13:12:27 2022 +1000
- upstream: ssh-keygen -Y check-novalidate requires namespace or SEGV
-
- will ensue. Patch from Mateusz Adamowski via GHPR#307
+ Factor out getrnd() and rename to getentropy().
- OpenBSD-Commit-ID: 99e8ec38f9feb38bce6de240335be34aedeba5fd
+ Factor out the arc4random seeding into its own file and change the
+ interface to match getentropy. Use native getentropy if available.
+ This will make it easier to resync OpenBSD changes to arc4random.
+ Prompted by bz#3467, ok djm@.
-commit 5a252d54a63be30d5ba4be76210942d754a531c0
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Tue Mar 15 05:27:37 2022 +0000
+commit 9385d277b787403be9dfcb229cf372202496d2f3
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Aug 4 18:55:48 2022 +1000
- upstream: improve DEBUG_CHANNEL_POLL debugging message
-
- OpenBSD-Commit-ID: 2275eb7bc4707d019b1a0194b9c92c0b78da848f
+ Include CHANNEL and FIDO2 libs in configure output
-commit ce324cf58ba2840e31afeb996935800780c8fa4b
-Author: cheloha@openbsd.org <cheloha@openbsd.org>
-Date: Sun Mar 13 23:27:54 2022 +0000
+commit 141535b904b6fba01724444f38193a8599201f82
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Mon Aug 1 11:09:26 2022 +0000
- upstream: ssh: xstrdup(): use memcpy(3)
-
- Copying the given string into the buffer with strlcpy(3) confers no
- benefit in this context because we have already determined the
- string's length with strlen(3) in order to allocate that buffer.
-
- Thread: https://marc.info/?l=openbsd-tech&m=164687525802691&w=2
+ upstream: avoid double-free in error path introduced in r1.70; report
- ok dtucker@ millert@
+ and fix based on GHPR#332 by v-rzh ok dtucker@
- OpenBSD-Commit-ID: f8bfc082e36e2d2dc4e1feece02fe274155ca11a
+ OpenBSD-Commit-ID: 3d21aa127b1f37cfc5bdc21461db369a663a951f
-commit 2893c5e764557f48f9d6a929e224ed49c59545db
+commit dba7099ffcba3ca07b3946f017ba6a4c3158d9b1
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Mar 11 18:43:58 2022 +1100
+Date: Wed Jul 27 18:40:12 2022 +1000
- Resync fmt_scaled. with OpenBSD.
-
- Fixes underflow reported in bz#3401.
+ Remove deprecated MacOS 10.15 runners.
-commit 5ae31a0fdd27855af29f48ff027491629fff5979
+commit 722a56439aa5972c830e4a9a724cf52aff4a950a
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Wed Mar 9 09:41:56 2022 +1100
+Date: Wed Jul 27 18:31:14 2022 +1000
- Provide killpg implementation.
+ Move stale-configure check as early as possible.
- Based on github PR#301 for Tandem NonStop.
+ We added a check in Makefile to catch the case where configure needs to
+ be rebuilt, however this did not happen until a build was attempted in
+ which case all of the work done by configure was wasted. Move this check
+ to the start of configure to catch it as early as possible. ok djm@
-commit c41c84b439f4cd74d4fe44298a4b4037ddd7d2ae
+commit 099d6b56288b421ba38531d26dc1bd6bb685e311
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Wed Mar 9 09:29:30 2022 +1100
+Date: Fri Jul 22 10:47:19 2022 +1000
- Check for missing ftruncate prototype.
+ Move libcrypto into CHANNELLIBS.
- From github PR#301 in conjunction with rsbeckerca.
-
-commit 8cf5275452a950869cb90eeac7d220b01f77b12e
+ This will result in sftp, sftp-server and scp no longer being linked
+ against libcrypto. ok djm@
+
+commit 1bdf86725b77733bb5f17c54888b88a10b2f6538
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Mar 8 20:04:06 2022 +1100
+Date: Fri Jul 22 10:45:47 2022 +1000
- Default to not using sandbox when cross compiling.
+ Remove seed_rng calls from scp, sftp, sftp-server.
- On most systems poll(2) does not work when the number of FDs is reduced
- with setrlimit, so assume it doesn't when cross compiling and we can't
- run the test. bz#3398.
+ These binaries don't use OpenSSL's random functions. The next step
+ will be to stop linking them against libcrypto. ok djm@
-commit 379b30120da53d7c84aa8299c26b18c51c2a0dac
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Tue Mar 1 01:59:19 2022 +0000
+commit d73f77b8cb9b422f1ac4facee7890aa10ff2bc21
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Fri Jul 22 09:51:51 2022 +1000
- upstream: pack pollfd array before server_accept_loop() ppoll()
-
- call, and terminate sshd if ppoll() returns errno==EINVAL
-
- avoids spin in ppoll when MaxStartups > RLIMIT_NOFILE, reported by
- Daniel Micay
+ Group libcrypto and PRNGD checks together.
- feedback/ok deraadt
+ They're related more than the libcrypt or libiaf checks which are
+ currently between them. ok djm@
+
+commit f117e372b3f42f2fbdb0a578d063b2609ab58e1f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Fri Jul 22 09:24:45 2022 +1000
+
+ Do not link scp, sftp and sftp-server w/ zlib.
- OpenBSD-Commit-ID: dbab1c24993ac977ec24d83283b8b7528f7c2c15
+ Some of our binaries (eg sftp, sftp-server, scp) do not interact with
+ the channels code and thus do use libraries such as zlib and libcrypto
+ although they are linked with them. This adds a CHANNELLIBS and starts
+ by moving zlib into it, which means the aformentioned binaries are no
+ longer linked against zlib. ok djm@
-commit eceafbe0bdbbd9bd2f3cf024ccb350666a9934dd
-Author: naddy@openbsd.org <naddy@openbsd.org>
-Date: Sun Feb 27 01:33:59 2022 +0000
+commit 800c2483e68db38bd1566ff69677124be974aceb
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Mon Jul 25 21:49:04 2022 +1000
- upstream: include rejected signature algorithm in error message and
+ Remove workarounds for OpenSSL missing AES-CTR.
- not the (useless) key type; ok djm@
+ We have some compatibility hacks that were added to support OpenSSL
+ versions that do not support AES CTR mode. Since that time, however,
+ the minimum OpenSSL version that we support has moved to 1.0.1 which
+ *does* have CTR, so this is no longer needed. ok djm@
+
+commit b7c56b65c12f51fe0dbae798d19c8f58224a5d95
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Mon Jul 25 21:43:00 2022 +1000
+
+ Remove workarounds for OpenSSL missing AES-GCM.
- OpenBSD-Commit-ID: d0c0f552a4d9161203e07e95d58a76eb602a76ff
+ We have some compatibility hacks that were added to support OpenSSL
+ versions that do not support AES GCM mode. Since that time, however,
+ the minimum OpenSSL version that we support has moved to 1.0.1 which
+ *does* have GCM, so this is no longer needed. ok djm@
-commit f2f3269423618a83157e18902385e720f9776007
+commit 5a4a9f7a968fbf92cc1eac519c65638e79ae9f1f
Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Feb 25 09:46:24 2022 +0000
+Date: Mon Jul 25 07:12:45 2022 +0000
- upstream: Remove the char * casts from arguments to do_lstat,
-
- do_readdir and do_stat paths since the underlying functions now take a const
- char *. Patch from vapier at gentoo.org.
+ upstream: Restore missing "!" in TEST_SSH_ELAPSED_TIMES test.
- OpenBSD-Commit-ID: 9e4d964dbfb0ed683a2a2900711b88e7f1c0297b
+ OpenBSD-Regress-ID: 38783f9676ec348c5a792caecee9a16e354b37b0
-commit 4a66dac052c5ff5047161853f36904607649e4f9
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Feb 25 02:09:27 2022 +0000
+commit 0ff886be132299386cc29d87c2aa16ff68a1aa08
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Sun Jul 24 23:29:10 2022 +0000
- upstream: save an unneccessary alloc/free, based on patch from
+ upstream: Test TEST_SSH_ELAPSED_TIMES for empty string not
- Martin Vahlensieck; ok dtucker@
+ executable. No-op on most platforms but should prevent warnings in -portable
+ on systems that don't have 'date %s'.
- OpenBSD-Commit-ID: 90ffbf1f837e509742f2c31a1fbf2c0fd376fd5f
-
-commit 6f117cb151efe138ac57bdd8e26165f350328f5f
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Mar 1 09:02:06 2022 +1100
-
- Remove unused ivbits argument from chacha_keysetup
+ OpenBSD-Regress-ID: e39d79867b8065e33d0c5926fa1a31f85659d2a4
-commit 15974235dd528aeab0ec67fb92a0a1d733f62be2
+commit f69319ad8ad1dd50f90bbcf5912e11cc8ed3e037
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Mar 1 09:00:20 2022 +1100
+Date: Sat Jul 23 14:38:22 2022 +1000
- Add OPENBSD ORIGINAL marker.
+ Convert "have_prog" function into "which".
+
+ "which" and its behaviour is not standardized, so convert the existing
+ have_prog function into "which" so we can rely on it being available
+ and what its semantics are. Add a have_prog wrapper that maintains the
+ existing behaviour.
-commit f2ff669347d320532e7c1b63cdf5c62f46e73150
+commit ea7ecc2c3ae39fdf5c6ad97b7bc0b47a98847f43
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Feb 28 22:21:36 2022 +1100
+Date: Sat Jul 23 14:36:38 2022 +1000
- No unused param warnings for clang-12 and gcc-11.
+ Skip scp3 test if there's no scp on remote path.
- These have too many false positives in -Werror tests on the github CI
- since we often provide empty stub functions for functionality not needed
- for particular configurations.
+ scp -3 ends up using the scp that's in the remote path and will fail if
+ one is not available. Based on a patch from rapier at psc.edu.
-commit 96558ecd87adac62efa9a2b5479f686ab86b0be1
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Feb 26 14:10:41 2022 +1100
+commit c46f6fed419167c1671e4227459e108036c760f8
+Author: Damien Miller <djm@mindrot.org>
+Date: Wed Jul 20 13:39:14 2022 +1000
- Add debian-i386 test target.
+ crank SSH_SK_VERSION_MAJOR in sk-dummy.so
-commit 284b6e5394652d519e31782e3b3cdfd7b21d1a81
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Feb 26 14:06:14 2022 +1100
+commit f208e3b9ffb5ee76cf9c95df7ff967adc7f51c7d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Jul 20 03:33:22 2022 +0000
- Allow ppoll_time64 in seccomp sandbox.
+ upstream: ssh-keygen: fix touch prompt, pin retries;
- Should fix sandbox violations on (some? at least i386 and armhf) 32bit
- Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at
- debian.org via bz#3396.
+ part of GHPR329 from Pedro Martelletto
+
+ OpenBSD-Commit-ID: 75d1005bd2ef8f29fa834c90d2684e73556fffe8
-commit 0132056efabc5edb85c3c7105d2fb6dee41843c6
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Feb 25 19:47:48 2022 +1100
+commit 8638a2ce7e90c8a51d9af3143404282126c524f8
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Jul 20 03:31:42 2022 +0000
- Improve handling of _getshort and _getlong.
+ upstream: sk-usbhid: preserve error code returned by key_lookup()
- If the system native ones are exactly as required then use them,
- otherwise use the local versions mapped to another name to prevent
- name collisions.
+ it conveys useful information, such as the supplied pin being wrong.
+
+ Part of GHPR329 from Pedro Martelletto
+
+ OpenBSD-Commit-ID: c0647eb9290f793add363d81378439b273756c1b
-commit 8e206e0dd6b9f757b07979e48f53ad5bf9b7b52b
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Feb 25 15:14:22 2022 +1100
+commit 9ab929ca2d820520327b41929372bcb9e261534c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Jul 20 03:29:14 2022 +0000
- Constify utimes in compat library to match specs.
+ upstream: when enrolling a resident key on a security token, check
- Patch from vapier at chromium.org.
+ if a credential with matching application and user ID strings already exists.
+ if so, prompt the user for confirmation before overwriting the credential.
+
+ patch from Pedro Martelletto via GHPR329
+
+ NB. cranks SSH_SK_VERSION_MAJOR, so any third-party FIDO middleware
+ implementations will need to adjust
+
+ OpenBSD-Commit-ID: e45e9f1bf2b2f32d9850669e7a8dbd64acc5fca4
-commit 1b2920e3b63db2eddebeec7330ffe8b723055573
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Feb 25 13:50:56 2022 +1100
+commit 5bcfc788b38d5b64e4c347bdc04bd9a01bbc36da
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Jul 20 03:13:04 2022 +0000
- ANSIfy getshort and getlong.
+ upstream: pull passphrase reading and confirmation into a separate
- These functions appear to have come from OpenBSD's lib/libc/net/res_comp.c
- which made this change in 2005.
+ function so it can be used for FIDO2 PINs; no functional change
+
+ OpenBSD-Commit-ID: bf34f76b8283cc1d3f54633e0d4f13613d87bb2f
-commit 54a86f4f6e1c43a2ca2be23ef799ab8910d4af70
+commit eb679e2959bdb15454eb94751930eb4c9110da94
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Feb 25 13:23:04 2022 +1100
+Date: Fri Jul 15 21:31:48 2022 +1000
- Use PICFLAG instead of hard coding -fPIC.
+ Move vmshutdown to first step.
+
+ If a previous run on a physical runner has failed to clean up, the next
+ run will fail because it'll try to check out the code to a broken
+ directory mount. Make cleanup the first step.
-commit 3016ba47035ac3561aabd48e2be70167fe157d6a
+commit 46b91b70ff3cb9c147e2875ef5dc609fd64c0c96
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Feb 25 11:37:11 2022 +1100
+Date: Fri Jul 15 20:25:27 2022 +1000
- Add tests for latest releases of {Libre,Open}SSL.
+ Rename bbone test target to ARM.
-commit f107467179428a0e3ea9e4aa9738ac12ff02822d
-Author: Colin Watson <cjwatson@debian.org>
-Date: Thu Feb 24 16:04:18 2022 +0000
+commit 751d22cdeffed9fe921db78eedc32a29f9e80510
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Fri Jul 15 13:37:29 2022 +1000
- Improve detection of -fzero-call-used-regs=all support
+ Add AUDIT_ARCH_PPC to supported seccomp arches.
- GCC doesn't tell us whether this option is supported unless it runs into
- the situation where it would need to emit corresponding code.
+ Patch from dries.deschout at dodeco.eu.
-commit 3383b2cac0e9275bc93c4b4760e6e048f537e1d6
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Feb 23 21:21:49 2022 +0000
+commit a061792a6e8d235fc40a9b5d4c22a1762bb75a7b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Jul 14 19:20:24 2022 +1000
- upstream: free(3) wants stdlib.h
+ Remove unintended changes.
- OpenBSD-Commit-ID: 227a8c70a95b4428c49e46863c9ef4bd318a3b8a
+ I inadvertently included a couple of local changes with the OpenSSL
+ 3.0.4 change. Revert, anything that should be there will be committed
+ separately.
-commit a4537e79ab4ac6db4493c5158744b9ebde5efcb0
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Feb 23 21:21:16 2022 +0000
+commit 527cb43fa1b4e55df661feabbac51b8e608b6519
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Jul 14 11:22:08 2022 +1000
- upstream: put back the scp manpage changes for SFTP mode too
+ Return ERANGE from getcwd() if buffer size is 1.
- OpenBSD-Commit-ID: 05dc53921f927e1b5e5694e1f3aa314549f2e768
+ If getcwd() is supplied a buffer size of exactly 1 and a path of "/", it
+ could result in a nul byte being written out of array bounds. POSIX says
+ it should return ERANGE if the path will not fit in the available buffer
+ (with terminating nul). 1 byte cannot fit any possible path with its nul,
+ so immediately return ERANGE in that case.
+
+ OpenSSH never uses getcwd() with this buffer size, and all current
+ (and even quite old) platforms that we are currently known to work
+ on have a native getcwd() so this code is not used on those anyway.
+ Reported by Qualys, ok djm@
-commit 449bcb8403adfb9724805d02a51aea76046de185
-Author: deraadt@openbsd.org <deraadt@openbsd.org>
-Date: Wed Feb 23 19:01:00 2022 +0000
+commit 36857fefd8849c4b0e877cfd9d1eb22f79b76650
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Jul 14 10:02:35 2022 +1000
- upstream: and we go back to testing sftp-scp after the 8.9
-
- release...
+ Split README.platform into its own line.
- OpenBSD-Commit-ID: a80440168258adca543a4607b871327a279c569c
-
-commit 166456cedad3962b83b848b1e9caf80794831f0f
-Author: Damien Miller <djm@mindrot.org>
-Date: Wed Feb 23 22:31:11 2022 +1100
-
- makedepend
+ README.platform has general platform-specific information, having it
+ following text about FIDO2 on the same line could imply that it only
+ has information about FIDO2.
-commit 32ebaa0dbca5d0bb86e384e72bebc153f48413e4
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Feb 23 11:18:13 2022 +0000
+commit 00a496c6c14f2d41f2a9365714d494dd5f3aac9f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Thu Jul 14 09:56:01 2022 +1000
- upstream: avoid integer overflow of auth attempts (harmless, caught
-
- by monitor)
+ Clarify README.md text.
- OpenBSD-Commit-ID: 488ad570b003b21e0cd9e7a00349cfc1003b4d86
+ Clarify the text about the implications of building without OpenSSL, and
+ prefix the "configure --help" example command with a "./" so it's likely
+ to work as-is in more shells. From bz#3461.
-commit 6e0258c64c901753df695e06498b26f9f4812ea6
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Feb 23 11:17:10 2022 +0000
+commit f40b52f21fbc52eb513279168a49d3285c65256c
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Tue Jul 12 19:48:44 2022 +1000
- upstream: randomise the password used in fakepw
+ Remove special casing of crypt().
- OpenBSD-Commit-ID: 34e159f73b1fbf0a924a9c042d8d61edde293947
+ Configure goes to some lengths to pick crypt() from either libcrypt
+ or OpenSSL's libcrypto because they can more or less featureful (eg
+ supporting md5-style passwords).
+
+ OpenSSL removed its crypt() interface in 2002:
+ https://github.com/openssl/openssl/commit/69deec58 so these hijinks
+ should no longer be necessary. This also only links sshd with libcrypt
+ which is the only thing that needs it. ok djm@
-commit bf114d6f0a9df0b8369823d9a0daa6c72b0c4cc9
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Feb 23 11:15:57 2022 +0000
+commit 76f4e48631d7b09fb243b47d7b393d100d3741b7
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Wed Jul 13 13:17:47 2022 +1000
- upstream: use asprintf to construct .rhosts paths
+ Only refuse to use OpenSSL 3.0.4 on x86_64.
- OpenBSD-Commit-ID: 8286e8d3d2c6ff916ff13d041d1713073f738a8b
+ The potential RCE only impacts x86_64, so only refuse to use it if we're
+ targetting a potentially impacted architecture. ok djm@
-commit c07e154fbdc7285e9ec54e78d8a31f7325d43537
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Wed Feb 23 11:07:09 2022 +0000
+commit e75bbc1d88491fa85e61b2cc8783d4bbd00cd131
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Tue Jul 12 14:37:15 2022 +1000
- upstream: openssh-8.9
-
- OpenBSD-Commit-ID: 5c5f791c87c483cdab6d9266b43acdd9ca7bde0e
+ Capture stderr output from configure.
-commit bc16667b4a1c3cad7029304853c143a32ae04bd4
+commit d9eaea4bea6271bcee6a2b9428f1271faf2d033b
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Feb 22 15:29:22 2022 +1100
+Date: Tue Jul 12 12:54:49 2022 +1000
- Extend select+rlimit sanbox test to include poll.
-
- POSIX specifies that poll() shall fail if "nfds argument is greater
- than {OPEN_MAX}". The setrlimit sandbox sets this to effectively zero
- so this causes poll() to fail in the preauth privsep process.
+ Refuse to use OpenSSL 3.0.4 due to potential RCE.
- This is likely the underlying cause for the previously observed similar
- behaviour of select() on plaforms where it is implement in userspace on
- top of poll().
+ OpenSSL has a potential RCE in its RSA implementation (CVE-2022-2274)
+ so refuse to use that specific version.
-commit 6520c488de95366be031d49287ed243620399e23
+commit fb2f3a61bf3d28fff285524535f7ffcd177c9235
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Feb 22 13:08:59 2022 +1100
+Date: Tue Jul 12 12:54:24 2022 +1000
- Add Alpine Linux test VM.
+ Move unset to before we set anything.
-commit a4b325a3fc82d11e0f5d61f62e7fde29415f7afb
+commit c483a5c0fb8e8b8915fad85c5f6113386a4341ca
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Feb 22 12:27:07 2022 +1100
+Date: Wed Jul 6 11:52:54 2022 +1000
- Include sys/param.h if present.
-
- Needed for howmany() on MUSL systems such as Alpine.
+ Test against openssl-3.0.5.
-commit 5a102e9cb287a43bd7dfe594b775a89a8e94697c
+commit 669a56bcfe73f8b985f2bba476ba834d55253acf
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Tue Feb 22 12:25:52 2022 +1100
+Date: Tue Jul 5 18:35:53 2022 +1000
- Only include sys/poll.h if we don't have poll.h.
+ Update sanitizer test targets:
- Prevents warnings on MUSL based systems such as Alpine.
+ - remove clang-sanitize-memory for now. It takes so long that the test
+ times out.
+ - add gcc sanitize-address and sanitize-undefined test targets.
-commit 7c0d4ce911d5c58b6166b2db754a4e91f352adf5
-Author: Damien Miller <djm@mindrot.org>
-Date: Tue Feb 22 11:14:51 2022 +1100
+commit 48cc68b69118b3ce8d07fd4f82e00d58667d5379
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Tue Jul 5 16:23:28 2022 +1000
- disable agent-restrict test on minix3
-
- Minix seems to have a platform-wide limit on the number of
- select(2) syscalls that can be concurrently issued. This test
- seems to exceed this limit.
-
- Refer to:
-
- https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L114
- https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/R3.3.0/minix/servers/vfs/select.c#L30-L31
+ Add GCC address sanitizer build/test.
-commit 81d33d8e3cf7ea5ce3a5653c6102b623e019428a
+commit 55c60bdd39b82457e92efa77da8d16cfa6a49391
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Feb 21 21:27:20 2022 +1100
+Date: Tue Jul 5 12:02:33 2022 +1000
- Skip agent-getpeereid when running as root.
+ Move sanitizer logs into regress for collection.
-commit fbd772570a25436a33924d91c164d2b24021f010
+commit 35ef2b3b6ef198f8574904a45780487ec2f17858
Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Sun Feb 20 03:47:26 2022 +0000
+Date: Mon Jul 4 09:10:31 2022 +0000
- upstream: Aproximate realpath on the expected output by deduping
+ upstream: Add TEST_REGRESS_CACHE_DIR.
- leading slashes. Fixes test failure when user's home dir is / which is
- possible in some portable configurations.
+ If set, it is used to cache regress test names that have succeeded and
+ skip those on a re-run.
- OpenBSD-Regress-ID: 53b8c53734f8893806961475c7106397f98d9f63
+ OpenBSD-Regress-ID: a7570dd29a58df59f2cca647c3c2ec989b49f247
-commit 336685d223a59f893faeedf0a562e053fd84058e
+commit 7394ed80c4de8b228a43c8956cf2fa1b9c6b2622
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sun Feb 20 13:30:52 2022 +1100
+Date: Sun Jul 3 21:46:44 2022 +1000
- Really move DSA to end of list.
+ Add clang sanitizer tests.
+
+commit bfce0e66b6017a9bfab450b9dc7d4b16f90de817
+Author: Darren Tucker <dtucker@dtucker.net>
+Date: Sun Jul 3 18:14:09 2022 +1000
+
+ Skip all rlimit tests when sandboxing disabled.
- In commit ad16a84e syncing from OpenBSD, RSA was accidentally moved to
- the end of the list instead of DSA. Spotted by andrew at fyfe.gb.net.
+ The rlimit tests can hang when being run with some compiler sanitizers
+ so skip all of them if sandbox=no.
-commit 63bf4f49ed2fdf2da6f97136c9df0c8168546eb3
+commit 6208d611520f9ea94d5369f9da404b709930029d
Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Feb 18 12:12:21 2022 +1100
+Date: Sun Jul 3 17:54:49 2022 +1000
- Add test configs for MUSL C library.
+ Move checks for pollfd.fd and nfds_t.
+
+ Move the checks for struct pollfd.fd and nfds_t to before the sandboxing
+ checks. This groups all the sandbox checks together so we can skip them
+ all when sandb